From 1016c48700c6a8f1de9accd639b24dc57b2e5f7c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 7 Sep 2016 15:52:21 +0800 Subject: [PATCH] code update --- .../operate/web/facade/BabyBookbuildingFacade.java | 157 +++++++++++++++++---- .../operate/web/facade/BookbuildingFacade.java | 123 +++------------- 2 files changed, 154 insertions(+), 126 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 76ccefe..4c21b02 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 @@ -236,6 +236,19 @@ public class BabyBookbuildingFacade { } } } + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setId(request.getId()); + List list = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(list)) + { + BabyModel babyModel = list.get(0); + if (babyModel.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId()) + { + createBuildSms(babyModel); + } + } + babyBookbuildingService.updateBabyBuild(model, request.getId()); patientsService.updateRefer(model); @@ -540,37 +553,131 @@ public class BabyBookbuildingFacade { query.setServiceType(serviceType); query.setServiceStatus(serviceStatus); } - + List sendList = new ArrayList<>(); List temps = smsTemplateService.querySmsTemplates(query); if (CollectionUtils.isNotEmpty(temps)) { - SmsTemplateModel templateModel = temps.get(0); - 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.BABYOBJ.getId()); - mr.setPhone(babyModel.getMphone()); - //短信商 - 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(babyModel.getHospitalId()); - mr.setExt2(templateModel.getId()); - mr.setExt3(babyModel.getId()); - messages.add(mr); - - if (CollectionUtils.isNotEmpty(messages)) { - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); - smsList.setMessages(messages); - MessageCenterService.saveSmsCenter(smsList); + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) + { + sendList.add(temp); + break; + } + } + + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) + { + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() ) + { + sendList.add(temp); + break; + } + } + } + + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) + { + if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() + || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) + { + sendList.add(temp); + break; + } + } + } + + + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) + { + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) + { + sendList.add(temp); + break; + } + } + } + + + + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) + { + if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) + { + sendList.add(temp); + break; + } + } + } + + + + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) + { + if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) + { + sendList.add(temp); + break; + } + } + } + + + + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) + { + sendList.add(temp); + break; } } + + if (CollectionUtils.isNotEmpty(sendList)) + { + 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.BABYOBJ.getId()); + mr.setPhone(babyModel.getMphone()); + //短信商 + 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(babyModel.getHospitalId()); + mr.setExt2(templateModel.getId()); + mr.setExt3(babyModel.getId()); + messages.add(mr); + + if (CollectionUtils.isNotEmpty(messages)) { + smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); + smsList.setMessages(messages); + MessageCenterService.saveSmsCenter(smsList); + } + } + } + } + + + } } 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 ab2ed7f..433372f 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 @@ -214,8 +214,12 @@ public class BookbuildingFacade { //加入产筛 patientsService.validata(p); - //生成建档短信 - createBuildSms(p); + if (type == 1) + { + //生成建档短信 + createBuildSms(p); + } + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(p.getId()); @@ -280,11 +284,6 @@ public class BookbuildingFacade { Integer serviceType = patient.getServiceType(); Integer serviceStatus = patient.getServiceStatus(); -// if (serviceType != null && serviceStatus != null) -// { -// query.setServiceType(serviceType); -// query.setServiceStatus(serviceStatus); -// } List sendList = new ArrayList<>(); @@ -377,100 +376,6 @@ public class BookbuildingFacade { } } - -// 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)) { for (SmsTemplateModel templateModel : sendList) @@ -625,6 +530,22 @@ public class BookbuildingFacade { patient.setId(id); //加入产筛 patientsService.validata(patient); + + + PatientsQuery pQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setId(id); + List list = yunBookbuildingService.queryPregnantWithQuery(pQuery); + if (CollectionUtils.isNotEmpty(list)) + { + Patients pat = list.get(0); + if (pat.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() || pat.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId()) + { + createBuildSms(pat); + } + } + + yunBookbuildingService.updatePregnant(patient, id); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); -- 1.8.3.1