From 1afa4593f7e9320cb81bb2ebc4037df5ab499c2e Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Tue, 30 Jul 2019 15:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=95=E5=A6=87=E4=BD=93?= =?UTF-8?q?=E9=87=8D=E5=BB=BA=E8=AE=AE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PatientWeightController.java | 1 - .../web/service/impl/PatientWeightServiceImpl.java | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index e56dc15..09c32e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -181,7 +181,6 @@ public class PatientWeightController extends BaseController { /*** * 生活方式建议 - * * **/ @ResponseBody @RequestMapping(value = "/lifeStyle/info", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 4f3af42..6b2219d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -545,7 +545,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (2 == type) { setRecipe(map, configModel, week, kmap); // 设置食谱 } else if (3 == type) { - setSuggest(map, configModel, week); // 设置建议 + setSuggest(map, configModel, week, kmap); // 设置建议 } else if (4 == type) { setCookbook(map, configModel); // 设置菜谱 } @@ -734,7 +734,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient setCookbookQhd(map, configModel); // 设置菜谱 } else { setRecipe(map, configModel, week, kmap); // 设置食谱 - setSuggest(map, configModel, week); // 设置建议 + setSuggest(map, configModel, week, kmap); // 设置建议 setCookbook(map, configModel); // 设置菜谱 } @@ -1125,16 +1125,19 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("suggest", suggests); } - private void setSuggest(Map map, WeightConfigModel configModel, int week) { + private void setSuggest(Map map, WeightConfigModel configModel, int week, Map kaclmap) { List suggests = null; - /* if (week < 12) { + if (week < 12) { suggests = configModel.getEarlySuggests(); } else if (week <= 28) { suggests = configModel.getMiddleSuggests(); } else { suggests = configModel.getLaterSuggests(); - }*/ - suggests = configModel.getDietaryIntake(); + } + if ("3".equals((String) kaclmap.get("type"))) { + suggests = configModel.getDietaryIntake(); + } + map.put("suggest", suggests); } -- 1.8.3.1