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