From e97e9f71f2f132e2c93180f3e2ea32cfd242c68f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 19 Aug 2016 11:23:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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 e9d7f45..626fd03 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 @@ -1274,10 +1274,22 @@ public class BabyBookbuildingFacade { result.setPatientId(model.getParentId()); String diagnose = ""; - if (!StringUtils.isEmpty(model.getDiagnose())) { - List diagList = JsonUtil.toList(model.getDiagnose(), List.class); +// if (!StringUtils.isEmpty(model.getDiagnose())) { +// List diagList = JsonUtil.toList(model.getDiagnose(), List.class); +// if (CollectionUtils.isNotEmpty(diagList)) { +// diagnose = ""; +// for (Object obj : diagList) { +// BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); +// if (basicConfig != null) { +// diagnose += basicConfig.getName() + " "; +// } +// } +// } +// } + if (StringUtils.isNotEmpty(model.getPid())) + { + List diagList = babyCheckFacade.getBabyLastDiagnose(model.getPid()); if (CollectionUtils.isNotEmpty(diagList)) { - diagnose = ""; for (Object obj : diagList) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); if (basicConfig != null) { -- 1.8.3.1