From f631b82e020f7c2b14c3f24caae424fd3a120e52 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 28 Aug 2018 10:58:14 +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 --- .../web/facade/AntenatalExaminationFacade.java | 20 +++++++++++++++++--- .../platform/operate/web/facade/SmsConfigFacade.java | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 3 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 c93a82b..92e7970 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 @@ -726,8 +726,16 @@ 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())) + { + serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); + } + //根据服务状态和服务类型获取可以发送的模板 - List sendList = smsConfigFacade.getSendTemplateByServiceStatus(temps, serviceType, serviceStatus); + List sendList = smsConfigFacade.getSendTemplateEqServiceStatus(temps, serviceType, serviceStatus); if (CollectionUtils.isNotEmpty(temps)) { if (CollectionUtils.isNotEmpty(sendList)) { @@ -785,7 +793,6 @@ public class AntenatalExaminationFacade { mr.setServiceType((templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) ? 1 : 3); //判断发送类型 mr.setTypeId(templateModel.getHealthType()); - System.out.println("patient.getLastCheckEmployeeId()=" +doctorId); mr.setKeyword2(DateUtil.getymd()); @@ -847,8 +854,15 @@ 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())) + { + serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); + } + //根据服务状态和服务类型获取可以发送的模板 - List sendList = smsConfigFacade.getSendTemplateByServiceStatus(temps, serviceType, serviceStatus); + List sendList = smsConfigFacade.getSendTemplateEqServiceStatus(temps, serviceType, serviceStatus); if (CollectionUtils.isNotEmpty(temps)) { if (CollectionUtils.isNotEmpty(sendList)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index 6adb9ea..3d2500b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -903,6 +903,20 @@ public class SmsConfigFacade { } + public List getSendTemplateEqServiceStatus(List temps,Integer serviceType,Integer serviceStatus) + { + List sendList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(temps) && serviceStatus != null && serviceType != null) { + for (SmsTemplateModel temp : temps) { + if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { + sendList.add(temp); + } + } + } + return sendList; + } + + /** * 判断对应服务是否启动 * return 1 推送服务， 2 推送和短信服务 3短信服务， -- 1.8.3.1