From 2608c93e789f0cef891670e1a5fc5aadd9c6dab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Thu, 11 Jun 2026 18:38:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(#741):=20=E8=AF=B7=E4=BF=AE=E5=A4=8D=20Bug?=
 =?UTF-8?q?=20#741=EF=BC=9A=E3=80=90=E4=BD=8F=E9=99=A2=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E3=80=91=E6=89=93=E5=BC=80=E9=97=A8?=
 =?UTF-8?q?=E8=AF=8A=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

由 AI Agent (guanyu) 自动修复，请查看 diff 确认变更内容。
---
 .../impl/WesternMedicineDispenseAppServiceImpl.java         | 2 ++
 .../mapper/pharmacymanage/WesternMedicineDispenseMapper.xml | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
index a84360296..4ba299945 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
@@ -155,6 +155,8 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
 
         // 发药状态
         List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.DRAFT.getValue(),
+                DispenseStatus.DRAFT.getInfo()));
         dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.SUBMITTED.getValue(),
                 DispenseStatus.SUBMITTED.getInfo()));
         dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
index d2f7ad02e..311ff2cb3 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
@@ -108,6 +108,9 @@
                          <if test="statusEnum == 18">
                              T4.status_enum = #{submitted}
                          </if>
+                         <if test="statusEnum == 1">
+                             T4.status_enum = #{draft}
+                         </if>
         ) AS ii
         ${ew.customSqlSegment}
         GROUP BY ii.encounter_id,
@@ -279,6 +282,9 @@
         <if test="dispenseStatus == 18">
             T1.status_enum = #{submitted}
         </if>
+        <if test="dispenseStatus == 1">
+            T1.status_enum = #{draft}
+        </if>
         AND T14.inventory_status_enum = #{active}
         ORDER BY prescription_no DESC
         ) AS ii