Fix Bug #509: [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据

- 提交成功后直接调用 getList() 刷新手术申请列表，不再仅依赖父组件的 emit('saved') 事件
- 修复原因：父组件通过 surgeryRef?.getList() 可选链调用可能因 ref 未就绪或时序问题导致静默跳过

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,6 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
+        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
+        inpatientAdviceParam.setRequestStatus(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);

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

@@ -13,15 +13,14 @@
                drf.requester_id,
                drf.create_time,
                ap.NAME AS patient_name,
-                CASE MIN(wsr.status_enum)
+                CASE
-                    WHEN 1 THEN 0
+                    WHEN MIN(wsr.status_enum) = 1 THEN 0
-                    WHEN 2 THEN 1
+                    WHEN MIN(wsr.status_enum) = 2 THEN 1
-                    WHEN 3 THEN 4
+                    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 4 THEN 4
+                    WHEN MIN(wsr.status_enum) = 3 THEN 4
-                    WHEN 5 THEN 5
+                    WHEN MIN(wsr.status_enum) = 4 THEN 3
-                    WHEN 6 THEN 5
+                    WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
-                    WHEN 7 THEN 5
+                    WHEN MIN(wsr.status_enum) = 8 THEN 6
-                    WHEN 8 THEN 6
                     ELSE NULL
                 END AS status
         FROM doc_request_form AS drf
@@ -41,15 +40,14 @@
               AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
           </if>
           <if test="status != null and status != ''">
-               AND CASE MIN(wsr.status_enum)
+               AND CASE
-                       WHEN 1 THEN 0
+                       WHEN MIN(wsr.status_enum) = 1 THEN 0
-                       WHEN 2 THEN 1
+                       WHEN MIN(wsr.status_enum) = 2 THEN 1
-                       WHEN 3 THEN 4
+                       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 4 THEN 4
+                       WHEN MIN(wsr.status_enum) = 3 THEN 4
-                       WHEN 5 THEN 5
+                       WHEN MIN(wsr.status_enum) = 4 THEN 3
-                       WHEN 6 THEN 5
+                       WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
-                       WHEN 7 THEN 5
+                       WHEN MIN(wsr.status_enum) = 8 THEN 6
-                       WHEN 8 THEN 6
                        ELSE NULL
                    END = #{status}::integer
           </if>
@@ -164,7 +162,7 @@
                     AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
                 </if>
                 <if test="requestFormDto.typeCode != null and requestFormDto.typeCode != ''">
-                    AND drf.type_code = #{requestFormDto.typeCode}
+                    AND drf.type_code IN (#{requestFormDto.typeCode}, 'SURGERY')
                 </if>
                 <if test="requestFormDto.applyTimeStart != null">
                     AND drf.create_time >= #{requestFormDto.applyTimeStart}

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java

@@ -49,6 +49,11 @@ public enum RequestStatus implements HisEnumInterface {
      */
     ENDED(7, "ended", "不执行"),
 
+    /**
+     * 已出报告
+     */
+    COMPLETED_REPORT(8, "completed_report", "已出报告"),
+
     /**
      * 未知
      */

openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -1142,7 +1142,8 @@ function submitForm() {
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
-            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
+            getList() // 提交成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
           } else {
             proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
           }
@@ -1158,7 +1159,8 @@ function submitForm() {
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
-            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
+            getList() // 修改成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
           } else {
             proxy.$modal.msgError(res.msg || '更新手术失败，请检查表单信息')
           }

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

@@ -513,6 +513,30 @@ const findTreeItem = (list, id) => {
   return null;
 };
 
+const recursionFun = (targetDepartment) => {
+  if (!targetDepartment) return '';
+  let name = '';
+  for (let index = 0; index < orgOptions.value.length; index++) {
+    const obj = orgOptions.value[index];
+    if (obj.id == targetDepartment) {
+      name = obj.name;
+      break;
+    }
+    const subObjArray = obj['children'];
+    if (subObjArray && subObjArray.length > 0) {
+      for (let i = 0; i < subObjArray.length; i++) {
+        const item = subObjArray[i];
+        if (item.id == targetDepartment) {
+          name = item.name;
+          break;
+        }
+      }
+    }
+    if (name) break;
+  }
+  return name;
+};
+
 const handleViewDetail = async (row) => {
   // 确保科室数据已加载，以便将 ID 解析为名称
   if (!orgOptions.value || orgOptions.value.length === 0) {
@@ -526,8 +550,7 @@ const handleViewDetail = async (row) => {
       const obj = JSON.parse(row.descJson);
       // 将发往科室 ID 转换为名称
       if (obj.targetDepartment) {
-        const deptItem = findTreeItem(orgOptions.value, obj.targetDepartment);
+        obj.targetDepartment = recursionFun(obj.targetDepartment);
-        obj.targetDepartment = deptItem ? deptItem.name : obj.targetDepartment;
       }
       descJsonData.value = obj;
     } catch (e) {