From 2f39e050299e535d29ae84e61bca065c4fce3864 Mon Sep 17 00:00:00 2001 From: tranny <1163285868@qq.com> Date: Thu, 19 Nov 2020 15:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=96=BE=E7=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/BabyBuildController.java | 2 +- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 072f04f..6fe04b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -819,7 +819,7 @@ public class BabyBuildController extends BaseController { */ @RequestMapping(value = "/getBabyDiseases", method = RequestMethod.GET) @ResponseBody - public List getBabyDisease(@RequestParam(required = true) String id) { + public Map getBabyDisease(@RequestParam(required = true) String id) { return babyBookbuildingFacade.getBabyDisease(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 29cbb97..2ee7357 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -5042,15 +5042,24 @@ public class BabyBookbuildingFacade { } - public List getBabyDisease(String id) { + public Map getBabyDisease(String id) { + + Map data = new HashMap<>(); + List diseases = new ArrayList <>(); BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(id); if (babyModel != null && CollectionUtils.isNotEmpty(babyModel.getDiseases())) { for (int i = 0, len = babyModel.getDiseases().size(); i < len; i++) { diseases.add(BabyDiseaseEnums.getNameById(Integer.parseInt(babyModel.getDiseases().get(i)))); } + data.put("diseases", diseases); + data.put("openDisease",com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getOpenDisease()) ? babyModel.getOpenDisease() : "1"); + data.put("openDiseaseType", babyModel.getOpenDiseaseType()); + data.put("openDiseaseEndTime", DateUtil.getyyyy_MM_dd(babyModel.getOpenDiseaseEndTime())); + data.put("babyBirthday",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); + } - return diseases; + return data; } public BaseResponse getBabyAppBuildInfo(String phone) { -- 1.8.3.1