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 4c316bb..65bf7a6 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 @@ -508,6 +508,8 @@ public class BabyBookbuildingFacade { return; } + ExceptionUtils.catchException("儿童建档1---------->"+babyModel.getMphone()+";name="+babyModel.getName()); + SmsTemplateQuery query = new SmsTemplateQuery(); query.setYn(YnEnums.YES.getId()); query.setStatus(1); @@ -587,10 +589,12 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(sendList)) { + //短信前缀 String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor()); for (SmsTemplateModel templateModel : sendList) { if (templateModel != null && templateModel.getStatus() == 1) { + ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName()); MessageListRequest smsList = new MessageListRequest(); List messages = new ArrayList<>(); MessageRequest mr = new MessageRequest(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 8988b4f..84dfecc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -986,7 +986,7 @@ public class BabyCheckFacade { ageType = 1; } - //查询该月龄的年龄别体重值 + //查询身高别体重 List list = babyCheckService.queryBabyHealthConfig(ageType, sex, 3, hw); if(CollectionUtils.isNotEmpty(list)) @@ -995,24 +995,33 @@ public class BabyCheckFacade { //查询该月龄的年龄别体重值 List aws = babyCheckService.queryBabyHealthConfig(monthAge, sex,0); - if (CollectionUtils.isNotEmpty(aws) && aws.size() > 1) + if (CollectionUtils.isNotEmpty(aws)) { AwModel model = aws.get(0); - AwModel model1 = aws.get(1); - - if(model.getType() == 1) - { - model = aws.get(1); - model1 = aws.get(0); - } //低于参考人群的年龄别体重的M -2s if (model.getRtwoDs() > weight) { growthEvaluate.add("低体重"); } - if (value != null) + } + + List aws1 = babyCheckService.queryBabyHealthConfig(monthAge, sex,1); + if (CollectionUtils.isNotEmpty(aws1)) + { + AwModel model = aws1.get(0); + if (weight > list.get(0).getPtwoDs() && height < model.getRtwoDs()) + { + growthEvaluate.add("生长迟缓"); + } + if (weight < list.get(0).getPtwoDs() && height < model.getRtwoDs()) { + growthEvaluate.add("慢性严重营养不良"); + } + } + + if (value != null) + { //中位数百分比 Double mp = weight/value; if (mp < 0.8) @@ -1031,17 +1040,8 @@ public class BabyCheckFacade { { growthEvaluate.add("肥胖"); } - } - - if (weight > list.get(0).getPtwoDs() && height < model1.getRtwoDs()) - { - growthEvaluate.add("生长迟缓"); - } - if (weight < list.get(0).getPtwoDs() && height < model1.getRtwoDs()) - { - growthEvaluate.add("慢性严重营养不良"); - } } + } BaseObjectResponse br = new BaseObjectResponse(); br.setData(growthEvaluate);