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 @@ > 审核 + + 撤销审核 +