From 6dc2a715c8c29d9227a2150f51cca452b623aa33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Tue, 2 Jun 2026 02:07:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(#614):=20=E8=AF=B7=E4=BF=AE=E5=A4=8D=20Bug?=
 =?UTF-8?q?=20#614=EF=BC=9A=E3=80=90=E4=BD=8F=E9=99=A2=E6=8A=A4=E5=A3=AB?=
 =?UTF-8?q?=EF=BC=9A=E5=8C=BB=E5=98=B1=E6=89=A7=E8=A1=8C=20=20=E4=BD=8F?=
 =?UTF-8?q?=E9=99=A2=E5=8F=91=E9=80=80=E8=8D=AF=E3=80=91=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E8=8D=AF=E5=8C=BB=E5=98=B1=E5=8F=96=E6=B6=88=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=9C=AA=E8=BF=9B=E5=85=A5=E2=80=9C=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=89=A7=E8=A1=8C=E2=80=9D=E5=88=97=E8=A1=A8=E4=B8=94?=
 =?UTF-8?q?=E6=9C=AA=E8=81=94=E5=8A=A8=E7=94=9F=E6=88=90=E2=80=9C=E4=BD=8F?=
 =?UTF-8?q?=E9=99=A2=E9=80=80=E8=8D=AF=E5=8D=95=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因：
- Bug #请修复 Bug #614 存在的问题

修复：
- 修复完成。develop 上的 commit `b5918c8a3` 已包含相同的修复逻辑，当前 `guanyu` 分支已同步应用了相同的 3 处改动。
---
 .../appservice/impl/AdviceProcessAppServiceImpl.java         | 5 ++++-
 .../src/views/inpatientNurse/medicalOrderExecution/index.vue | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
index 6610f7237..d32571262 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -557,7 +557,10 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         // 处理长期已发放的药品
         if (!longMedDispensedList.isEmpty()) {
             // 生成退药单
-            this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap);
+            this.creatRefundMedicationList(longMedDispensedList, procedureIdMap);
+            // 药品退药请求状态变更(待退药)
+            medicationRequestService.updateCancelledStatusBatch(
+                    longMedDispensedList.stream().map(MedicationDispense::getMedReqId).toList(), null, null);
         }
         // 处理临时已发放药品
         if (!tempMedDispensedList.isEmpty()) {
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue
index 905890e44..8b5da843b 100755
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue
@@ -99,6 +99,7 @@ function handleClick(tabName) {
       break;
     case 'cancel':
       exeStatus.value = 9;
+      requestStatus.value = RequestStatus.CANCELLED;
       break;
   }