Commit 034675448128b5dd4d97121dcbe4a0068c1d00c3
1 parent
d64999cf85
Exists in
master
and in
6 other branches
儿童膳食报告bug修改
Showing 1 changed file with 3 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
0346754
| ... | ... | @@ -1278,7 +1278,6 @@ |
| 1278 | 1278 | map.put("reportMonthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), model.getNutritiTime()))); |
| 1279 | 1279 | |
| 1280 | 1280 | int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime()); |
| 1281 | - System.out.println("月龄====" + month); | |
| 1282 | 1281 | if (month > 36) { |
| 1283 | 1282 | return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); |
| 1284 | 1283 | } |
| ... | ... | @@ -1286,8 +1285,8 @@ |
| 1286 | 1285 | String bmi = patientWeightService.getBmi(String.valueOf(model.getWeight()), String.valueOf(model.getHeight())); |
| 1287 | 1286 | //获取是否 正常 消瘦 超重 |
| 1288 | 1287 | String kaupEvaluate = getBabyStatus(month, baby.getSex(), model.getHeight(), model.getWeight(), bmi); |
| 1289 | - | |
| 1290 | - System.out.println("======体重范围" + kaupEvaluate); | |
| 1288 | + map.put("bmi", bmi); | |
| 1289 | + map.put("kaupEvaluate", kaupEvaluate); | |
| 1291 | 1290 | if (kaupEvaluate.equals("正常") && month >= 0 && month <= 5) { |
| 1292 | 1291 | if (StringUtils.isNotEmpty(model.getFeedType())) { |
| 1293 | 1292 | BabyDietReportModel babyDietReport = mongoTemplate.findOne(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType())).and("shape").is(1)), BabyDietReportModel.class); |
| ... | ... | @@ -1342,7 +1341,7 @@ |
| 1342 | 1341 | } |
| 1343 | 1342 | //获取热量值 体重在正常范围内的不计算热量值 |
| 1344 | 1343 | double kaul = getKcal(month, model.getWeight(), model.getHeight(), baby.getSex(), kaupEvaluate); |
| 1345 | - map.put("kaul", kaul); | |
| 1344 | + map.put("kaul", kaul + "kacl"); | |
| 1346 | 1345 | data.put("userInfo", map); |
| 1347 | 1346 | if ((kaupEvaluate.equals("消瘦") || kaupEvaluate.equals("超重")) && month >= 6 && month <= 11) { |
| 1348 | 1347 | List<BabyDietReportModel> babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class); |