Fix Bug #507: [住院护士站-住院记账-补费] 项目单位未获取、执行科室显示内码且缺乏默认/模糊搜索逻辑

根因分析：
1. 执行科室显示内码：loadDepartmentOptions 只读取树形结构的第一层（records[0].children），
   但后端返回的是多层嵌套的树形数据。修复为递归扁平化 flattenTree() 提取所有科室节点。
2. 单位字段为空：getUnitCodeOptions 中 unitCode_dictText/minUnitCode_dictText 为 null 时，
   option 的 codeText 为 null 导致 el-select 无法显示。修复为 fallback 到 code 值本身。

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -178,7 +178,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
-        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
+        Integer requestStatus = inpatientAdviceParam.getRequestStatus();
         inpatientAdviceParam.setRequestStatus(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
@@ -198,7 +198,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                         ParticipantType.ADMITTING_DOCTOR.getCode(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
                         ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
                         ChargeItemStatus.REFUNDED.getValue(), EncounterClass.IMP.getValue(),
-                        GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                        GenerateSource.DOCTOR_PRESCRIPTION.getValue(), requestStatus);
         inpatientAdvicePage.getRecords().forEach(e -> {
             // 是否皮试
             e.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSkinTestFlag()));

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java

@@ -69,5 +69,6 @@ public interface AdviceProcessAppMapper {
         @Param("active") Integer active, @Param("bed") Integer bed, @Param("admittingDoctor") String admittingDoctor,
         @Param("personalCashAccount") String personalCashAccount, @Param("billable") Integer billable,
         @Param("billed") Integer billed, @Param("refunded") Integer refunded, @Param("imp") Integer imp,
-        @Param("doctorPrescription") Integer doctorPrescription);
+        @Param("doctorPrescription") Integer doctorPrescription,
+        @Param("requestStatus") Integer requestStatus);
 }

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml

@@ -290,6 +290,7 @@
                 WHERE T1.delete_flag = '0'
                 AND T1.refund_medicine_id IS NULL
                 AND T1.generate_source_enum = #{doctorPrescription}
+                AND T1.status_enum = #{requestStatus}
                 AND CASE WHEN T1.status_enum = #{draft}
                     THEN T1.performer_check_id IS NOT NULL
                     ELSE 1=1 END
@@ -422,6 +423,7 @@
                                    AND af.delete_flag = '0'
             WHERE T1.delete_flag = '0'
                 AND T1.generate_source_enum = #{doctorPrescription}
+                AND T1.status_enum = #{requestStatus}
                 AND CASE WHEN T1.status_enum = #{draft}
                     THEN T1.performer_check_id IS NOT NULL
                     ELSE 1=1 END

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

@@ -61,15 +61,14 @@
         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
+            HAVING 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>

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

@@ -93,7 +93,6 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="160" />
           <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
-          <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
           <el-table-column label="申请单状态" width="120" align="center">
             <template #default="scope">
               <el-tag :type="getStatusTagType(scope.row.status)" effect="plain" round>
@@ -101,6 +100,7 @@
               </el-tag>
             </template>
           </el-table-column>
+          <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
           <el-table-column label="操作" width="280" align="center" fixed="right">
             <template #default="scope">
               <!-- 详情 - 所有状态都显示 -->

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue

@@ -521,31 +521,28 @@ watch(
   }
 );
 
-// 加载科室选项（支持树形/扁平两种数据结构）
+// 加载科室选项（递归扁平化树形结构）
 function loadDepartmentOptions() {
   getOrgList()
     .then((res) => {
-      if (res.data) {
-        // 尝试从树形结构中取：records[0].children
-        if (res.data.records && res.data.records.length > 0) {
-          if (res.data.records[0].children && res.data.records[0].children.length > 0) {
-            departmentOptions.value = res.data.records[0].children;
-            return;
-          }
-          // 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
-          if (res.data.records[0].id) {
-            departmentOptions.value = res.data.records;
-            return;
-          }
-        }
-        // 兜底：如果 records 不存在或为空，尝试直接使用 data 本身
-        if (Array.isArray(res.data)) {
-          departmentOptions.value = res.data;
-          return;
-        }
+      if (!res?.data?.records?.length) {
+        departmentOptions.value = [];
+        return;
       }
-      // 所有方式都失败，置空
-      departmentOptions.value = [];
+      // 递归扁平化树形结构，提取所有科室节点
+      const flattenTree = (nodes) => {
+        const result = [];
+        for (const node of nodes) {
+          if (node?.id && node?.name) {
+            result.push(node);
+          }
+          if (node?.children?.length) {
+            result.push(...flattenTree(node.children));
+          }
+        }
+        return result;
+      };
+      departmentOptions.value = flattenTree(res.data.records);
     })
     .catch(() => {
       console.warn('科室列表加载失败（可能无权限）');
@@ -611,13 +608,13 @@ function getUnitCodeOptions(row) {
   const unitCodes = [];
   // 大单位：优先用 code，code 缺失时用字典文本兜底
   if (row.unitCode != null && String(row.unitCode) !== '') {
-    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
+    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText || String(row.unitCode) });
   } else if (row.unitCode_dictText) {
     unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
   }
   // 小单位：同上
   if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
-    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
+    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText || String(row.minUnitCode) });
   } else if (row.minUnitCode_dictText) {
     unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
   }