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 4a5d94c..6f67fa4 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 @@ -520,10 +520,13 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { Map dietInfo = new HashMap<>(); if (week <= 12) { dietInfo.put("diet", bodyMassAnalysisModel2.getEarlySuggests());//膳食 + dietInfo.put("stage", "1");//1 孕早期 2 孕中期 3 孕晚期 } else if (week >= 13 && week <= 28) { dietInfo.put("diet", bodyMassAnalysisModel2.getMiddleSuggests()); + dietInfo.put("stage", "2");//2 孕中期 } else if (week >= 28 && week <= 40) { dietInfo.put("diet", bodyMassAnalysisModel2.getLaterSuggests()); + dietInfo.put("stage", "3");//3 孕晚期 } data.add(dietInfo); } @@ -538,7 +541,6 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { data.add(nutritionInfo); //食谱规则 recipeRulesInfo.put("recipesRule", nutrition.getRecipesRule()); - data.add(recipeRulesInfo); } } if(evaluationType[1]!=null){ @@ -546,10 +548,10 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { if (null != nutrition) { //食谱规则,后加上无机盐内容 recipeRulesInfo.put("recipesRuleWjy", nutrition.getRecipesRule()); - data.add(recipeRulesInfo); + } } - + data.add(recipeRulesInfo); }