Commit 620c2fb51b310b8126f9f9c3b9d8a11fe12e9e12
1 parent
b9dfeffdb7
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
View file @
620c2fb
| ... | ... | @@ -520,10 +520,13 @@ |
| 520 | 520 | Map<String, Object> dietInfo = new HashMap<>(); |
| 521 | 521 | if (week <= 12) { |
| 522 | 522 | dietInfo.put("diet", bodyMassAnalysisModel2.getEarlySuggests());//膳食 |
| 523 | + dietInfo.put("stage", "1");//1 孕早期 2 孕中期 3 孕晚期 | |
| 523 | 524 | } else if (week >= 13 && week <= 28) { |
| 524 | 525 | dietInfo.put("diet", bodyMassAnalysisModel2.getMiddleSuggests()); |
| 526 | + dietInfo.put("stage", "2");//2 孕中期 | |
| 525 | 527 | } else if (week >= 28 && week <= 40) { |
| 526 | 528 | dietInfo.put("diet", bodyMassAnalysisModel2.getLaterSuggests()); |
| 529 | + dietInfo.put("stage", "3");//3 孕晚期 | |
| 527 | 530 | } |
| 528 | 531 | data.add(dietInfo); |
| 529 | 532 | } |
| ... | ... | @@ -538,7 +541,6 @@ |
| 538 | 541 | data.add(nutritionInfo); |
| 539 | 542 | //食谱规则 |
| 540 | 543 | recipeRulesInfo.put("recipesRule", nutrition.getRecipesRule()); |
| 541 | - data.add(recipeRulesInfo); | |
| 542 | 544 | } |
| 543 | 545 | } |
| 544 | 546 | if(evaluationType[1]!=null){ |
| 545 | 547 | |
| ... | ... | @@ -546,10 +548,10 @@ |
| 546 | 548 | if (null != nutrition) { |
| 547 | 549 | //食谱规则,后加上无机盐内容 |
| 548 | 550 | recipeRulesInfo.put("recipesRuleWjy", nutrition.getRecipesRule()); |
| 549 | - data.add(recipeRulesInfo); | |
| 551 | + | |
| 550 | 552 | } |
| 551 | 553 | } |
| 552 | - | |
| 554 | + data.add(recipeRulesInfo); | |
| 553 | 555 | } |
| 554 | 556 | |
| 555 | 557 |