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 b31ce04..ab2ed7f 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 @@ -273,6 +273,7 @@ public class BookbuildingFacade { SmsTemplateQuery query = new SmsTemplateQuery(); query.setYn(YnEnums.YES.getId()); + query.setStatus(1); query.setHospitalId(patient.getHospitalId()); query.setServiceObj(ServiceObjEnums.YUNOBJ.getId()); query.setSpecialDateType(SpecialDateEnums.JD.getId()); @@ -285,124 +286,221 @@ public class BookbuildingFacade { // query.setServiceStatus(serviceStatus); // } + List sendList = new ArrayList<>(); + List temps = smsTemplateService.querySmsTemplates(query); if (CollectionUtils.isNotEmpty(temps)) { - SmsTemplateModel templateModel = null; for (SmsTemplateModel temp : temps) { if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { - templateModel = temp; + sendList.add(temp); break; } } - if (templateModel == null) + for (SmsTemplateModel temp : temps) { - for (SmsTemplateModel temp : temps) + if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { - if (temp.getServiceStatus() == serviceStatus) + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() ) { - templateModel = temp; + sendList.add(temp); break; } } } - if (templateModel == null) + for (SmsTemplateModel temp : temps) { - for (SmsTemplateModel temp : temps) + if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { - if (temp.getServiceType() == serviceType) + if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() + || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { - templateModel = temp; + sendList.add(temp); break; } } } - if (templateModel == null) - { + for (SmsTemplateModel temp : temps) { if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) { - templateModel = temp; + sendList.add(temp); break; } } } - } - if (templateModel == null) - { + + for (SmsTemplateModel temp : temps) { if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) { - templateModel = temp; + sendList.add(temp); break; } } } - } - if (templateModel == null) - { + + for (SmsTemplateModel temp : temps) { if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) { - templateModel = temp; + sendList.add(temp); break; } } } - } - if (templateModel == null) - { + + for (SmsTemplateModel temp : temps) { - if (temp.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) + if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { - templateModel = temp; + sendList.add(temp); break; } } - } - if (templateModel != null && templateModel.getStatus() == 1) + +// if (CollectionUtils.isNotEmpty(temps)) +// { +// SmsTemplateModel templateModel = null; +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) +// { +// templateModel = temp; +// break; +// } +// } +// +// if (templateModel == null) +// { +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == serviceStatus) +// { +// templateModel = temp; +// break; +// } +// } +// } +// +// if (templateModel == null) +// { +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceType() == serviceType) +// { +// templateModel = temp; +// break; +// } +// } +// } +// +// if (templateModel == null) +// { +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) +// { +// templateModel = temp; +// break; +// } +// } +// } +// } +// +// if (templateModel == null) +// { +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) +// { +// templateModel = temp; +// break; +// } +// } +// } +// } +// +// if (templateModel == null) +// { +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) +// { +// templateModel = temp; +// break; +// } +// } +// } +// } +// +// if (templateModel == null) +// { +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) +// { +// templateModel = temp; +// break; +// } +// } +// } + + if (CollectionUtils.isNotEmpty(sendList)) { - MessageListRequest smsList = new MessageListRequest(); - List messages = new ArrayList<>(); - MessageRequest mr = new MessageRequest(); - mr.setContent(templateModel.getContent()); - mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); - mr.setPhone(patient.getPhone()); - //短信商 - mr.setServiceType(SmsProviderEnums.ALDY.getId()); - mr.setTypeId(ProjectTypeEnums.YNXT.getId()); - mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); - mr.setStatus(SmsStatusEnums.WFS.getId()); - mr.setExt1(patient.getHospitalId()); - mr.setExt2(templateModel.getId()); - mr.setExt3(patient.getId()); - messages.add(mr); - - if (CollectionUtils.isNotEmpty(messages)) { - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); - smsList.setMessages(messages); - //调用发送接口 - MessageCenterService.saveSmsCenter(smsList); + for (SmsTemplateModel templateModel : sendList) + { + if (templateModel != null && templateModel.getStatus() == 1) + { + MessageListRequest smsList = new MessageListRequest(); + List messages = new ArrayList<>(); + MessageRequest mr = new MessageRequest(); + mr.setContent(templateModel.getContent()); + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); + mr.setPhone(patient.getPhone()); + //短信商 + mr.setServiceType(SmsProviderEnums.ALDY.getId()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setExt1(patient.getHospitalId()); + mr.setExt2(templateModel.getId()); + mr.setExt3(patient.getId()); + messages.add(mr); + + if (CollectionUtils.isNotEmpty(messages)) { + smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); + smsList.setMessages(messages); + //调用发送接口 + MessageCenterService.saveSmsCenter(smsList); + } + } } } }