From 60a3a052988220771a83490b8b64263c4da29a59 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 10 Apr 2018 17:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/index/restore/data/SyncDataWork.java | 114 +++++++++++---------- .../resources/spring/applicationContext-quartz.xml | 2 +- 2 files changed, 63 insertions(+), 53 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 8064642..a46ae86 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 @@ -1021,7 +1021,10 @@ public class SyncDataWork { } List list2 = null; boolean isdel = false; + + //删除历史高危 try { + //处理自定义高危 if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { String otherHighRisk = antExChuModel.getOtherHighRisk(); @@ -1033,7 +1036,7 @@ public class SyncDataWork { Map otherMap = JsonUtil.jkstr2Obj(otherHighRisk, Map.class); otherHighRisks.add(otherMap); } - + //如果有自定義高危因数则先删除以前的高危 if (CollectionUtils.isNotEmpty(otherHighRisks)) { Map map = otherHighRisks.get(0); Object obj1 = map.get("fxysu"); @@ -1044,6 +1047,7 @@ public class SyncDataWork { } } } + //国家高危 list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); if (null != list2 && CollectionUtils.isNotEmpty(list2) && !isdel) { risksService.deleteRisk(patientId); @@ -1061,6 +1065,8 @@ public class SyncDataWork { risks.setPatientId(patientId); HighScoreResult highScoreResult = new HighScoreResult(); try { + System.out.println("国家高危："+list2+",size:"+list2.size()); + //添加高危信息到详情表 highScoreResult = queryRisk(list2, patientId); } catch (Exception e) { ERROR_LOGGER.error("convert high risk error." + list2, e); @@ -1170,64 +1176,68 @@ public class SyncDataWork { List data = new ArrayList(); List dat1a = new ArrayList(); Integer score = null; - if (null != id && CollectionUtils.isNotEmpty(id)) { - score = 0; - for (String i : id) { - 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())); - } - 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 (name.indexOf("黄色") > -1) { - name = "黄色"; - }else if (name.indexOf("橙色") > -1) { - name = "橙色"; - }else if (name.indexOf("红色") > -1) { - name = "红色"; - }else if (name.indexOf("紫色") > -1) { - name = "紫色"; - }else if (name.indexOf("绿色") > -1) { - name = "绿色"; + try { + if (null != id && CollectionUtils.isNotEmpty(id)) { + score = 0; + for (String i : id) { + 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())); } + 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 (name.indexOf("黄色") > -1) { + name = "黄色"; + } else if (name.indexOf("橙色") > -1) { + name = "橙色"; + } else if (name.indexOf("红色") > -1) { + name = "红色"; + } else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } else if (name.indexOf("绿色") > -1) { + name = "绿色"; + } - 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); + map1.put("name", name); + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + dat1a.add(map1); + crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId(); + riskDetails.setCrisis(crisis); + } + riskDetailsService.addOneRiskDetails(riskDetails); + data.add(map); } - riskDetails.setCrisis(crisis); - riskDetailsService.addOneRiskDetails(riskDetails); - data.add(map); } } } } + }catch (Exception e){ + e.printStackTrace(); } highScoreResult.setHighRisk(data); highScoreResult.setScore(score); diff --git a/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml b/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml index 5ae8165..9ed91c2 100644 --- a/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml @@ -22,7 +22,7 @@ - + -- 1.8.3.1