diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java index b7e672f..f33bc14 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java @@ -120,6 +120,8 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { if (CollectionUtils.isNotEmpty(configModels)) { Map babyRiskMap = loadBabyRisk(); + + logger.info("The babyRiskMap size is {}", babyRiskMap.size()); int end = 0; for (int i = 0; i < configModels.size(); i += DEFAULT_BATCH_SIZE) { end = (end + DEFAULT_BATCH_SIZE); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java index b093b0a..c9d944b 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java @@ -125,13 +125,16 @@ public class BabyAmsMsgGenerateWorker implements Runnable { //判断儿童是否有高危因素 if (CollectionUtils.isNotEmpty(baby.getHighRiskInfo())) { for (Object riskId : baby.getHighRiskInfo()) { - String riskName = babyRiskMap.get(riskId.toString()); - if (StringUtils.isNotEmpty(riskName)) { - String riskKey = riskName + "&" + weekAge; - //得到符合当前周龄的短信条数 - List messageContents1 = amsSmses.get(riskKey); - //生成儿童健康指导 - doExecuteAndBuildMsg(messageContents1, baby, messagePrefix, messages, service, 1, riskKey); + if (riskId != null && StringUtils.isNotEmpty(riskId.toString())) + { + String riskName = babyRiskMap.get(riskId.toString()); + if (StringUtils.isNotEmpty(riskName)) { + String riskKey = riskName + "&" + weekAge; + //得到符合当前周龄的短信条数 + List messageContents1 = amsSmses.get(riskKey); + //生成儿童健康指导 + doExecuteAndBuildMsg(messageContents1, baby, messagePrefix, messages, service, 1, riskKey); + } } } } 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 f796160..326f73c 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 @@ -1008,13 +1008,17 @@ public class TempleteMsgGenerateWorker implements Runnable { addYumReservMessages(template, config, service, messages, yuYueDate, patientsQuery, remark); } else { // 兼容多服务推送 - HashMap hashMap = getMapByParam(template, id, false); - List patientServices = patientServiceService.getPatientServices(hashMap); - if (CollectionUtils.isNotEmpty(patientServices)){ - PatientsQuery query = new PatientsQuery(); - query.setId(id); - addYumReservMessages(template, config, service, messages, yuYueDate, query, remark); - } +// HashMap hashMap = getMapByParam(template, id, false); +// List patientServices = patientServiceService.getPatientServices(hashMap); +// if (CollectionUtils.isNotEmpty(patientServices)){ +// PatientsQuery query = new PatientsQuery(); +// query.setId(id); +// addYumReservMessages(template, config, service, messages, yuYueDate, query, remark); +// } + + PatientsQuery query = new PatientsQuery(); + query.setId(id); + addYumReservMessages(template, config, service, messages, yuYueDate, query, remark); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 2cd4478..a26868a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -7885,7 +7885,7 @@ public class ViewFacade { ssy = chBpMap.get("ssy"); szy = chBpMap.get("szy"); } - map.put("bp",ssy + "/" + szy); // 血压 + map.put("bp", StringUtils.isNotEmpty(ssy) ? ssy + "/" + szy : ""); String fetalPosition = ""; String heartRate = ""; if (CollectionUtils.isNotEmpty(data.getPlacentas())) { @@ -7965,7 +7965,7 @@ public class ViewFacade { ssy = chBpMap.get("ssy"); szy = chBpMap.get("szy"); } - map.put("bp", ssy + "/" + szy); + map.put("bp", StringUtils.isNotEmpty(ssy) ? ssy + "/" + szy : ""); map.put("weight", data.getWeight()); map.put("urineProtein", data.getUrineProtein()); //尿蛋白 map.put("hemoglobin", data.getHemoglobin()); //血红蛋白