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

1. getList() 增加 res.code === 200 校验，避免API返回错误数据时静默赋值导致列表不更新 2. 父组件 @saved 事件处理器增加 surgeryRef?.getList()，确保提交后父组件侧也触发列表刷新 3. 统一响应处理模式，与 inspectionApplication 等组件保持一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #499 : 【住院医生工作站-检查申请】检查申请列表缺失查询过滤功能，不符合临床高效检索要求
2026-05-14 06:17:33 +08:00 · 2026-05-14 06:08:58 +08:00 · 2026-05-14 06:08:58 +08:00 · 2026-05-14 06:05:06 +08:00 · 2026-05-14 06:05:06 +08:00 · 2026-05-14 06:05:06 +08:00
7 changed files with 178 additions and 36 deletions
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -13,16 +13,7 @@
               drf.requester_id,
               drf.create_time,
               ap.NAME AS patient_name,
-               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
-                   ELSE NULL
-               END AS status
+               drf.status
        FROM doc_request_form AS drf
                 LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
            AND ae.delete_flag = '0'
@@ -40,16 +31,7 @@
              AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
          </if>
          <if test="status != null and status != ''">
-              AND 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
-                      ELSE NULL
-                  END = #{status}::integer
+              AND drf.status = #{status}::integer
          </if>
          <if test="keyword != null and keyword != ''">
              AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
--- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
@@ -626,14 +626,19 @@ function getList() {
    loading.value = false
    return
  }
