diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 92e7970..2f9c2e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -727,8 +727,8 @@ public class AntenatalExaminationFacade { Integer serviceType = 0; Integer serviceStatus = 0; - if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceTypeEnums.STANDARD_SERVICE.getId() - && patient.getServiceType() == ServiceStatusEnums.NO_OPEN.getId())) + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId() + && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) { serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); @@ -854,8 +854,8 @@ public class AntenatalExaminationFacade { Integer serviceType = 0; Integer serviceStatus = 0; - if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceTypeEnums.STANDARD_SERVICE.getId() - && patient.getServiceType() == ServiceStatusEnums.NO_OPEN.getId())) + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId() + && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) { serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();