From e05fe8049a32835ac0cbfdcbff03fe3a3c5c16a1 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 31 Jan 2019 14:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=90=A5=E5=85=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyNutritionFacade.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 4fecb78..f8abdbc 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 @@ -339,16 +339,19 @@ public class BabyNutritionFacade { { //根据喂养方式获取 合理喂养 Criteria ca = Criteria.where("monthAge").is(month).and("type").is(0).and("status").is(kaupEvaluate); - if (month < 7) + if (month < 7 && StringUtils.isNotEmpty(model.getFeedType())) { String feedType = WyTypeEnums.getNameById(Integer.parseInt(model.getFeedType())); ca.and("feedType").is(feedType); + + BabyNutritionConfigModel babyNutritionConfig = mongoTemplate.findOne(Query.query(ca), + BabyNutritionConfigModel.class); + + //合理喂养 + data.put("hlFeed", babyNutritionConfig.getContentOne()); + } - BabyNutritionConfigModel babyNutritionConfig = mongoTemplate.findOne(Query.query(ca), - BabyNutritionConfigModel.class); - //合理喂养 - data.put("hlFeed",babyNutritionConfig.getContentOne()); BabyNutritionConfigModel babyNutritionConfig1 = mongoTemplate.findOne( @@ -390,7 +393,7 @@ public class BabyNutritionFacade { Map map1 = new HashMap<>(); map1.put("title",configModel.getTitle()); map1.put("contents",configModel.getContentOne()); - list.add(map); + list.add(map1); } //热量计算 data.put("foods",list); -- 1.8.3.1