From f26eae94a570bad5b919a42a7f99e4f259df1463 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Thu, 30 May 2019 10:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=86=B3=E9=A3=9F=E6=8A=A5?= =?UTF-8?q?=E5=91=8Abug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyNutritionFacade.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 7d8733e..bfa2843 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -1287,10 +1287,18 @@ public class BabyNutritionFacade { String kaupEvaluate = getBabyStatus(month, baby.getSex(), model.getHeight(), model.getWeight(), bmi); map.put("bmi", bmi); map.put("kaupEvaluate", kaupEvaluate); - if (kaupEvaluate.equals("正常") && month >= 0 && month <= 5) { - if (StringUtils.isNotEmpty(model.getFeedType())) { - BabyDietReportModel babyDietReport = mongoTemplate.findOne(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType())).and("shape").is(1)), BabyDietReportModel.class); - data.put("feedingGuide", babyDietReport.getFeedingGuide()); + if (month >= 0 && month <= 5) { + List babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class); + for (BabyDietReportModel babyDiet : babyDietReport) { + if (null != babyDiet.getShape()) { + if (kaupEvaluate.equals("正常") && babyDiet.getShape() == 1) { + data.put("feedingGuide", babyDiet.getFeedingGuide()); + } else if (kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) { + data.put("feedingGuide", babyDiet.getFeedingGuide()); + } else if (kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) { + data.put("feedingGuide", babyDiet.getFeedingGuide()); + } + } } } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) { List babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class); -- 1.8.3.1