From bf0aac4401c4994b9d8c954a7c5b74cb975f5f79 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 7 Feb 2018 10:41:49 +0800 Subject: [PATCH] 1 --- .../job/index/restore/data/SyncDataWork.java | 91 +--------------------- 1 file changed, 3 insertions(+), 88 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 b5aee49..d171286 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 @@ -962,7 +962,7 @@ public class SyncDataWork { riskDetails.setModified(new Date()); riskDetails.setPatientId(patientId); if (StringUtils.isNotEmpty(riskDetails.getTitle())) { -// riskDetailsService.addRiskDetails(riskDetails); + riskDetailsService.addOneRiskDetails(riskDetails); } } } @@ -995,91 +995,6 @@ public class SyncDataWork { } } - /*private void handLastRisk(com.lyms.platform.pojo.Patients patients, Integer patientId) { - logger.info("start handLastRisk " + patients.getId() + "."); - - StringBuilder sb = new StringBuilder(); - List data = new ArrayList<>(); - try { - int score = 0; - RiskColorEnum riskColorEnum = null; - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { - risksService.deleteRisk(patientId); - riskDetailsService.deleteRiskDetails(patientId); - for (String id : patients.getRiskFactorId()) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); - if (null != basicConfig) { - RiskDetails riskDetails = new RiskDetails(); - if (StringUtils.isNotEmpty(basicConfig.getCode())) { - score += NumberUtils.toInt(basicConfig.getCode(), 0); - riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode())); - } - BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); - sb.append(basicConfig.getName()).append('、'); - String name = basicConfig1.getName(); - 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 = "绿色"; - } - riskColorEnum = SyncDataWork.map.get(name); - if (null != riskColorEnum) { - data.add(riskColorEnum); - } - riskDetails.setCreated(new Date()); - riskDetails.setYn(YnEnums.YES.getId()); - riskDetails.setModified(new Date()); - riskDetails.setPublishId(0); - riskDetails.setPublishName("system-worker"); - riskDetails.setPatientId(patientId); - riskDetails.setTitle(basicConfig.getName()); - riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); - - riskDetailsService.addRiskDetails(riskDetails); - } - } - Risks risks = new Risks(); - risks.setCreated(new Date()); - risks.setYn(YnEnums.YES.getId()); - risks.setModified(new Date()); - risks.setPatientId(patientId); - - String srt = sb.toString(); - if (sb.toString().endsWith("、")) { - sb.setLength(srt.length() - 1); - srt = sb.toString(); - } - risks.setTitle(srt); - risks.setReason(srt); - Integer crisis = 0; - if (CollectionUtils.isNotEmpty(data)) { - crisis = 0; - for (RiskColorEnum risk : data) { - crisis = crisis | risk.getId(); - } - } - risks.setCrisis(crisis); - risks.setPublishId(0); - risks.setPublishName("system-worker"); - logger.info("addRisks " + patients.getId() + "."); - risksService.addRisks(risks); - - if (null != patientId) { - patientsService.updatePatientCrisis(patientId, risks.getCrisis()); - } - } - } catch (Exception e) { - ERROR_LOGGER.error("convert high risk error.", e); - } - logger.info("end handLastRisk " + patients.getId() + "."); - }*/ - public static void main(String[] args) { List data = new ArrayList<>(); @@ -1214,7 +1129,7 @@ public class SyncDataWork { riskDetails.setCreated(new Date()); riskDetails.setModified(new Date()); riskDetails.setPatientId(patientId); -// riskDetailsService.addRiskDetails(riskDetails); + riskDetailsService.addOneRiskDetails(riskDetails); } } } @@ -1306,7 +1221,7 @@ public class SyncDataWork { dat1a.add(map1); } riskDetails.setCrisis(crisis); - riskDetailsService.addRiskDetails(riskDetails); + riskDetailsService.addOneRiskDetails(riskDetails); data.add(map); } } -- 1.8.3.1