Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

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

@@ -143,7 +143,7 @@ function handleOpen() {
           ybNo: item.ybNo,
           syndromeGroupNo: item.syndromeGroupNo,
           verificationStatusEnum: 4,
-          medTypeCode: '11',
+          medTypeCode: item.medTypeCode || undefined,  // 使用已保存的值
           diagSrtNo: item.diagSrtNo,
           isExisting: true // 标记为已存在
         },
@@ -188,7 +188,7 @@ function handleOpen() {
                   ybNo: item.ybNo,
                   syndromeGroupNo: item.syndromeGroupNo,
                   verificationStatusEnum: item.verificationStatusEnum || 4,
-                  medTypeCode: item.medTypeCode || '11',
+                  medTypeCode: item.medTypeCode || undefined,  // 使用已保存的值
                   diagSrtNo: item.diagSrtNo,
                   isExisting: true // 标记为已存在
                 },
@@ -227,7 +227,7 @@ function handleClickRow(row) {
       ybNo: row.ybNo,
       syndromeGroupNo: timestamp.value,
       verificationStatusEnum: 4,
-      medTypeCode: '11',
+      medTypeCode: undefined,  // 不设默认值
       isExisting: false // 标记为新增
     });
     tcmDiagonsisList.value.push({

openhis-ui-vue3/src/views/doctorstation/index.vue

@@ -623,7 +623,38 @@ function handleLeave(encounterId) {
   });
 }
 
-function handleFinish(encounterId) {
+async function handleFinish(encounterId) {
+  // 完诊前验证诊断信息
+  try {
+    const diagnosisRes = await getEncounterDiagnosis(encounterId);
+    if (diagnosisRes.code === 200) {
+      const diagnosisList = diagnosisRes.data || [];
+
+      // 检查是否有诊断
+      if (diagnosisList.length === 0) {
+        proxy.$modal.msgWarning('请先添加诊断信息');
+        return;
+      }
+
+      // 检查诊断类型是否为空
+      const emptyMedType = diagnosisList.find(d => !d.medTypeCode);
+      if (emptyMedType) {
+        proxy.$modal.msgWarning('请选择诊断类型');
+        return;
+      }
+
+      // 检查是否有主诊断
+      if (!diagnosisList.some(d => d.maindiseFlag === 1)) {
+        proxy.$modal.msgWarning('请至少设置一条主诊断');
+        return;
+      }
+    }
+  } catch (error) {
+    console.error('获取诊断信息失败:', error);
+    proxy.$modal.msgWarning('获取诊断信息失败，请重试');
+    return;
+  }
+
   completeEncounter({ encounterId, firstEnum: firstEnum.value }).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess('操作成功');

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

@@ -153,7 +153,7 @@ function handleClickRow(row) {
       ybNo: row.ybNo,
       syndromeGroupNo: timestamp.value,
       verificationStatusEnum: 4,
-      medTypeCode: '11',
+      medTypeCode: undefined,  // 不设默认值
     });
     tcmDiagonsisList.value.push({
       conditionName: row.name,

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -415,7 +415,7 @@ function handleAddDiagnosis() {
         showPopover: false,
         name: undefined,
         verificationStatusEnum: 4,
-        medTypeCode: '11',
+        medTypeCode: undefined,  // 不设默认值
         diagSrtNo: form.value.diagnosisList.length + 1,
         iptDiseTypeCode: 2,
         diagnosisDesc: '',
@@ -632,7 +632,7 @@ function handleNodeClick(data) {
     ybNo: data.ybNo,
     name: data.name,
     verificationStatusEnum: 4,
-    medTypeCode: '11',
+    medTypeCode: undefined,  // 不设默认值
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,