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;