From a56acd413179e6a000cc6d8ac3156773e75bf887 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 23 Sep 2016 10:51:31 +0800 Subject: [PATCH] code update --- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 12 +++++++++++- .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e64e847..3d6e940 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -245,8 +245,18 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(list)) { BabyModel babyModel = list.get(0); - if (babyModel.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId()) + if (!(babyModel.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId())) { + + if (babyModel.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) + { + babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + } + else if (babyModel.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + { + babyModel.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + } + createBuildSms(babyModel); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 0bdafba..7c4a345 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -479,8 +479,18 @@ public class BookbuildingFacade { if (CollectionUtils.isNotEmpty(list)) { Patients pat = list.get(0); - if (pat.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() && pat.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId()) + if (!(pat.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId() || pat.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId())) { + + if (pat.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) + { + pat.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + } + else if (pat.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + { + pat.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + } + createBuildSms(pat); } } -- 1.8.3.1