From f58491aa5fdc685fbdfea9242cf2fcd5c5492b66 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 28 Aug 2018 14:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=BC=80=E9=80=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BC=80=E9=80=9A=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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(); -- 1.8.3.1