From f46e65f723bb8b7b2f843b5b2dfd95e56eef8d91 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 4 Jul 2016 18:01:53 +0800 Subject: [PATCH] update code --- .../operate/web/facade/BabyBookbuildingFacade.java | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) 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 030811d..3dfe2ae 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 @@ -356,7 +356,35 @@ public class BabyBookbuildingFacade { //result.setHighRiskReason(model.getHighRiskReason()); result.setExpVip(model.getExpVip()); result.setMremark(model.getMremark() == null ? "" : model.getMremark()); - result.setDiagnose(JsonUtil.toList(model.getDiagnose(),List.class)); + + List> list = new ArrayList<>(); + String diagnoseStr = model.getDiagnose(); + if (!StringUtils.isEmpty(diagnoseStr)) + { + List diagnoses = JsonUtil.toList(diagnoseStr,List.class); + for (Object obj : diagnoses) + { + if (obj != null) + { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setId(String.valueOf(obj)); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(datas)) + { + Map map = new HashMap<>(); + map.put("id", datas.get(0).getId()); + map.put("name",datas.get(0).getName()); + list.add(map); + } + } + + } + } + result.setDiagnose(list); + + //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime())); result.setServiceStatus(String.valueOf(model.getServiceStatus())); -- 1.8.3.1