diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java index d6f82a4..b961e91 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java @@ -305,7 +305,9 @@ public class PatientRegistrationService extends BaseService { if (statusEnum.equals(RegistrationStatusEnum.waiting) && !patientRegistration.getStatus().equals(RegistrationStatusEnum.inProgress.getStatus())){ throw new MessageException("初始状态不对"); } - if (statusEnum.equals(RegistrationStatusEnum.cancel) && !patientRegistration.getStatus().equals(RegistrationStatusEnum.inProgress.getStatus())){ + if (statusEnum.equals(RegistrationStatusEnum.cancel) + && patientRegistration.getStatus().equals(RegistrationStatusEnum.inProgress.getStatus()) + && patientRegistration.getStatus().equals(RegistrationStatusEnum.complete.getStatus())){ throw new MessageException("初始状态不对"); } PatientRegistration updateRegistration = new PatientRegistration();