From 1f84a641ea01602decb11c77f1712dc001918c32 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 24 Mar 2026 18:38:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(prescription):=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E6=92=A4=E5=9B=9E=E6=9D=A1=E4=BB=B6=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了撤回功能允许已作废医嘱撤回的错误
- 现在只有状态为草稿(1)或已签发(2)的医嘱可以撤回
- 已作废(5)状态的医嘱不再支持撤回操作，只能通过删除处理
- 更新了撤回条件判断逻辑以确保数据一致性
---
 .../components/prescription/prescriptionlist.vue             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index cbac8cff..95fe0f99 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -3636,8 +3636,9 @@ function handleSingOut() {
     // 🔧 BugFix: 将requestId转换为数字类型
     let requestIdList = normalRows
       .filter((item) => {
-        // 🔧 BugFix: 支持 statusEnum 为 1(草稿)、2(已签发)、5(已作废) 的医嘱都可以撤回
-        const canRecall = item.statusEnum == 1 || item.statusEnum == 2 || item.statusEnum == 5;
+        // 🔧 BugFix: 只有 statusEnum 为 1(草稿)、2(已签发) 的医嘱可以撤回
+        // 已作废(5)的医嘱不能撤回，只能删除
+        const canRecall = item.statusEnum == 1 || item.statusEnum == 2;
         console.log('BugFix#219: 检查撤回条件, adviceName=', item.adviceName, 
           'statusEnum=', item.statusEnum, 'canRecall=', canRecall);
         return canRecall;