From da5d29e297fe0835176ced3297f414c09fe03e48 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 15 Sep 2017 11:13:20 +0800 Subject: [PATCH] a --- .../job/index/restore/data/SyncDataWork.java | 76 +++++++++++----------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index a0ddf13..5ffd737 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -1207,47 +1207,49 @@ public class SyncDataWork { List data = new ArrayList(); List dat1a = new ArrayList(); Integer score = null; - if (CollectionUtils.isNotEmpty(id)) { + if (null!=id&&CollectionUtils.isNotEmpty(id)) { score = 0; for (String i : id) { - basicConfigQuery.setId(i); - List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); - if (CollectionUtils.isNotEmpty(basicConfigs)) { - Integer crisis = null; - for (BasicConfig basicConfig : basicConfigs) { - Map map = new HashMap<>(); - map.put("id", basicConfig.getId()); - map.put("name", basicConfig.getName()); - map.put("code", basicConfig.getCode()); - RiskDetails riskDetails = new RiskDetails(); - if (StringUtils.isNotEmpty(basicConfig.getCode())) { - score += NumberUtils.toInt(basicConfig.getCode(), 0); - riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode())); - } - riskDetails.setCreated(new Date()); - riskDetails.setYn(YnEnums.YES.getId()); - riskDetails.setModified(new Date()); - riskDetails.setPatientId(parentId); - riskDetails.setTitle(basicConfig.getName()); - - riskDetails.setPublishId(0); - riskDetails.setPublishName("system-worker"); - String basicConfig1 = highLevel.get(basicConfig.getParentId()); - if (null != basicConfig1) { - Map map1 = new HashMap<>(); - map1.put("id", basicConfig.getParentId()); - String name = basicConfig1; - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name)&&name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if(StringUtils.isNotEmpty(i)){ + basicConfigQuery.setId(i); + List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs)) { + Integer crisis = null; + for (BasicConfig basicConfig : basicConfigs) { + Map map = new HashMap<>(); + map.put("id", basicConfig.getId()); + map.put("name", basicConfig.getName()); + map.put("code", basicConfig.getCode()); + RiskDetails riskDetails = new RiskDetails(); + if (StringUtils.isNotEmpty(basicConfig.getCode())) { + score += NumberUtils.toInt(basicConfig.getCode(), 0); + riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode())); } - map1.put("name", name); - crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId(); - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); - dat1a.add(map1); + riskDetails.setCreated(new Date()); + riskDetails.setYn(YnEnums.YES.getId()); + riskDetails.setModified(new Date()); + riskDetails.setPatientId(parentId); + riskDetails.setTitle(basicConfig.getName()); + + riskDetails.setPublishId(0); + riskDetails.setPublishName("system-worker"); + String basicConfig1 = highLevel.get(basicConfig.getParentId()); + if (null != basicConfig1) { + Map map1 = new HashMap<>(); + map1.put("id", basicConfig.getParentId()); + String name = basicConfig1; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name)&&name.indexOf("预警") > -1) { + name = name.replace("预警", ""); + } + map1.put("name", name); + crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId(); + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + dat1a.add(map1); + } + riskDetails.setCrisis(crisis); + riskDetailsService.addRiskDetails(riskDetails); + data.add(map); } - riskDetails.setCrisis(crisis); - riskDetailsService.addRiskDetails(riskDetails); - data.add(map); } } } -- 1.8.3.1