Commit 1afa4593f7e9320cb81bb2ebc4037df5ab499c2e
1 parent
60ddcee4e9
Exists in
master
and in
1 other branch
修改孕妇体重建议内容
Showing 2 changed files with 9 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java
View file @
1afa459
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
1afa459
| ... | ... | @@ -545,7 +545,7 @@ |
| 545 | 545 | if (2 == type) { |
| 546 | 546 | setRecipe(map, configModel, week, kmap); // 设置食谱 |
| 547 | 547 | } else if (3 == type) { |
| 548 | - setSuggest(map, configModel, week); // 设置建议 | |
| 548 | + setSuggest(map, configModel, week, kmap); // 设置建议 | |
| 549 | 549 | } else if (4 == type) { |
| 550 | 550 | setCookbook(map, configModel); // 设置菜谱 |
| 551 | 551 | } |
| ... | ... | @@ -734,7 +734,7 @@ |
| 734 | 734 | setCookbookQhd(map, configModel); // 设置菜谱 |
| 735 | 735 | } else { |
| 736 | 736 | setRecipe(map, configModel, week, kmap); // 设置食谱 |
| 737 | - setSuggest(map, configModel, week); // 设置建议 | |
| 737 | + setSuggest(map, configModel, week, kmap); // 设置建议 | |
| 738 | 738 | setCookbook(map, configModel); // 设置菜谱 |
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | |
| 742 | 742 | |
| ... | ... | @@ -1125,16 +1125,19 @@ |
| 1125 | 1125 | map.put("suggest", suggests); |
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | - private void setSuggest(Map<String, Object> map, WeightConfigModel configModel, int week) { | |
| 1128 | + private void setSuggest(Map<String, Object> map, WeightConfigModel configModel, int week, Map<String, String> kaclmap) { | |
| 1129 | 1129 | List<String> suggests = null; |
| 1130 | - /* if (week < 12) { | |
| 1130 | + if (week < 12) { | |
| 1131 | 1131 | suggests = configModel.getEarlySuggests(); |
| 1132 | 1132 | } else if (week <= 28) { |
| 1133 | 1133 | suggests = configModel.getMiddleSuggests(); |
| 1134 | 1134 | } else { |
| 1135 | 1135 | suggests = configModel.getLaterSuggests(); |
| 1136 | - }*/ | |
| 1137 | - suggests = configModel.getDietaryIntake(); | |
| 1136 | + } | |
| 1137 | + if ("3".equals((String) kaclmap.get("type"))) { | |
| 1138 | + suggests = configModel.getDietaryIntake(); | |
| 1139 | + } | |
| 1140 | + | |
| 1138 | 1141 | map.put("suggest", suggests); |
| 1139 | 1142 | } |
| 1140 | 1143 |