Commit f26eae94a570bad5b919a42a7f99e4f259df1463

Authored by wangbo
1 parent 83f99c5b27

儿童膳食报告bug修改

Showing 1 changed file with 12 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ f26eae9
... ... @@ -1287,10 +1287,18 @@
1287 1287 String kaupEvaluate = getBabyStatus(month, baby.getSex(), model.getHeight(), model.getWeight(), bmi);
1288 1288 map.put("bmi", bmi);
1289 1289 map.put("kaupEvaluate", kaupEvaluate);
1290   - if (kaupEvaluate.equals("正常") && month >= 0 && month <= 5) {
1291   - if (StringUtils.isNotEmpty(model.getFeedType())) {
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);
1293   - data.put("feedingGuide", babyDietReport.getFeedingGuide());
  1290 + if (month >= 0 && month <= 5) {
  1291 + List<BabyDietReportModel> babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class);
  1292 + for (BabyDietReportModel babyDiet : babyDietReport) {
  1293 + if (null != babyDiet.getShape()) {
  1294 + if (kaupEvaluate.equals("正常") && babyDiet.getShape() == 1) {
  1295 + data.put("feedingGuide", babyDiet.getFeedingGuide());
  1296 + } else if (kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) {
  1297 + data.put("feedingGuide", babyDiet.getFeedingGuide());
  1298 + } else if (kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) {
  1299 + data.put("feedingGuide", babyDiet.getFeedingGuide());
  1300 + }
  1301 + }
1294 1302 }
1295 1303 } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) {
1296 1304 List<BabyDietReportModel> babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class);