提交merge1.3

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue

@@ -91,7 +91,9 @@ import {
   getTcmCondition,
   getTcmSyndrome,
   saveTcmDiagnosis,
+  updateTcmDiagnosis,
 } from '@/views/doctorstation/components/api';
+import { update } from 'lodash';
 
 const props = defineProps({
   openAddDiagnosisDialog: {
@@ -102,6 +104,10 @@ const props = defineProps({
     type: Object,
     required: true,
   },
+  updateZy: {
+    type: Object,
+    required: true,
+  },
 });
 
 const conditionList = ref([]);
@@ -118,50 +124,152 @@ function handleOpen() {
   getTcmCondition().then((res) => {
     conditionList.value = res.data.records;
   });
-}
-
-// 点击诊断列表处理，点击以后才显示证候列表
-function handleClickRow(row) {
-  if (syndromeSelected.value || tcmDiagonsisList.value == 0) {
-    selectedDisease.value = true;
-    syndromeSelected.value = false;
-    timestamp.value = Date.now();
-    getTcmSyndrome().then((res) => {
-      syndromeList.value = res.data.records;
-    });
-    tcmDiagonsisSaveList.value.push({
-      definitionId: row.id,
-      ybNo: row.ybNo,
-      syndromeGroupNo: timestamp.value,
-      verificationStatusEnum: 4,
-      medTypeCode: '11',
-    });
-    tcmDiagonsisList.value.push({
-      conditionName: row.name,
-      syndromeGroupNo: timestamp.value,
+  tcmDiagonsisSaveList.value=[];
+  tcmDiagonsisList.value=[];
+  debugger;
+  if (props.updateZy.length>0) {
+    props.updateZy.forEach((item) => {
+        let updateIds=item.updateId.split("-");
+        let name=item.name.split("-");
+        tcmDiagonsisSaveList.value.push({
+          conditionId: updateIds[0],
+          definitionId: item.illnessDefinitionId,
+          ybNo: item.ybNo,
+          syndromeGroupNo: item.syndromeGroupNo,
+          verificationStatusEnum: 4,
+          medTypeCode: '11',
+          diagSrtNo:item.diagSrtNo,
+        });
+        tcmDiagonsisList.value.push({
+          conditionName: name[0],
+          syndromeGroupNo: item.syndromeGroupNo,
+        });
+        tcmDiagonsisSaveList.value.push({
+          conditionId: updateIds[1],
+          definitionId: item.symptomDefinitionId,
+          ybNo: item.symptomYbNo,
+          syndromeGroupNo: item.syndromeGroupNo,
+          diagSrtNo:item.diagSrtNo,
+      });
+        tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = name[1];
+        console.log("这是修改时带入的数据");
+        console.log(tcmDiagonsisList.value);
+        console.log(tcmDiagonsisSaveList.value);
+        syndromeSelected.value = true;                      
     });
   }
 }
 
+// 点击诊断列表处理，点击以后才显示证候列表
+function handleClickRow(row) {
+  if (syndromeSelected.value || tcmDiagonsisList.value.length == 0) {
+      syndromeSelected.value = false;
+    selectedDisease.value = true;
+    timestamp.value = Date.now();
+    getTcmSyndrome().then((res) => {
+      syndromeList.value = res.data.records;
+    });
+    
+    if (props.updateZy.length>0) {
+        props.updateZy.forEach((item) => {
+          let updateIds=item.updateId.split("-");
+          tcmDiagonsisSaveList.value.push({
+          updateId:updateIds[0],
+          conditionId: updateIds[0],
+          definitionId: row.id,
+          ybNo: row.ybNo,
+          syndromeGroupNo: timestamp.value,
+          verificationStatusEnum: 4,
+          medTypeCode: '11',
+          diagSrtNo:item.diagSrtNo,
+        });
+        debugger;
+        if(tcmDiagonsisList.value.length>0){
+          tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].conditionName = row.name;
+        }else{
+          tcmDiagonsisList.value.push({
+            conditionName: row.name,
+            syndromeGroupNo: timestamp.value,
+          });
+        }
+      });
+    }else{
+       tcmDiagonsisSaveList.value.push({
+        definitionId: row.id,
+        ybNo: row.ybNo,
+        syndromeGroupNo: timestamp.value,
+        verificationStatusEnum: 4,
+        medTypeCode: '11',
+      });
+        tcmDiagonsisList.value.push({
+          conditionName: row.name,
+          syndromeGroupNo: timestamp.value,
+      });
+    }
+
+
+    }
+
+      // tcmDiagonsisList.value.push({
+      //   conditionName: row.name,
+      //   syndromeGroupNo: timestamp.value,
+      // });
+
+  }
+
 function clickSyndromeRow(row) {
-  tcmDiagonsisSaveList.value.push({
-    definitionId: row.id,
-    ybNo: row.ybNo,
-    syndromeGroupNo: timestamp.value,
+  debugger;
+  let flag=true;
+  tcmDiagonsisList.value.forEach( item => {
+    if(tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].conditionName==item.conditionName){
+      if(item.syndromeName==row.name ){
+        proxy.$modal.msgWarning('不能存在完全相同的诊断和证侯');
+        flag=false;
+      }
+    }
   });
-  tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
-  syndromeSelected.value = true;
+  if(flag){
+      if(props.updateZy.length>0){
+        props.updateZy.forEach((item) => {
+          let updateIds=item.updateId.split("-");
+            tcmDiagonsisSaveList.value.push({
+              updateId:updateIds[1],
+              conditionId: updateIds[1],
+              definitionId: row.id,
+              ybNo: row.ybNo,
+              syndromeGroupNo: timestamp.value,
+            });
+            tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
+            syndromeSelected.value = true;
+        });
+        
+      }else{
+        tcmDiagonsisSaveList.value.push({
+            definitionId: row.id,
+            ybNo: row.ybNo,
+            syndromeGroupNo: timestamp.value,
+        });
+        tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
+        syndromeSelected.value = true;
+      }
+
+    
+      // tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
+      // syndromeSelected.value = true;
+  }
 }
 
 // 删除诊断
 function removeDiagnosis(row, index) {
   tcmDiagonsisList.value.splice(index, 1);
-  tcmDiagonsisSaveList.value = tcmDiagonsisSaveList.filter((item) => {
+  tcmDiagonsisSaveList.value = tcmDiagonsisSaveList.value.filter((item) => {
     return item.syndromeGroupNo !== row.syndromeGroupNo;
   });
+  
 }
 
 function save() {
+<<<<<<< HEAD
   // 为每个诊断项添加诊断医生和诊断时间
   const diagnosisChildList = tcmDiagonsisSaveList.value.map(item => ({
     ...item,
@@ -179,10 +287,40 @@ function save() {
       proxy.$modal.msgSuccess('诊断已保存');
     }
   });
+=======
+  if(props.updateZy.length>0){
+    updateTcmDiagnosis({
+      patientId: props.patientInfo.patientId,
+      encounterId: props.patientInfo.encounterId,
+      diagnosisChildList: tcmDiagonsisSaveList.value,
+      }).then((res) => {
+        if (res.code == 200) {
+          emit('close');
+          proxy.$modal.msgSuccess('诊断已保存');
+        }
+    });
+  }else{
+    saveTcmDiagnosis({
+      patientId: props.patientInfo.patientId,
+      encounterId: props.patientInfo.encounterId,
+      diagnosisChildList: tcmDiagonsisSaveList.value,
+      }).then((res) => {
+        if (res.code == 200) {
+          emit('close');
+          proxy.$modal.msgSuccess('诊断已保存');
+        }
+    });
+  }
+  
+>>>>>>> v1.3
 }
 
 function submit() {
-  if (tcmDiagonsisSaveList.value.length > 0 && syndromeSelected.value) {
+  debugger;
+  if (
+    tcmDiagonsisSaveList.value.length > 0 &&
+    (syndromeSelected.value || tcmDiagonsisSaveList.value.length % 2 == 0)
+  ) {
     save();
   } else {
     proxy.$modal.msgWarning('请选择证候');