From 2a8e662b440e4438ba3d2e73345778e58966b079 Mon Sep 17 00:00:00 2001
From: liubei <liubei@gentronhealth.com>
Date: Thu, 23 Apr 2026 17:14:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Bug=20#395=20=E7=96=BE=E7=97=85=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=8D=A1=E6=B7=BB=E5=8A=A0=E6=92=A4=E9=94=80=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8A=9F=E8=83=BD=20|=20Bug=20#398/#399=20=E9=97=A8?=
 =?UTF-8?q?=E8=AF=8A=E9=A2=84=E7=BA=A6=E5=B7=B2=E9=A2=84=E7=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=96=E5=8F=B7=E8=AE=B0=E5=BD=95=E4=B8=8D=E5=BA=94?=
 =?UTF-8?q?=E8=A2=AB=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outpatientAppointment/index.vue           | 11 ++++-
 .../ReportManagement/index.vue                | 41 +++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
index e98e4ed8..336bcfff 100644
--- a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
@@ -739,9 +739,15 @@ export default {
         status: record.statusEnum_enumText || record.status
       }));
 
-      // 先进行时间过滤(过滤掉已过期的号源)
+      // 🔧 BugFix#398/#399: 时间过滤仅对"未预约"号源生效
+      // 已预约、已取号、已退号等状态的记录不应因时间过期被过滤
       const currentTime = new Date().getTime();
       const timeFilteredRecords = mappedRecords.filter(ticket => {
+        // 非未预约状态的记录不过滤时间
+        if (ticket.status && ticket.status !== '未预约') {
+          return true;
+        }
+        // 未预约号源：过滤已过期的
         const ticketTime = new Date(ticket.dateTime).getTime();
         return ticketTime > currentTime;
       });
@@ -765,10 +771,11 @@ export default {
       if (!this.selectedStatus || this.selectedStatus === 'all') {
         return records;
       }
+      // 🔧 BugFix#399: 确保已取号状态正确匹配
       const statusMap = {
         unbooked: ['未预约'],
         booked: ['已预约'],
-        checked: ['已取号'],
+        checked: ['已取号', '已签到'],
         cancelled: ['已停诊', '已取消'],
         returned: ['已退号']
       };
diff --git a/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue b/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
index 477f75c2..ff4200de 100644
--- a/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
+++ b/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
@@ -205,6 +205,14 @@
               >
                 审核
               </el-button>
+              <el-button
+                v-if="row.status === 2"
+                type="warning"
+                link
+                @click="handleRevokeAudit(row)"
+              >
+                撤销审核
+              </el-button>
               <el-button
                 type="info"
                 link
@@ -825,6 +833,39 @@ function handleView(row) {
   loadCardDetail(row.cardNo);
 }
 
+// 撤销审核
+async function handleRevokeAudit(row) {
+  try {
+    await ElMessageBox.confirm(
+      '确定要撤销此报卡的审核吗？',
+      '确认撤销',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    );
+    
+    const res = await returnInfectiousCard({
+      cardNo: row.cardNo,
+      returnReason: '撤销审核'
+    });
+    
+    if (res.code === 200) {
+      ElMessage.success('撤销审核成功');
+      loadTableData();
+      loadStats();
+    } else {
+      ElMessage.error(res.msg || '撤销审核失败');
+    }
+  } catch (err) {
+    if (err !== 'cancel') {
+      ElMessage.error('撤销审核失败');
+      console.error(err);
+    }
+  }
+}
+
 // 加载卡片详情
 async function loadCardDetail(cardNo) {
   drawerLoading.value = true;