From a2d353025815572ac691938d9afaea03895fd18c Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Wed, 29 May 2019 15:10:35 +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 --- .../operate/web/facade/BabyNutritionFacade.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 11efc81..7d8733e 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 @@ -1293,9 +1293,9 @@ public class BabyNutritionFacade { data.put("feedingGuide", babyDietReport.getFeedingGuide()); } } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) { - List babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("shape").is(1)), BabyDietReportModel.class); + List babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class); for (BabyDietReportModel babyDiet : babyDietReportList) { - if (month == 6) { + if (month == 6 && babyDiet.getShape() == 1) { if (StringUtils.isNotEmpty(model.getFeedType())) { if (Integer.valueOf(model.getFeedType()) == month) { data.put("feedingGuide", babyDiet.getFeedingGuide()); @@ -1307,12 +1307,14 @@ public class BabyNutritionFacade { } else { data.put("feedingGuide", babyDiet.getFeedingGuide()); } - //膳食结构 - data.put("dietStructure", babyDiet.getDietStructure()); - //一周喂养参考 - data.put("feedingWeek", babyDiet.getOneDayRecipes()); - //推荐食谱 - data.put("recommendRecipes", babyDiet.getRecommendRecipes()); + if (null != babyDiet.getWeightType() && babyDiet.getWeightType() == 0) { + //膳食结构 + data.put("dietStructure", babyDiet.getDietStructure()); + //一周喂养参考 + data.put("feedingWeek", babyDiet.getOneDayRecipes()); + //推荐食谱 + data.put("recommendRecipes", babyDiet.getRecommendRecipes()); + } } } else if (kaupEvaluate.equals("正常") && month >= 12 && month <= 36) { List babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month)), BabyDietReportModel.class); -- 1.8.3.1