fangcheng / regional-platform

Download as
Browse Code »

Commit 0b14ec29d529e5e7fc49d1545fe9078f333db875

Authored by jiangjiazhi
2 parents ea0c020c86 73feaf6904
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 0b14ec2
... ... @@ -156,12 +156,12 @@
156 156 PersonModelQuery personModelQuery = new PersonModelQuery();
157 157 personModelQuery.setYn(YnEnums.YES.getId());
158 158 personModelQuery.setId(builds.get(0).getPid());
159   - Collections.reverse(list);
  159 +// Collections.reverse(list);
160 160 List<PersonModel> personModels = personService.queryPersons(personModelQuery);
161 161  
162 162 List<Map<String, String>> tempList = new ArrayList<>();
163 163 babyCheckFacade.getBabyCheckList(buildIds, personModels.get(0), tempList);
164   - Collections.reverse(tempList);
  164 +// Collections.reverse(tempList);
165 165 list.addAll(tempList);
166 166 }
167 167  
... ... @@ -508,6 +508,8 @@
508 508 return;
509 509 }
510 510  
  511 + ExceptionUtils.catchException("儿童建档1---------->"+babyModel.getMphone()+";name="+babyModel.getName());
  512 +
511 513 SmsTemplateQuery query = new SmsTemplateQuery();
512 514 query.setYn(YnEnums.YES.getId());
513 515 query.setStatus(1);
514 516  
... ... @@ -587,10 +589,12 @@
587 589  
588 590 if (CollectionUtils.isNotEmpty(sendList)) {
589 591  
  592 +
590 593 //短信前缀
591 594 String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor());
592 595 for (SmsTemplateModel templateModel : sendList) {
593 596 if (templateModel != null && templateModel.getStatus() == 1) {
  597 + ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName());
594 598 MessageListRequest smsList = new MessageListRequest();
595 599 List<MessageRequest> messages = new ArrayList<>();
596 600 MessageRequest mr = new MessageRequest();
... ... @@ -967,7 +971,7 @@
967 971 result.setBabyHeight(model.getBabyHeight());
968 972 result.setBabyWeight(model.getBabyWeight());
969 973 result.setBabyHead(model.getBabyHead());
970   - result.setDeliverOrg(model.getDeliverOrg());
  974 + result.setDeliverOrg(model.getOrg());
971 975 result.setMalformation(model.getMalformation());
972 976 result.setApgarScore(JsonUtil.str2Obj(model.getApgarScore(), Map.class));
973 977  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 0b14ec2
... ... @@ -986,7 +986,7 @@
986 986 ageType = 1;
987 987 }
988 988  
989   - //查询该月龄的年龄别体重值
  989 + //查询身高别体重
990 990 List<AwModel> list = babyCheckService.queryBabyHealthConfig(ageType, sex, 3, hw);
991 991  
992 992 if(CollectionUtils.isNotEmpty(list))
993 993  
994 994  
995 995  
996 996  
... ... @@ -995,24 +995,33 @@
995 995  
996 996 //查询该月龄的年龄别体重值
997 997 List<AwModel> aws = babyCheckService.queryBabyHealthConfig(monthAge, sex,0);
998   - if (CollectionUtils.isNotEmpty(aws) && aws.size() > 1)
  998 + if (CollectionUtils.isNotEmpty(aws))
999 999 {
1000 1000 AwModel model = aws.get(0);
1001   - AwModel model1 = aws.get(1);
1002 1001  
1003   - if(model.getType() == 1)
1004   - {
1005   - model = aws.get(1);
1006   - model1 = aws.get(0);
1007   - }
1008   -
1009 1002 //低于参考人群的年龄别体重的M -2s
1010 1003 if (model.getRtwoDs() > weight)
1011 1004 {
1012 1005 growthEvaluate.add("低体重");
1013 1006 }
1014   - if (value != null)
  1007 + }
  1008 +
  1009 + List<AwModel> aws1 = babyCheckService.queryBabyHealthConfig(monthAge, sex,1);
  1010 + if (CollectionUtils.isNotEmpty(aws1))
  1011 + {
  1012 + AwModel model = aws1.get(0);
  1013 + if (weight > list.get(0).getPtwoDs() && height < model.getRtwoDs())
1015 1014 {
  1015 + growthEvaluate.add("生长迟缓");
  1016 + }
  1017 + if (weight < list.get(0).getPtwoDs() && height < model.getRtwoDs())
  1018 + {
  1019 + growthEvaluate.add("慢性严重营养不良");
  1020 + }
  1021 + }
  1022 +
  1023 + if (value != null)
  1024 + {
1016 1025 //中位数百分比
1017 1026 Double mp = weight/value;
1018 1027 if (mp < 0.8)
1019 1028  
... ... @@ -1031,17 +1040,8 @@
1031 1040 {
1032 1041 growthEvaluate.add("肥胖");
1033 1042 }
1034   - }
1035   -
1036   - if (weight > list.get(0).getPtwoDs() && height < model1.getRtwoDs())
1037   - {
1038   - growthEvaluate.add("生长迟缓");
1039   - }
1040   - if (weight < list.get(0).getPtwoDs() && height < model1.getRtwoDs())
1041   - {
1042   - growthEvaluate.add("慢性严重营养不良");
1043   - }
1044 1043 }
  1044 +
1045 1045 }
1046 1046 BaseObjectResponse br = new BaseObjectResponse();
1047 1047 br.setData(growthEvaluate);