Commit 53037ebb5633d629bfe0d6e86ba44a36637241a5
1 parent
b543548c52
Exists in
master
and in
6 other branches
体成分分析报告，食谱规则,后加上无机盐内容
Showing 1 changed file with 24 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
View file @
53037eb
| ... | ... | @@ -525,19 +525,32 @@ |
| 525 | 525 | } |
| 526 | 526 | data.add(dietInfo); |
| 527 | 527 | } |
| 528 | - | |
| 529 | - | |
| 530 | - BodyMassAnalysisModel nutrition = mongoTemplate.findOne(Query.query(Criteria.where("evaluationType").is(evaluationType)), BodyMassAnalysisModel.class); | |
| 531 | - if (null != nutrition) { | |
| 532 | - //人体成分营养评价 | |
| 533 | - Map<String, Object> nutritionInfo = new HashMap<>(); | |
| 534 | - nutritionInfo.put("nutritionalEvaluation", nutrition.getNutritionalEvaluationInfo()); | |
| 535 | - data.add(nutritionInfo); | |
| 536 | - //食谱规则 | |
| 528 | + if(evaluationType.length != 0 ){ | |
| 537 | 529 | Map<String, Object> recipeRulesInfo = new HashMap<>(); |
| 538 | - recipeRulesInfo.put("recipesRule", nutrition.getRecipesRule()); | |
| 539 | - data.add(recipeRulesInfo); | |
| 530 | + if(evaluationType[0]!=null){ | |
| 531 | + BodyMassAnalysisModel nutrition = mongoTemplate.findOne(Query.query(Criteria.where("evaluationType").is(evaluationType[0])), BodyMassAnalysisModel.class); | |
| 532 | + if (null != nutrition) { | |
| 533 | + //人体成分营养评价 | |
| 534 | + Map<String, Object> nutritionInfo = new HashMap<>(); | |
| 535 | + nutritionInfo.put("nutritionalEvaluation", nutrition.getNutritionalEvaluationInfo()); | |
| 536 | + data.add(nutritionInfo); | |
| 537 | + //食谱规则 | |
| 538 | + recipeRulesInfo.put("recipesRule", nutrition.getRecipesRule()); | |
| 539 | + data.add(recipeRulesInfo); | |
| 540 | + } | |
| 541 | + } | |
| 542 | + if(evaluationType[1]!=null){ | |
| 543 | + BodyMassAnalysisModel nutrition = mongoTemplate.findOne(Query.query(Criteria.where("evaluationType").is(evaluationType[1])), BodyMassAnalysisModel.class); | |
| 544 | + if (null != nutrition) { | |
| 545 | + //食谱规则,后加上无机盐内容 | |
| 546 | + recipeRulesInfo.put("recipesRuleWjy", nutrition.getRecipesRule()); | |
| 547 | + data.add(recipeRulesInfo); | |
| 548 | + } | |
| 549 | + } | |
| 550 | + | |
| 540 | 551 | } |
| 552 | + | |
| 553 | + | |
| 541 | 554 | //第二、三页结束 |
| 542 | 555 | |
| 543 | 556 | return data; |