diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 3b4aa6f..334cd28 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -513,6 +513,7 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setYn(YnEnums.YES.getId()); //1孕妇 3 产妇 patientsQuery.setType(3); + patientsQuery.setDueStatus(0); // //末次月经必须大于当前时间减去42周视为为分娩孕妇 // Date lastMensesMax = DateUtil.addDay(new Date(), -42); @@ -915,43 +916,43 @@ public class SmsServiceImpl implements SmsService{ Integer sendDateType = template.getSendDateType(); if (sendDateType == SendDateEnums.TSRQ.getId()) { //孕妇的建档 和服务结束 - Integer specialDateType = template.getSpecialDateType(); - //服务结束 - if (specialDateType == SpecialDateEnums.FWJS.getId()) - { - - Date endDate = DateUtil.getNewDate(-42, "周", 0); - //把时间格式化成 yyyy_MM_dd 的日期 - endDate = DateUtil.formatDate(endDate); - patientsQuery.setYn(YnEnums.YES.getId()); - //1孕妇 - patientsQuery.setType(1); - patientsQuery.setLastMensesEnd(endDate); - patientsQuery.setLastMensesStart(endDate); - - List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients)) - { - for (Patients pat : patients) - { - - //短信前缀 - String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); - String messageContent = "【"+messagePrefix+"】"+template.getContent(); - messageContent = replaceName(pat.getUsername(), messageContent); - MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), - pat.getHospitalId(),template.getId(),pat.getId()); - messages.add(request); - - //更新成产妇状态 分娩时间设置成当前时间 - pat.setType(3); - pat.setFmDate(new Date()); - pat.setModified(new Date()); - yunBookbuildingService.updatePregnant(pat, pat.getId()); - } - - } - } +// Integer specialDateType = template.getSpecialDateType(); +// //服务结束 +// if (specialDateType == SpecialDateEnums.FWJS.getId()) +// { +// +// Date endDate = DateUtil.getNewDate(-42, "周", 0); +// //把时间格式化成 yyyy_MM_dd 的日期 +// endDate = DateUtil.formatDate(endDate); +// patientsQuery.setYn(YnEnums.YES.getId()); +// //1孕妇 +// patientsQuery.setType(1); +// patientsQuery.setLastMensesEnd(endDate); +// patientsQuery.setLastMensesStart(endDate); +// +// List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); +// if (CollectionUtils.isNotEmpty(patients)) +// { +// for (Patients pat : patients) +// { +// +// //短信前缀 +// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); +// String messageContent = "【"+messagePrefix+"】"+template.getContent(); +// messageContent = replaceName(pat.getUsername(), messageContent); +// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), +// pat.getHospitalId(),template.getId(),pat.getId()); +// messages.add(request); +// +// //更新成产妇状态 分娩时间设置成当前时间 +// pat.setType(3); +// pat.setFmDate(new Date()); +// pat.setModified(new Date()); +// yunBookbuildingService.updatePregnant(pat, pat.getId()); +// } +// +// } +// } //孕妇建档在 孕妇建档生成 } @@ -1028,7 +1029,23 @@ public class SmsServiceImpl implements SmsService{ BabyModelQuery query = new BabyModelQuery(); query.setYn(YnEnums.YES.getId()); query.setId(checkModel.getBuildId()); - messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template)); + + //查询符合条件儿童 + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel model : babyModels) + { + //短信前缀 + String messagePrefix = getSmsPrefix(config, model.getBuildDoctor()); + String messageContent = "【"+messagePrefix+"】"+template.getContent(); + messageContent = replaceEL(model.getName(), yuYueDate, messageContent); + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), + model.getHospitalId(),template.getId(),model.getId()); + messages.add(request); + } + } + //messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template)); } } } @@ -1368,7 +1385,21 @@ public class SmsServiceImpl implements SmsService{ query.setYn(YnEnums.YES.getId()); query.setId(orderModel.getParentId()); - messages.addAll(getChanMessageRequestList(patientsQuery,config,template)); + //查询符合条件的产妇 + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + for (Patients pat : patients) + { + //短信前缀 + String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); + String messageContent = "【"+messagePrefix+"】"+template.getContent(); + messageContent = replaceEL(pat.getUsername(), actualSendDate, messageContent); + MessageRequest request = getMessageRequest(messageContent,pat.getPhone(),ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), + pat.getHospitalId(),template.getId(),pat.getId()); + messages.add(request); + } + } } } } @@ -1420,6 +1451,49 @@ public class SmsServiceImpl implements SmsService{ //产妇服务结束 else if (specialDateType == SpecialDateEnums.FWJS.getId()) { + /** + * 产妇服务结束 + */ + Date chanEndDate = DateUtil.getNewDate(-16, "周", 0); + //把时间格式化成 yyyy_MM_dd 的日期 + chanEndDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(chanEndDate)); + PatientsQuery chanpatientsQuery = new PatientsQuery(); + chanpatientsQuery.setYn(YnEnums.YES.getId()); + //3产妇 + chanpatientsQuery.setType(3); + chanpatientsQuery.setDueStatus(0); + chanpatientsQuery.setFmDateEnd(chanEndDate); + chanpatientsQuery.setFmDateStart(chanEndDate); + + List patients = yunBookbuildingService.queryPregnantWithQuery(chanpatientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + for (Patients pat : patients) + { + + //短信前缀 + String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); + String messageContent = "【"+messagePrefix+"】"+template.getContent(); + messageContent = replaceName(pat.getUsername(), messageContent); + MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), + pat.getHospitalId(),template.getId(),pat.getId()); + messages.add(request); + + //更新状态为过期 + //判断其为增值服务还是 标准服务 + if (pat.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) + { + pat.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + } + else if (pat.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + { + pat.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } + yunBookbuildingService.updatePregnant(pat, pat.getId()); + + } + } + } }