diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java index d86505d..9df2442 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java @@ -250,8 +250,12 @@ public class ConvertHelper { if ("4".equals(map.get("select").toString()) || "6".equals(map.get("select").toString())) { babyPaedia.setUmbilical(map.get("qtText")); } else { - String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString())); - babyPaedia.setUmbilical(value); + if (map.get("select") != null && map.get("select").toString() != "" && StringUtils.isNum(map.get("select").toString())) + { + String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString())); + babyPaedia.setUmbilical(value); + } + } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 2b82d53..b0e4d1e 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -414,37 +414,21 @@ public class TempleteMsgGenerateWorker implements Runnable { Date yuYueDate = DateUtils.addDay(new Date(), sendTimeType); yuYueDate = DateUtils.formatDate(yuYueDate, DateUtils.Y_M_D); - List checkModels = babyBookbuildingService.queryBabyYuYueRecord(yuYueDate, tempHid); - if (CollectionUtils.isNotEmpty(checkModels)) { - for (BabyCheckModel checkModel : checkModels) { - BabyModelQuery query = new BabyModelQuery(); - query.setYn(YnEnums.YES.getId()); - query.setId(checkModel.getId()); //这里返回的id就是buildId + // 全部服务 + babyModelQuery.setNextDateStart(yuYueDate); + babyModelQuery.setNextDateEnd(yuYueDate); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); - boolean existMsg = HelperUtils.isExistMsg(checkModel.getId(), template.getId()); - if (existMsg){ + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel checkModel : babyModels) { + try { + //查询符合条件儿童 + addBabyReservMessages(template, config, service, messages, yuYueDate, checkModel); + }catch (Exception e) + { continue; } - - if (serviceType == com.lyms.platform.common.enums.ServiceTypeEnums.ALL_SERVICE.getId() - && serviceStatus == ServiceStatusEnums.ADD_ALL.getId()){ - // 全部，特殊处理 - babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setId(checkModel.getId()); - addBabyReservMessages(template, config, service, messages, yuYueDate, babyModelQuery); - } else { - HashMap param = getMapByParam(template, query.getId(), true); - // 兼容多服务推送，查询mysql - List patientServices = patientServiceService.getPatientServices(param); - if (CollectionUtils.isNotEmpty(patientServices)){ - BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setId(checkModel.getId()); - //查询符合条件儿童 - addBabyReservMessages(template, config, service, messages, yuYueDate, query); - } - } } } @@ -1081,32 +1065,26 @@ public class TempleteMsgGenerateWorker implements Runnable { * @param service * @param messages * @param yuYueDate - * @param query + * @param model */ - private void addBabyReservMessages(SmsTemplateModel template, SmsConfigModel config, Integer service, List messages, Date yuYueDate, BabyModelQuery query) { - List babyModels = babyBookbuildingService.queryBabyBuildByCond(query); - if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel model : babyModels) { - - String serDoc = baseService.getBabyServiceDoctorId(model.getId(), false); + private void addBabyReservMessages(SmsTemplateModel template, SmsConfigModel config, Integer service, List messages, Date yuYueDate, BabyModel model) { + String serDoc = baseService.getBabyServiceDoctorId(model.getId(), false); - //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId()); - messagePrefix = baseService.getBabySmsPrefix(config,model.getId(),messagePrefix,template); - String messageContent = "【" + messagePrefix + "】" + template.getContent(); - messageContent = HelperUtils.replaceEL(model.getName(), yuYueDate, messageContent); + //短信前缀 + String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId()); + messagePrefix = baseService.getBabySmsPrefix(config,model.getId(),messagePrefix,template); + String messageContent = "【" + messagePrefix + "】" + template.getContent(); + messageContent = HelperUtils.replaceEL(model.getName(), yuYueDate, messageContent); - String itemName = "儿童保健"; - String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D); + String itemName = "儿童保健"; + String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), - ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), - model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc, - WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), + ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), + model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc, + WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); - messages.add(request); - } - } + messages.add(request); } @@ -1313,10 +1291,10 @@ public class TempleteMsgGenerateWorker implements Runnable { List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)){ for (Patients patient: patients){ - boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId()); - if (existMsg){ - continue; - } +// boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId()); +// if (existMsg){ +// continue; +// } addYunOverdueMessages(template, config, service, messages, yuYueDate, patient); } list.setMessages(messages); @@ -1332,10 +1310,10 @@ public class TempleteMsgGenerateWorker implements Runnable { List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)){ for (Patients patient: patients){ - boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId()); - if (existMsg){ - continue; - } +// boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId()); +// if (existMsg){ +// continue; +// } addYunOverdueMessages(template, config, service, messages, yuYueDate, patient); } list.setMessages(messages); @@ -1348,10 +1326,10 @@ public class TempleteMsgGenerateWorker implements Runnable { List patients = yunBookbuildingService.queryPregnantWithQuery(query); if (CollectionUtils.isNotEmpty(patients)){ for (Patients patient: patients){ - boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId()); - if (existMsg){ - continue; - } +// boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId()); +// if (existMsg){ +// continue; +// } addYunOverdueMessages(template, config, service, messages, yuYueDate, patient); // HashMap hashMap = getMapByParam(template, patient.getId(), false); // List patientServices = patientServiceService.getPatientServices(hashMap); @@ -1809,10 +1787,10 @@ public class TempleteMsgGenerateWorker implements Runnable { if (CollectionUtils.isNotEmpty(patients)) { for (Patients pat : patients) { - boolean existMsg = HelperUtils.isExistMsg(pat.getId(), template.getId()); - if (existMsg){ - continue; - } +// boolean existMsg = HelperUtils.isExistMsg(pat.getId(), template.getId()); +// if (existMsg){ +// continue; +// } String serDoct = baseService.getServiceDoctorId(pat.getId(),false); //短信前缀 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 51d0e06..a353405 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 @@ -3623,6 +3623,13 @@ public class AntenatalExaminationFacade { //获取当前用户在的医院 List currentGroupHospital = groupsFacade.findGroupHospital(userId, false); + + //衡水区域并且不是冀州妇幼登陆 + if("12".equals(og.getCityId()) && !"2100002109".equals(hospitalId)) + { + currentGroupHospital.remove("2100002109");//排查冀州妇幼 + } + if (!StringUtils.isEmpty(queryRequest.getPatientId())) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(queryRequest.getPatientId()); 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 38be248..3fd4d72 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 @@ -2258,7 +2258,7 @@ public class BabyBookbuildingFacade { result.setPid(model.getPid()); result.setCardNo(model.getMcertNo());//母亲的身份证号码 - result.setName(model.getName()); + result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); if (model.getBirth() != null) { result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); } else { @@ -2280,6 +2280,7 @@ public class BabyBookbuildingFacade { if (build.getHospitalId().equals(param.getHospitalId())) { isCurrentHosp = true; buildInfo = build; + buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); } if (build != null && build.getYn() == YnEnums.YES.getId()) { 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 93c7d83..5e4b218 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 @@ -1484,9 +1484,18 @@ public class BookbuildingFacade { hids.add(String.valueOf(organization.getId())); } } + + + //衡水区域并且不是冀州妇幼登陆 + if("12".equals(org.getCityId()) && !"2100002109".equals(hospitalId)) + { + hids.remove("2100002109");//排查冀州妇幼 + } + if (CollectionUtils.isNotEmpty(hids)) { patientsQuery.setHospitalList(hids); } + } patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 288989d..7d688b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1349,11 +1349,21 @@ public class MatDeliverFacade { //外院的产妇 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3); + List hids = organizationGroupsFacade.findGroupHospital(userId, false); + + + //衡水区域并且不是冀州妇幼登陆 + if("12".equals(og.getCityId()) && !"2100002109".equals(hospital)) + { + hids.remove("2100002109");//排查冀州妇幼 + } + + //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug //本院的孕妇 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 1, false, deliverQueryRequest.getPid(), isEnable); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hids, 1, false, deliverQueryRequest.getPid(), isEnable); //本院产妇 - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 3, false, deliverQueryRequest.getPid(), isEnable); + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hids, 3, false, deliverQueryRequest.getPid(), isEnable); PersonModelQuery personModelQuery = new PersonModelQuery(); String pid = ""; if (null != patients1) {