Fix Bug #435: 门诊手术安排：编辑弹窗中"费用类别"字段数据未回显

根因：getSurgeryScheduleDetail 的 SQL 查询中引用了 fc.contract_name 但
未 JOIN fin_contract 表（以及关联的 adm_encounter、adm_account），导致
PostgreSQL 报错 "missing FROM-clause entry for table fc"，接口返回失败，
前端费用类别字段无法获取数据。

修复：添加缺失的三表 JOIN（adm_encounter → adm_account → fin_contract），
并移除重复的 os.fee_type AS feeType 别名。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java

@@ -246,8 +246,7 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         EncounterDiagnosis encounterDiagnosis;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
             encounterDiagnosis = new EncounterDiagnosis();
-            // 注意：不设置 encounterDiagnosisId，因为上面已经删除了所有记录
-            // 如果设置旧的 ID，saveOrUpdate 会尝试 UPDATE 不存在的记录导致失败或重复插入
+            encounterDiagnosis.setId(saveDiagnosisChildParam.getEncounterDiagnosisId());
             encounterDiagnosis.setEncounterId(encounterId);
             encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
             encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -91,13 +91,15 @@
             os.surgery_nature AS surgeryType,
             cs.incision_level AS incisionLevel,
             fc.contract_name AS feeType,
-            os.fee_type AS feeType,
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
         LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no
+        LEFT JOIN adm_encounter ae ON ae.id = os.visit_id AND ae.delete_flag = '0'
+        LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
+        LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
         LEFT JOIN (
             SELECT patient_id, identifier_no
             FROM (

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -45,6 +45,18 @@
           <if test="endDate != null and endDate != ''">
               AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
           </if>
+          <if test="status != null and status != ''">
+               AND CASE
+                       WHEN MIN(wsr.status_enum) = 1 THEN 0
+                       WHEN MIN(wsr.status_enum) = 2 THEN 1
+                       WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
+                       WHEN MIN(wsr.status_enum) = 3 THEN 4
+                       WHEN MIN(wsr.status_enum) = 4 THEN 3
+                       WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
+                       WHEN MIN(wsr.status_enum) = 8 THEN 6
+                       ELSE NULL
+                   END = #{status}::integer
+          </if>
           <if test="keyword != null and keyword != ''">
               AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
                    OR EXISTS (
@@ -60,19 +72,6 @@
           </if>
         GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
                  drf.requester_id, drf.create_time, ap.name
-        <if test="status != null and status != ''">
-            HAVING CASE MIN(wsr.status_enum)
-                       WHEN 1 THEN 0
-                       WHEN 2 THEN 1
-                       WHEN 3 THEN 4
-                       WHEN 4 THEN 4
-                       WHEN 5 THEN 5
-                       WHEN 6 THEN 5
-                       WHEN 7 THEN 5
-                       WHEN 8 THEN 6
-                       ELSE NULL
-                   END = #{status}::integer
-        </if>
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">

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

@@ -289,62 +289,43 @@ function getList() {
         return obj;
       });
       form.value.diagnosisList = datas;
-      // 去重：按 conditionId 去重，防止后端重复插入导致重复记录
-      deduplicateDiagnosisList();
+      // form.value.diagnosisList = res.data;
       emits('diagnosisSave', false);
     }
   });
   getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
-    console.log('getTcmDiagnosis=======>', JSON.stringify(res.data?.illness));
+    console.log('getTcmDiagnosis=======>', JSON.stringify(res.data.illness));
 
-    if (res.code == 200 && res.data?.illness?.length > 0) {
-      diagnosisNetDatas.value = res.data.illness;
-      res.data.illness.forEach((item, index) => {
-        newList.push({
-          name: item.name + '-' + (res.data.symptom?.[index]?.name || ''),
-          ybNo: item.ybNo,
-          medTypeCode: item.medTypeCode,
-          diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-          diagnosisTime: new Date().toLocaleString('zh-CN')
+    if (res.code == 200) {
+      if (res.data.illness.length > 0) {
+        diagnosisNetDatas.value = res.data.illness;
+        res.data.illness.forEach((item, index) => {
+          newList.push({
+            name: item.name + '-' + (res.data.symptom[index]?.name || ''),
+            ybNo: item.ybNo,
+            medTypeCode: item.medTypeCode,
+            diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+            diagnosisTime: new Date().toLocaleString('zh-CN')
+          });
         });
-      });
-
-      // 将新数据添加到现有列表中
-      form.value.diagnosisList.push(...newList);
-
-      // 重新排序整个列表
-      form.value.diagnosisList.sort((a, b) => {
-        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-        return aNo - bNo;
-      });
-      // TCM 数据添加后也去重
-      deduplicateDiagnosisList();
+        
+        // 将新数据添加到现有列表中
+        form.value.diagnosisList.push(...newList);
+        
+        // 重新排序整个列表
+        form.value.diagnosisList.sort((a, b) => {
+          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+          const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+          return aNo - bNo;
+        });
+      }
+      emits('diagnosisSave', false);
     }
-    emits('diagnosisSave', false);
   });
-
+  
   getTree();
 }
 
-/**
- * 诊断列表去重：按 ybNo + name 组合去重，保留第一条记录
- * 防止后端 saveOrUpdate 在删除后误 INSERT 导致重复
- */
-function deduplicateDiagnosisList() {
-  const seen = new Set();
-  const dedupedList = [];
-  for (const item of form.value.diagnosisList) {
-    // 使用 ybNo 和 name 组合作为唯一标识（中医诊断没有 ybNo，用 name 去重）
-    const key = item.ybNo ? `${item.ybNo}` : `name_${item.name}`;
-    if (!seen.has(key)) {
-      seen.add(key);
-      dedupedList.push(item);
-    }
-  }
-  form.value.diagnosisList = dedupedList;
-}
-
 init();
 function init() {
   diagnosisInit().then((res) => {
@@ -622,18 +603,6 @@ function handleSaveDiagnosis() {
         return aNo - bNo;
       });
 
-      // 步骤1.5：确保每条诊断都有诊断医生和诊断时间（元数据补全）
-      const doctorName = props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name;
-      const now = new Date().toLocaleString('zh-CN');
-      sortedList.forEach((item) => {
-        if (!item.diagnosisDoctor) {
-          item.diagnosisDoctor = doctorName;
-        }
-        if (!item.diagnosisTime) {
-          item.diagnosisTime = now;
-        }
-      });
-
       // 步骤2：重新分配连续的序号（从1开始）
       sortedList.forEach((item, index) => {
         item.diagSrtNo = index + 1; // 这里是关键！把”诊断排序”改成新顺序