liquanyu / regional-platform

Download as
Browse Code »

Commit 9b46da335776eb921c025f65759853918ed84bfc

Authored by liquanyu
1 parent f356b0fb57
Exists in master and in 1 other branch dev

大同三打印

Showing 4 changed files with 25 additions and 16 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java View file @ 9b46da3
... ... @@ -120,6 +120,8 @@
120 120 if (CollectionUtils.isNotEmpty(configModels))
121 121 {
122 122 Map<String,String> babyRiskMap = loadBabyRisk();
  123 +
  124 + logger.info("The babyRiskMap size is {}", babyRiskMap.size());
123 125 int end = 0;
124 126 for (int i = 0; i < configModels.size(); i += DEFAULT_BATCH_SIZE) {
125 127 end = (end + DEFAULT_BATCH_SIZE);
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java View file @ 9b46da3
... ... @@ -125,13 +125,16 @@
125 125 //判断儿童是否有高危因素
126 126 if (CollectionUtils.isNotEmpty(baby.getHighRiskInfo())) {
127 127 for (Object riskId : baby.getHighRiskInfo()) {
128   - String riskName = babyRiskMap.get(riskId.toString());
129   - if (StringUtils.isNotEmpty(riskName)) {
130   - String riskKey = riskName + "&" + weekAge;
131   - //得到符合当前周龄的短信条数
132   - List<MessageContent> messageContents1 = amsSmses.get(riskKey);
133   - //生成儿童健康指导
134   - doExecuteAndBuildMsg(messageContents1, baby, messagePrefix, messages, service, 1, riskKey);
  128 + if (riskId != null && StringUtils.isNotEmpty(riskId.toString()))
  129 + {
  130 + String riskName = babyRiskMap.get(riskId.toString());
  131 + if (StringUtils.isNotEmpty(riskName)) {
  132 + String riskKey = riskName + "&" + weekAge;
  133 + //得到符合当前周龄的短信条数
  134 + List<MessageContent> messageContents1 = amsSmses.get(riskKey);
  135 + //生成儿童健康指导
  136 + doExecuteAndBuildMsg(messageContents1, baby, messagePrefix, messages, service, 1, riskKey);
  137 + }
135 138 }
136 139 }
137 140 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ 9b46da3
... ... @@ -1008,13 +1008,17 @@
1008 1008 addYumReservMessages(template, config, service, messages, yuYueDate, patientsQuery, remark);
1009 1009 } else {
1010 1010 // 兼容多服务推送
1011   - HashMap<String, Object> hashMap = getMapByParam(template, id, false);
1012   - List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
1013   - if (CollectionUtils.isNotEmpty(patientServices)){
1014   - PatientsQuery query = new PatientsQuery();
1015   - query.setId(id);
1016   - addYumReservMessages(template, config, service, messages, yuYueDate, query, remark);
1017   - }
  1011 +// HashMap<String, Object> hashMap = getMapByParam(template, id, false);
  1012 +// List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
  1013 +// if (CollectionUtils.isNotEmpty(patientServices)){
  1014 +// PatientsQuery query = new PatientsQuery();
  1015 +// query.setId(id);
  1016 +// addYumReservMessages(template, config, service, messages, yuYueDate, query, remark);
  1017 +// }
  1018 +
  1019 + PatientsQuery query = new PatientsQuery();
  1020 + query.setId(id);
  1021 + addYumReservMessages(template, config, service, messages, yuYueDate, query, remark);
1018 1022 }
1019 1023  
1020 1024  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 9b46da3
... ... @@ -7885,7 +7885,7 @@
7885 7885 ssy = chBpMap.get("ssy");
7886 7886 szy = chBpMap.get("szy");
7887 7887 }
7888   - map.put("bp",ssy + "/" + szy); // 血压
  7888 + map.put("bp", StringUtils.isNotEmpty(ssy) ? ssy + "/" + szy : "");
7889 7889 String fetalPosition = "";
7890 7890 String heartRate = "";
7891 7891 if (CollectionUtils.isNotEmpty(data.getPlacentas())) {
... ... @@ -7965,7 +7965,7 @@
7965 7965 ssy = chBpMap.get("ssy");
7966 7966 szy = chBpMap.get("szy");
7967 7967 }
7968   - map.put("bp", ssy + "/" + szy);
  7968 + map.put("bp", StringUtils.isNotEmpty(ssy) ? ssy + "/" + szy : "");
7969 7969 map.put("weight", data.getWeight());
7970 7970 map.put("urineProtein", data.getUrineProtein()); //尿蛋白
7971 7971 map.put("hemoglobin", data.getHemoglobin()); //血红蛋白