From 53037ebb5633d629bfe0d6e86ba44a36637241a5 Mon Sep 17 00:00:00 2001 From: wtt <1872109740@qq.com> Date: Thu, 6 Feb 2020 14:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=88=90=E5=88=86=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=8C=E9=A3=9F=E8=B0=B1=E8=A7=84=E5=88=99?= =?UTF-8?q?,=E5=90=8E=E5=8A=A0=E4=B8=8A=E6=97=A0=E6=9C=BA=E7=9B=90?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/VolumeComponentAnalysisFacade.java | 35 +++++++++++++++------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java index ca6d8a4..0f28f95 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java @@ -525,19 +525,32 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { } data.add(dietInfo); } - - - BodyMassAnalysisModel nutrition = mongoTemplate.findOne(Query.query(Criteria.where("evaluationType").is(evaluationType)), BodyMassAnalysisModel.class); - if (null != nutrition) { - //人体成分营养评价 - Map nutritionInfo = new HashMap<>(); - nutritionInfo.put("nutritionalEvaluation", nutrition.getNutritionalEvaluationInfo()); - data.add(nutritionInfo); - //食谱规则 + if(evaluationType.length != 0 ){ Map recipeRulesInfo = new HashMap<>(); - recipeRulesInfo.put("recipesRule", nutrition.getRecipesRule()); - data.add(recipeRulesInfo); + if(evaluationType[0]!=null){ + BodyMassAnalysisModel nutrition = mongoTemplate.findOne(Query.query(Criteria.where("evaluationType").is(evaluationType[0])), BodyMassAnalysisModel.class); + if (null != nutrition) { + //人体成分营养评价 + Map nutritionInfo = new HashMap<>(); + nutritionInfo.put("nutritionalEvaluation", nutrition.getNutritionalEvaluationInfo()); + data.add(nutritionInfo); + //食谱规则 + recipeRulesInfo.put("recipesRule", nutrition.getRecipesRule()); + data.add(recipeRulesInfo); + } + } + if(evaluationType[1]!=null){ + BodyMassAnalysisModel nutrition = mongoTemplate.findOne(Query.query(Criteria.where("evaluationType").is(evaluationType[1])), BodyMassAnalysisModel.class); + if (null != nutrition) { + //食谱规则,后加上无机盐内容 + recipeRulesInfo.put("recipesRuleWjy", nutrition.getRecipesRule()); + data.add(recipeRulesInfo); + } + } + } + + //第二、三页结束 return data; -- 1.8.3.1