-  
+
  loading.value = true
  getSurgeryPage({
    pageNo: 1,
    pageSize: 100,
    encounterId: props.patientInfo.encounterId
  }).then((res) => {
-    surgeryList.value = res.data.records || []
+    if (res.code === 200) {
+      surgeryList.value = res.data?.records || []
+    } else {
+      proxy.$modal.msgError(res.msg || '数据加载失败，请稍后重试')
+      surgeryList.value = []
+    }
  }).catch(error => {
    console.error('获取手术列表失败:', error)
    proxy.$modal.msgError('数据加载失败，请稍后重试')
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -151,8 +151,8 @@
              @saved="() => prescriptionRef?.getListInfo()" />
          </el-tab-pane>
          <el-tab-pane label="手术申请" name="surgery">
-            <surgeryApplication :patientInfo="patientInfo" :activeTab="activeTab" ref="surgeryRef" 
-              @saved="() => prescriptionRef?.getListInfo()" />
+            <surgeryApplication :patientInfo="patientInfo" :activeTab="activeTab" ref="surgeryRef"
+              @saved="() => { prescriptionRef?.getListInfo(); surgeryRef?.getList() }" />
          </el-tab-pane>
          <el-tab-pane label="电子处方" name="eprescription">
            <eprescriptionlist :patientInfo="patientInfo" ref="eprescriptionRef" />
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -49,6 +49,15 @@
              <el-option label="已作废" value="7" />
            </el-select>
          </el-form-item>
+          <el-form-item label="关键字">
+            <el-input
+              v-model="filterForm.keyword"
+              placeholder="申请单号 / 检查项目名称"
+              clearable
+              style="width: 220px"
+              @keyup.enter="handleSearch"
+            />
+          </el-form-item>
          <el-form-item>
            <el-button type="primary" @click="handleSearch" :loading="loading">
              <el-icon><Search /></el-icon>
@@ -86,9 +95,43 @@
              <span>{{ parseStatus(scope.row.status) }}</span>
            </template>
          </el-table-column>
-          <el-table-column label="操作" align="center" fixed="right">
+          <el-table-column label="操作" width="280" align="center" fixed="right">
            <template #default="scope">
-              <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+              <!-- 待签发：详情、修改、删除 -->
+              <template v-if="scope.row.status === '0' || scope.row.status === 0">
+                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+                <el-button link type="primary" @click="handleModify(scope.row)">修改</el-button>
+                <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
+              </template>
+              <!-- 已签发：详情、撤回 -->
+              <template v-else-if="scope.row.status === '1' || scope.row.status === 1">
+                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+                <el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
+              </template>
+              <!-- 已校对/待接收：详情、打印 -->
+              <template v-else-if="scope.row.status === '2' || scope.row.status === 2 || scope.row.status === '3' || scope.row.status === 3">
+                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+                <el-button link type="primary" @click="handlePrint(scope.row)">打印</el-button>
+              </template>
+              <!-- 已接收/已检查：详情、看报告 -->
+              <template v-else-if="scope.row.status === '4' || scope.row.status === 4 || scope.row.status === '5' || scope.row.status === 5">
+                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+                <el-button link type="success" @click="handleViewReport(scope.row)">看报告</el-button>
+              </template>
+              <!-- 已出报告：详情、打印、看报告 -->
+              <template v-else-if="scope.row.status === '6' || scope.row.status === 6">
+                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+                <el-button link type="primary" @click="handlePrint(scope.row)">打印</el-button>
+                <el-button link type="success" @click="handleViewReport(scope.row)">看报告</el-button>
+              </template>
+              <!-- 已作废：详情 -->
+              <template v-else-if="scope.row.status === '7' || scope.row.status === 7">
+                <el-button link type="info" @click="handleViewDetail(scope.row)">详情</el-button>
+              </template>
+              <!-- 其他/未知状态：仅详情 -->
+              <template v-else>
+                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+              </template>
            </template>
          </el-table-column>
        </el-table>
@@ -167,7 +210,7 @@
 import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
-import {getCheck} from './api';
+import {getCheck, deleteRequestForm, withdrawRequestForm, getTestResult} from './api';
 import {getDepartmentList} from '@/api/public.js';

 const { proxy } = getCurrentInstance();
@@ -179,10 +222,19 @@ const currentDetail = ref(null);
 const descJsonData = ref(null);
 const orgOptions = ref([]);

+// 获取近7天的日期范围作为默认值
+const getDefaultDateRange = () => {
+  const now = new Date();
+  const endDate = now.toISOString().split('T')[0];
+  const startDate = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0];
+  return [startDate, endDate];
+};
+
 // 筛选表单数据
 const filterForm = ref({
-  dateRange: [], // [startDate, endDate]
+  dateRange: getDefaultDateRange(), // 默认近一周
  status: '', // 申请单状态
+  keyword: '', // 关键字搜索
 });

 const fetchData = async () => {
@@ -207,6 +259,11 @@ const fetchData = async () => {
      params.status = filterForm.value.status;
    }

+    // 添加关键字搜索
+    if (filterForm.value.keyword && filterForm.value.keyword.trim()) {
+      params.keyword = filterForm.value.keyword.trim();
+    }
+
    const res = await getCheck(params);
    if (res.code === 200 && res.data) {
      const raw = res.data?.records || res.data;
@@ -243,8 +300,9 @@ const handleSearch = async () => {
 * 重置按钮处理
 */
 const handleReset = () => {
-  filterForm.value.dateRange = [];
+  filterForm.value.dateRange = getDefaultDateRange();
  filterForm.value.status = '';
+  filterForm.value.keyword = '';
  fetchData();
 };

@@ -359,6 +417,91 @@ const handleViewDetail = async (row) => {
  detailDialogVisible.value = true;
 };

+/**
+ * 修改申请单（仅待签发状态）
+ */
+const handleModify = (row) => {
+  proxy.$modal?.msgWarning?.('修改功能需后端支持，请联系管理员');
+};
+
+/**
+ * 删除申请单（仅待签发状态）
+ */
+const handleDelete = (row) => {
+  proxy.$confirm?.('确认删除该检查申请单吗？删除后不可恢复。', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      const res = await deleteRequestForm({ requestFormId: row.requestFormId || row.id });
+      if (res?.code === 200) {
+        proxy.$modal?.msgSuccess?.('删除成功');
+        await fetchData();
+      } else {
+        proxy.$modal?.msgError?.(res?.msg || '删除失败');
+      }
+    } catch (e) {
+      console.warn('删除申请单失败（可能后端未实现）:', e.message);
+      proxy.$modal?.msgError?.('删除失败，后端服务可能未支持此功能');
+    }
+  }).catch(() => {});
+};
+
+/**
+ * 撤回申请单（已签发状态撤回至待签发）
+ */
+const handleWithdraw = (row) => {
+  proxy.$confirm?.('确认撤回该检查申请单吗？撤回后状态将变为待签发。', '撤回确认', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      const res = await withdrawRequestForm({ requestFormId: row.requestFormId || row.id });
+      if (res?.code === 200) {
+        proxy.$modal?.msgSuccess?.('撤回成功');
+        await fetchData();
+      } else {
+        proxy.$modal?.msgError?.(res?.msg || '撤回失败');
+      }
+    } catch (e) {
+      console.warn('撤回申请单失败（可能后端未实现）:', e.message);
+      proxy.$modal?.msgError?.('撤回失败，后端服务可能未支持此功能');
+    }
+  }).catch(() => {});
+};
+
+/**
+ * 打印申请单
+ */
+const handlePrint = (row) => {
+  // 使用浏览器原生打印功能
+  window.print();
+};
+
+/**
+ * 查看检查报告
+ */
+const handleViewReport = async (row) => {
+  try {
+    const res = await getTestResult({ encounterId: row.encounterId || patientInfo.value?.encounterId });
+    if (res?.code === 200 && res.data) {
+      const reportUrl = Array.isArray(res.data) ? res.data[0]?.reportUrl : res.data?.reportUrl;
+      if (reportUrl) {
+        window.open(reportUrl, '_blank');
+      } else {
+        proxy.$modal?.msgWarning?.('暂无检查报告');
+      }
+    } else {
+      proxy.$modal?.msgWarning?.('暂无检查报告');
+    }
+  } catch (e) {
+    console.warn('查看检查报告失败:', e.message);
+    proxy.$modal?.msgError?.('获取检查报告失败');
+  }
+};
+
 watch(
  () => patientInfo.value?.encounterId,
  (val) => {
@@ -367,8 +510,9 @@ watch(
      getLocationInfo();
    } else {
      tableData.value = [];
-      filterForm.value.dateRange = [];
+      filterForm.value.dateRange = getDefaultDateRange();
      filterForm.value.status = '';
+      filterForm.value.keyword = '';
    }
  },
  { immediate: true }
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -296,6 +296,7 @@
        </template>
      </el-table-column>
    </el-table>
+    <el-empty v-if="!groupSetLoading && groupSetList.length === 0" description="暂无划价组套数据" :image-size="80" />
    <div style="margin-top: 15px; text-align: right">
      <el-button @click="groupSetDialogVisible = false">取消</el-button>
      <el-button type="primary" @click="applyGroupSet" :disabled="!selectedGroupSet">应用</el-button>
@@ -798,6 +799,7 @@ function resetData() {

 // 划价组套相关功能
 function openGroupSetDialog() {
+  console.log('openGroupSetDialog called');
  groupSetDialogVisible.value = true;
  groupSetSearchText.value = '';
  selectedGroupSet.value = null;
@@ -834,8 +836,9 @@ function loadGroupSets() {
        groupSetList.value = rawList;
      }
    })
-    .catch(() => {
-      console.warn('组套列表加载失败（可能无权限）');
+    .catch((err) => {
+      console.warn('组套列表加载失败（可能无权限）:', err);
+      ElMessage.warning('组套列表加载失败，当前暂无可用组套');
      groupSetList.value = [];
    })
    .finally(() => {
--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
@@ -85,7 +85,7 @@
        :deadline="deadline"
        :therapyEnum="therapyEnum"
      />
-      <SummaryMedicineList v-else :therapyEnum="therapyEnum" />
+      <SummaryMedicineList v-else ref="summaryMedicineRefs" :therapyEnum="therapyEnum" />
      <!-- <el-tabs v-model="activeName" class="demo-tabs centered-tabs" @tab-change="handleClick">
        <el-tab-pane
          v-for="tab in prescriptionTabs"
@@ -129,6 +129,7 @@ const therapyEnum = ref(undefined);

 // 存储子组件引用的对象
 const prescriptionRefs = ref();
+const summaryMedicineRefs = ref();

 const navigationButtons = inpatientNurseNavs;

@@ -165,7 +166,11 @@ function handleClick(tabName) {

 function handleGetPrescription() {
  chooseAll.value = false;
-  prescriptionRefs.value?.handleGetPrescription();
+  if (isDetails.value == '1') {
+    prescriptionRefs.value?.handleGetPrescription();
+  } else {
+    summaryMedicineRefs.value?.handleGetPrescription();
+  }
 }

 function handelSwicthChange(value) {
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -803,7 +803,7 @@
    </el-dialog>

    <!-- 手术计费弹窗 -->
-    <el-dialog :title="chargeDialogTitle" v-model="showChargeDialog" width="1400px" @close="closeChargeDialog" append-to-body>
+    <el-dialog :title="chargeDialogTitle" v-model="showChargeDialog" width="1400px" @close="closeChargeDialog" append-to-body destroy-on-close>
      <div style="display: flex; justify-content: space-between; height: 80vh">
        <div style="width: 100%; border: 1px solid #eee; position: relative">
          <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-left: 0">
@@ -1456,11 +1456,14 @@ async function handleChargeCharge(row) {
 }

 // 关闭计费弹窗
-function closeChargeDialog() {
+async function closeChargeDialog() {
  // 先关闭 prescriptionlist 内所有已打开的项目字典 popover
  if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
    prescriptionRef.value.closeAllPopovers()
  }
+  // 等待 Vue 完成 popover 可见性更新的 DOM 操作，
+  // 因为 el-popover 通过 teleport 渲染在 body 上，需要在 dialog 卸载前完成清理
+  await nextTick()
  // 清空数据，避免下次打开时使用缓存
  showChargeDialog.value = false
  chargePatientInfo.value = {}
Author	SHA1	Message	Date
关羽	7caac9e9a1	Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据，且提示语需优化 1. getList() 增加 res.code === 200 校验，避免API返回错误数据时静默赋值导致列表不更新 2. 父组件 @saved 事件处理器增加 surgeryRef?.getList()，确保提交后父组件侧也触发列表刷新 3. 统一响应处理模式，与 inspectionApplication 等组件保持一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 06:17:33 +08:00
关羽	e43ca4254b	Fix Bug #499 : 【住院医生工作站-检查申请】检查申请列表缺失查询过滤功能，不符合临床高效检索要求 - 新增关键字搜索输入框（申请单号/检查项目名称模糊匹配） - 设置日期范围默认为近7天 - 关键字搜索支持回车触发查询 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 06:08:58 +08:00
关羽	c954596625	Fix Bug #502 : 【住院护士站-汇总发药申请】顶部医嘱类型（长期/临时）过滤按钮点击无响应根因：汇总视图(SummaryMedicineList)没有ref属性，handleGetPrescription()只调用了prescriptionRefs.value?.handleGetPrescription()，当isDetails=='2'时PrescriptionList被v-if隐藏，prescriptionRefs.value为null，导致汇总列表不刷新。修复：1. 给SummaryMedicineList添加ref="summaryMedicineRefs" 2. handleGetPrescription()根据isDetails值调用对应的子组件刷新方法 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 06:08:58 +08:00
关羽	3e5db107fb	Fix Bug #498 : 【住院医生工作站-检查申请】检查申请列表操作项过于单一，缺失修改/作废/打印/看报告等核心临床操作根据申请单状态动态展示操作按钮： - 待签发：详情、修改、删除 - 已签发：详情、撤回 - 已校对/待接收：详情、打印 - 已接收/已检查：详情、看报告 - 已出报告：详情、打印、看报告 - 已作废：详情 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 06:05:06 +08:00
荀彧	26cf16067b	Fix Bug #497 : 【住院医生工作站-检查申请】检查申请列表缺失"申请单状态"列及全流程闭环状态流转逻辑根因：SQL 查询使用 CASE MIN(wsr.status_enum) 计算状态，但聚合函数 MIN() 出现在 WHERE 子句中， PostgreSQL 语法错误导致状态筛选时查询失败。且计算状态仅映射 5 种值（缺少"待接收"=3、"已出报告"=6）。修复：改为直接使用 doc_request_form.status 字段（数据库已存在该列）， SELECT 和 WHERE 均使用 drf.status，支持完整 0-7 状态流转。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 06:05:06 +08:00
荀彧	6648cd2e50	Fix Bug #508 : [住院护士站-住院记账-补费] 点击"划价组套"按钮无任何响应，无法选择组套项目 - 新增 el-empty 空状态提示：当组套列表为空时显示"暂无划价组套数据"，避免用户看到空白表格误认为页面无响应 - 改进错误处理：API 失败时弹出 ElMessage.warning 提示用户，替代之前仅 console.warn 的静默处理 - 添加调试日志：openGroupSetDialog 入口添加 console.log 便于排查按钮点击是否触发 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 06:05:06 +08:00
赵云	f1a5b17a83	Fix Bug #492 : 【门诊手术安排】关闭"手术计费"主弹窗后，项目字典选择列表依然残留悬浮在界面上根因: el-popover 通过 teleport 渲染在 document.body 上，closeChargeDialog() 调用 closeAllPopovers() 后立即设置 showChargeDialog=false，dialog 在 Vue 完成 popover DOM 清理前就开始卸载，导致 teleported popover 残留。修复: 1. closeChargeDialog 改为 async，closeAllPopovers 后 await nextTick() 确保 popover 可见性变更的 DOM 更新完成后再关闭 dialog 2. el-dialog 添加 destroy-on-close 属性，确保关闭时完整销毁内容区及所有子组件的 teleport	2026-05-14 05:06:44 +08:00