merge

src/views/patients/labels-manage/dialog/select-patitents.vue

@@ -54,7 +54,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item prop="diseaseId">
-                <el-select
+                <!--<el-select
                   v-model="searchData.diseaseId"
                   multiple
                   collapse-tags
@@ -67,8 +67,26 @@
                     :key="index"
                     :label="item.diseaseName"
                     :value="item.diseaseId">
-                  </el-option>
-                </el-select>
+                  </el-option>-->
+                <!--</el-select>-->
+                  <el-select
+                    v-model="searchData.icdCodeList"
+                    multiple
+                    filterable
+                    remote
+                    reserve-keyword
+                    placeholder="请选择或搜索诊断"
+                    :remote-method="getDiseaseData"
+                    :loading="loading"
+                    class="set-width"
+                  >
+                    <el-option
+                      v-for="item in icdOptions"
+                      :key="item.icdCode"
+                      :label="item.diseaseName"
+                      :value="item.icdCode">
+                    </el-option>
+                  </el-select>
               </el-form-item>
               <el-form-item prop="labelId">
                 <el-select
@@ -229,7 +247,7 @@
 
 <script>
   import { mapState, mapActions } from 'vuex'
-  import { getConstants, getPatientInfoList, getDiseasesList, getLabelList } from '@/utils/patients/patientsapi'
+  import { getConstants, getPatientInfoList, getDiseasesList, getLabelList, getIcdList } from '@/utils/patients/patientsapi'
   import { getPlanList } from '@/utils/followup/followapis'
   export default {
     components: {},
@@ -248,7 +266,8 @@
           diseaseId: [],
           labelId: [],
           fuPlanIdList: [],
-          searchCondition: ''
+          searchCondition: '',
+          icdCodeList: [],
         },
         paginationSet: {
           pageNum: 1,
@@ -272,6 +291,8 @@
         newSelects: [], //新选中的人
         oldPatientList: [],
         showReloadModal: false,
+        loading: false,
+        icdOptions: [],
         getRowKeys(row) {
           return row.patientId;
         },
@@ -292,6 +313,8 @@
       isShowSelectPatient(val){
         if(val){
           this.getPatientsList()
+          //获取搜索诊断
+          this.getDiseaseData();
           // 获取常量 性别、年龄
           getConstants({
             numList: 'P057,P006'
@@ -342,6 +365,29 @@
           return row.disableNum
         }
       },
+      getDiseaseData(query) {
+        if (query !== '') {
+          let params = {
+            icdName: query ? query : '',
+            pageSize: 200,
+            pageNum: 1,
+          };
+          this.loading = true;
+          getIcdList(params).then(data => {
+            this.loading = false;
+            if(data.code == "000000") {
+              this.icdOptions = data.data;
+            }
+          }).catch((error) => {
+            this.$message({
+              message: error,
+              type: 'error'
+            });
+          });
+        }else {
+          this.icdOptions = [];
+        }
+      },
       getPatientsList(){
         const data = {
           pageSize: this.paginationSet.pageSize,
@@ -355,6 +401,7 @@
           addType: this.selectPatientType,   //随访是1,分组是2，患教是3
           fuPlanIdList: this.searchData.fuPlanIdList || [],
           sourceId: this.sourceId, //若是随访的话，传planId；若是分组的话，传labeledId;
+          icdCodeList: this.searchData.icdCodeList
         }
         getPatientInfoList(data).then(res=>{
           if(res.data.patientList){
@@ -486,7 +533,8 @@
             diseaseId: [],
             labelId: [],
             fuPlanIdList: [],
-            searchCondition: ''
+            searchCondition: '',
+            icdCodeList: [],
         }
         this.$emit('closeSelectPatient',false)
       },
@@ -499,7 +547,8 @@
             diseaseId: [],
             labelId: [],
             fuPlanIdList: [],
-            searchCondition: ''
+            searchCondition: '',
+            icdCodeList: [],
           }
           this.$emit('sureSelectPatient',false,this.newSelects,this.oldPatientList)
         } else {

src/views/patients/mypatients-manage/components/edit-information.vue

@@ -384,7 +384,8 @@
           this.patientInfoForm = val;
           this.baseInfoEdit = this.patientInfoForm.baseInfoEdit;
           let customLabels = this.patientInfoForm.customLabels;
-          let diseases = this.patientInfoForm.diseases;
+          // let diseases = this.patientInfoForm.diseases;
+          let icdList = this.patientInfoForm.icdList;
           if(customLabels && customLabels.length > 0){
             customLabels.forEach((kkk)=>{
               this.labelIdList.push(Number(kkk.labelId))
@@ -392,12 +393,17 @@
           }else {
             this.labelIdList = [];
           }
-          if(diseases && diseases.length > 0) {
-            diseases.forEach((dis)=>{
-              this.diseaseIdList.push(Number(dis.diseaseId))
-            })
+          // if(diseases && diseases.length > 0) {
+          //   diseases.forEach((dis)=>{
+          //     this.diseaseIdList.push(Number(dis.diseaseId))
+          //   })
+          // }else {
+          //   this.diseaseIdList = [];
+          // }
+          if(icdList && icdList.length > 0) {
+            this.$store.dispatch('patientsDiagnose/changeDiagnoseList', icdList)
           }else {
-            this.diseaseIdList = [];
+            this.$store.dispatch('patientsDiagnose/changeDiagnoseList', [])
           }
           if(this.patientInfoForm.idNo) {
             this.hasIdNo = true;
@@ -487,7 +493,8 @@
           cityId: null,
           countyId: null,
           townId: null,
-        }
+        };
+         this.$store.dispatch('patientsDiagnose/changeDiagnoseList', [])
       },
       // 点击 添加诊断
       handleAddDiagnose() {

src/views/patients/mypatients-manage/patient-detail.vue

@@ -185,7 +185,8 @@
             if(this.patientInfo){
               this.doctorId = this.patientInfo.doctorId;
               let customLabels = this.patientInfo.customLabels;
-              let diseases = this.patientInfo.diseases;
+              // let diseases = this.patientInfo.diseases;
+              let icdList = this.patientInfo.icdList;
               let groupLabelNames = [];
               let groupDiseaseNames = [];
               //对出生日期的处理
@@ -206,9 +207,18 @@
               } else {
                 this.showLabelName = '';
               }
-              // 对诊断疾病的处理
-              if(diseases) {
-                diseases.forEach(item => {
+              // 对诊断疾病的处理（老版诊断）
+              // if(diseases) {
+              //   diseases.forEach(item => {
+              //     groupDiseaseNames.push(item.diseaseName)
+              //   });
+              //   this.showDiseaseName = groupDiseaseNames.join('；');
+              // } else {
+              //   this.showDiseaseName = '';
+              // }
+              // 对诊断疾病的处理（新版诊断）
+              if(icdList) {
+                icdList.forEach(item => {
                   groupDiseaseNames.push(item.diseaseName)
                 });
                 this.showDiseaseName = groupDiseaseNames.join('；');

src/views/patients/mypatients-manage/patients-list.vue

@@ -49,6 +49,7 @@
                 placeholder="请选择或搜索诊断"
                 :remote-method="getDiseaseData"
                 :loading="loading"
+                size="small"
               >
                 <el-option
                   v-for="item in options"
@@ -306,7 +307,7 @@
                 //转化疾病
                 if (item.patientTypeModels) {
                   item.patientTypeModels.forEach(item => {
-                    diseaseNames.push(item.name)
+                    diseaseNames.push(item.diseaseName)
                   })
                   item.showDiseaseNames = diseaseNames.join('、');
                 } else {