提交merge1.3

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

@@ -269,25 +269,6 @@ function removeDiagnosis(row, index) {
 }
 
 function save() {
-<<<<<<< HEAD
-  // 为每个诊断项添加诊断医生和诊断时间
-  const diagnosisChildList = tcmDiagonsisSaveList.value.map(item => ({
-    ...item,
-    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || '',
-    diagnosisTime: new Date().toLocaleString('zh-CN')
-  }));
-  
-  saveTcmDiagnosis({
-    patientId: props.patientInfo.patientId,
-    encounterId: props.patientInfo.encounterId,
-    diagnosisChildList: diagnosisChildList,
-  }).then((res) => {
-    if (res.code == 200) {
-      emit('close');
-      proxy.$modal.msgSuccess('诊断已保存');
-    }
-  });
-=======
   if(props.updateZy.length>0){
     updateTcmDiagnosis({
       patientId: props.patientInfo.patientId,
@@ -312,7 +293,6 @@ function save() {
     });
   }
   
->>>>>>> v1.3
 }
 
 function submit() {