From 3e09b4cc1001175aff96c7a70f58e659b308dace Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Wed, 25 Feb 2026 13:39:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(chargemanage):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=8C=82=E5=8F=B7=E9=80=80=E5=8F=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加待诊状态检查，只允许待诊状态的患者退号
- 防止已接诊患者进行退号操作
- 完善退号业务流程的状态验证机制
---
 .../appservice/impl/OutpatientRegistrationAppServiceImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
index 6e65d769..47e55783 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
@@ -247,6 +247,10 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         if (EncounterStatus.CANCELLED.getValue().equals(byId.getStatusEnum())) {
             return R.fail(null, "该患者已经退号，请勿重复退号");
         }
+        // 只有待诊状态才能退号
+        if (!EncounterStatus.PLANNED.getValue().equals(byId.getStatusEnum())) {
+            return R.fail(null, "该患者医生已接诊，不能退号！");
+        }
         iEncounterService.returnRegister(cancelRegPaymentDto.getEncounterId());
         // 查询账户信息
         Account account = iAccountService