Commit ebe6f8f0efb19ce0332b5ed50b1cfbcefb08eade
1 parent
b67602ad86
Exists in
master
and in
6 other branches
儿童膳食报告bug修改
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
ebe6f8f
| ... | ... | @@ -1019,7 +1019,7 @@ |
| 1019 | 1019 | hashMap.put("gender", sex != null ? sex == 1 ? "男" : "女" : ""); |
| 1020 | 1020 | hashMap.put("phone", mongoTemplateOne.getMphone()); |
| 1021 | 1021 | String cardNo = mongoTemplateOne.getCardNo(); |
| 1022 | - if (StringUtils.isEmpty(cardNo)){ | |
| 1022 | + if (StringUtils.isEmpty(cardNo)) { | |
| 1023 | 1023 | cardNo = mongoTemplateOne.getMcertNo(); |
| 1024 | 1024 | } |
| 1025 | 1025 | hashMap.put("cardNo", cardNo); |
| ... | ... | @@ -1362,6 +1362,7 @@ |
| 1362 | 1362 | } |
| 1363 | 1363 | |
| 1364 | 1364 | map.put("kaul", String.format("%.2f", kauls) + "kacl"); |
| 1365 | + map.put("mother", month); | |
| 1365 | 1366 | data.put("userInfo", map); |
| 1366 | 1367 | if ((kaupEvaluate.equals("消瘦") || kaupEvaluate.equals("超重")) && month >= 6 && month <= 11) { |
| 1367 | 1368 | List<BabyDietReportModel> babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class); |
| ... | ... | @@ -1446,7 +1447,7 @@ |
| 1446 | 1447 | } else if (kaul > 1000 && "消瘦".equals(kaupEvaluate)) { |
| 1447 | 1448 | kaul = 1000; |
| 1448 | 1449 | } else if (kaul < 950 && "超重".equals(kaupEvaluate)) { |
| 1449 | - kaul = 800; | |
| 1450 | + kaul = 950; | |
| 1450 | 1451 | } else if (kaul > 1700 && "超重".equals(kaupEvaluate)) { |
| 1451 | 1452 | kaul = 1700; |
| 1452 | 1453 | } |