From 45a4f3ca30e85e1d5a884ca76a64ff1b366304c1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 30 Jan 2018 10:57:24 +0800 Subject: [PATCH] 1 --- .../job/index/restore/data/ConvertHelper.java | 50 ++++++++----- .../job/index/restore/data/HighScoreResult.java | 70 +++++++++++++----- .../job/index/restore/data/SyncDataWork.java | 84 ++++++++-------------- .../operate/web/controller/TestController.java | 5 ++ 4 files changed, 117 insertions(+), 92 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java index 98f7544..8ac7d49 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java @@ -369,7 +369,7 @@ public class ConvertHelper { drugGllergic += " 先锋霉素过敏,"; } - drugGllergic= FunvCommonUtil.spitd(drugGllergic); + drugGllergic = FunvCommonUtil.spitd(drugGllergic); String qt = map.get("qt") == null ? "" : map.get("qt").toString(); if ("true".equals(qt)) { String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); @@ -679,16 +679,24 @@ public class ConvertHelper { } } } - if (null != antExChuModel.getOtherHighRisk() && !"{}".equals(antExChuModel.getOtherHighRisk())) { - Map map1 = null; - try { - map1 = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); - } catch (Exception e) { - } - Object rh = map1.get("fxysu"); - if (null != rh && StringUtils.isNotEmpty(rh.toString())) { - sb.append(rh); + List otherHighRisks = new ArrayList<>(); + List list3 = null; + String ot=antExChuModel.getOtherHighRisk(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(ot)&&ot.startsWith("[") && antExChuModel.getOtherHighRisk().endsWith("]")) { + list3 = JsonUtil.toList(ot, Map.class); + otherHighRisks.addAll(list3); + } else if(org.apache.commons.lang.StringUtils.isNotEmpty(ot)){ + Map otherMap = JsonUtil.jkstr2Obj(ot, Map.class); + otherHighRisks.add(otherMap); + } + + if (CollectionUtils.isNotEmpty(otherHighRisks)) { + for (Map ma : otherHighRisks) { + Object rh = ma.get("fxysu"); + if (null != rh && StringUtils.isNotEmpty(rh.toString())) { + sb.append(rh); + } } } //低压 @@ -883,20 +891,24 @@ public class ConvertHelper { } } } - if (null != antExChuModel.getOtherRisk() && !"{}".equals(antExChuModel.getOtherRisk())) { - Map map1 = null; - try { - map1 = JsonUtil.str2Obj(antExChuModel.getOtherRisk(), Map.class); - } catch (Exception e) { + List otherHighRisks = new ArrayList<>(); + List list3 = null; + String ot =antExChuModel.getOtherRisk(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(ot)&ot.startsWith("[") && ot.endsWith("]")) { + list3 = JsonUtil.toList(ot, Map.class); + otherHighRisks.addAll(list3); + } else if(org.apache.commons.lang.StringUtils.isNotEmpty(ot)){ + Map otherMap = JsonUtil.jkstr2Obj(ot, Map.class); + otherHighRisks.add(otherMap); + } - } - if (null != map1) { - Object rh = map1.get("fxysu"); + if (CollectionUtils.isNotEmpty(otherHighRisks)) { + for (Map ma : otherHighRisks) { + Object rh = ma.get("fxysu"); if (null != rh && StringUtils.isNotEmpty(rh.toString())) { sb.append(rh); } } - } //低压 java.util.Map dataMap1 = new HashMap<>(); diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/HighScoreResult.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/HighScoreResult.java index ef59fad..e945427 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/HighScoreResult.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/HighScoreResult.java @@ -1,6 +1,7 @@ package com.lyms.platform.job.index.restore.data; import com.lyms.platform.common.utils.StringUtils; +import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; import java.util.Collections; @@ -9,32 +10,61 @@ import java.util.List; /** * Created by Administrator on 2016/8/2 0002. */ + +/** + * Created by Administrator on 2016/8/2 0002. + */ public class HighScoreResult { //高危因素 private List highRisk = new ArrayList(); //风险等级颜色 private List level = new ArrayList(); + + private String otherRisk; + //高危评分 private Integer score = 0; + //补充高危因素 + private String highriskDesc; + + public String getHighriskDesc() { + return highriskDesc; + } + + public void setHighriskDesc(String highriskDesc) { + this.highriskDesc = highriskDesc; + } + public List getHighRisk() { return highRisk; } public List getLevel() { - return (level); + return /*filter(*/level/*)*/; + } + + public String getOtherRisk() { + return otherRisk; + } + + public void setOtherRisk(String otherRisk) { + this.otherRisk = otherRisk; } - public static List filter(List level){ + public static List filter(List level) { List list = new ArrayList(); - List addEdList = new ArrayList(); - for(java.util.Map map :level){ - if(!addEdList.contains(map.get("name"))){ - list.add(map); - addEdList.add(map.get("name")); + List addEdList = new ArrayList(); + if (CollectionUtils.isNotEmpty(level)) { + for (java.util.Map map : level) { + if (!addEdList.contains(map.get("name"))) { + list.add(map); + addEdList.add(map.get("name")); + } } } + return list; } @@ -54,11 +84,11 @@ public class HighScoreResult { } - public String getScoreStr(){ - if(null==score || 0==score){ + public String getScoreStr() { + if (null == score || 0 == score) { return ""; } - return score+""; + return score + ""; } public List getLevelId() { @@ -69,9 +99,13 @@ public class HighScoreResult { for (int i1 = 0; i1 < level.size(); i1++) { java.util.Map map = (java.util.Map) level.get(i1); String name = map.get("id"); + String fyyse = map.get("fyyse"); if (StringUtils.isNotEmpty(name)) { idList.add(name); } + if (StringUtils.isNotEmpty(fyyse)) { + idList.add(fyyse); + } } return idList; } @@ -91,11 +125,11 @@ public class HighScoreResult { return idList; } - public String getOtherHigh(){ + public String getOtherHigh() { if (null == highRisk) { return ""; } - StringBuilder stringBuilder=new StringBuilder(); + StringBuilder stringBuilder = new StringBuilder(); for (int i1 = 0; i1 < highRisk.size(); i1++) { java.util.Map map = (java.util.Map) highRisk.get(i1); String id = map.get("id"); @@ -103,8 +137,8 @@ public class HighScoreResult { stringBuilder.append(map.get("name")).append(","); } } - if(stringBuilder.length()>0){ - stringBuilder.setLength(stringBuilder.length()-1); + if (stringBuilder.length() > 0) { + stringBuilder.setLength(stringBuilder.length() - 1); } return stringBuilder.toString(); } @@ -131,7 +165,7 @@ public class HighScoreResult { return stringBuilder.toString(); } - public String getLevelStr(List levelList) { + public static String getLevelStr(List levelList) { StringBuilder stringBuilder = new StringBuilder(); if (null == levelList) { return ""; @@ -148,6 +182,7 @@ public class HighScoreResult { } return stringBuilder.toString(); } + public String gethighRiskStr() { StringBuilder stringBuilder = new StringBuilder(); if (null == highRisk) { @@ -162,8 +197,9 @@ public class HighScoreResult { } return stringBuilder.toString(); } - public List gethighRiskList(){ - List list=new ArrayList<>(); + + public List gethighRiskList() { + List list = new ArrayList<>(); if (null == highRisk) { return list; } 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 dd44676..b5aee49 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 @@ -236,6 +236,8 @@ public class SyncDataWork { name = "红色"; }else if (name.indexOf("紫色") > -1) { name = "紫色"; + }else if (name.indexOf("绿色") > -1) { + name = "绿色"; } highLevel.put(basicConfig.getId(), name); @@ -622,58 +624,6 @@ public class SyncDataWork { } } - /** - * 处理自定义高危 - */ - private RiskDetails customHighRisk(String otherRisk, Integer patientId) { - RiskDetails riskDetails = null; - if (StringUtils.isNotEmpty(otherRisk)) { - Map map = JsonUtil.str2Obj(otherRisk, Map.class); - - riskDetails = new RiskDetails(); - riskDetails.setCreated(new Date()); - riskDetails.setYn(YnEnums.YES.getId()); - riskDetails.setModified(new Date()); - riskDetails.setPublishId(0); - riskDetails.setPublishName("system-worker"); - riskDetails.setPatientId(patientId); - //风险因素 - Map map1 = new HashMap(); - map1.put("id", ""); - Object obj = map.get("fxysu"); - if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { - riskDetails.setTitle(map.get("fxysu").toString()); - } - - //风险评分 - Object idObj = map.get("fxpf"); - if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); - riskDetails.setScore(NumberUtils.toInt(basicConfig.getName())); - } - Object idObj1 = map.get("fyyse"); - if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); - if (null != basicConfig) { - String name = basicConfig.getName(); - if (name.indexOf("黄色") > -1) { - name = "黄色"; - }else if (name.indexOf("橙色") > -1) { - name = "橙色"; - }else if (name.indexOf("红色") > -1) { - name = "红色"; - }else if (name.indexOf("紫色") > -1) { - name = "紫色"; - } - RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); - riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); - } - } - riskDetailsService.addRiskDetails(riskDetails); - } - return riskDetails; - } - private void handleDoctorMemeber(Reports reports, String prodDoctor, Patients mamiPatient, com.lyms.platform.pojo.Patients patients, StopWatch stopWatch3) { if (NumberUtils.isNumber(prodDoctor)) { @@ -989,11 +939,14 @@ public class SyncDataWork { name = "红色"; }else if (name.indexOf("紫色") > -1) { name = "紫色"; + }else if (name.indexOf("绿色") > -1) { + name = "绿色"; } map2.put("name", name); RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); + map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); highScoreResult.getLevel().add(map2); } @@ -1009,7 +962,7 @@ public class SyncDataWork { riskDetails.setModified(new Date()); riskDetails.setPatientId(patientId); if (StringUtils.isNotEmpty(riskDetails.getTitle())) { - riskDetailsService.addRiskDetails(riskDetails); +// riskDetailsService.addRiskDetails(riskDetails); } } } @@ -1042,7 +995,7 @@ public class SyncDataWork { } } - private void handLastRisk(com.lyms.platform.pojo.Patients patients, Integer patientId) { + /*private void handLastRisk(com.lyms.platform.pojo.Patients patients, Integer patientId) { logger.info("start handLastRisk " + patients.getId() + "."); StringBuilder sb = new StringBuilder(); @@ -1072,6 +1025,8 @@ public class SyncDataWork { name = "红色"; }else if (name.indexOf("紫色") > -1) { name = "紫色"; + }else if (name.indexOf("绿色") > -1) { + name = "绿色"; } riskColorEnum = SyncDataWork.map.get(name); if (null != riskColorEnum) { @@ -1123,7 +1078,7 @@ public class SyncDataWork { ERROR_LOGGER.error("convert high risk error.", e); } logger.info("end handLastRisk " + patients.getId() + "."); - } + }*/ public static void main(String[] args) { @@ -1239,6 +1194,8 @@ public class SyncDataWork { name = "红色"; }else if (name.indexOf("紫色") > -1) { name = "紫色"; + }else if (name.indexOf("绿色") > -1) { + name = "绿色"; } map2.put("name", name); RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); @@ -1257,7 +1214,7 @@ public class SyncDataWork { riskDetails.setCreated(new Date()); riskDetails.setModified(new Date()); riskDetails.setPatientId(patientId); - riskDetailsService.addRiskDetails(riskDetails); +// riskDetailsService.addRiskDetails(riskDetails); } } } @@ -1274,6 +1231,9 @@ public class SyncDataWork { String name = tmp.get("name") == null ? null : (String) tmp.get("name"); if (null != name) { RiskColorEnum colorEnum = map.get(name); + if(null==colorEnum){ + logger.info("error :colorEnum null." +name); + } crisis = crisis | colorEnum.getId(); } } @@ -1328,6 +1288,18 @@ public class SyncDataWork { 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)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 44ca73f..2d1fcef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -145,6 +145,7 @@ public class TestController { highRisks.put("80587d8a-009e-46aa-87e5-57996b0708b1", "d6cfcad8-c674-4624-b50d-8797d217f10c"); //糖尿病并发肾功能不全 ---糖尿病并发肾病V级、严重心血管病、增生性视网膜病变或玻璃体出血、周围神经病变等 highRisks.put("f50206fe-5fe4-4831-be7b-506ab0b458ed", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病 highRisks.put("e04d5364-11da-45f6-9801-c50ad5eb6f27", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病 + highRisks.put("4ec114d7-9c78-4dfc-878c-1139ef3ff04c", "5a40c73c422b03d4ad2bf7bf"); //骨盆狭窄或产道畸形，--- 生殖道畸形和骨盆狭小 } @ResponseBody @@ -1648,6 +1649,10 @@ public class TestController { patientRisk.remove(key); if (!patientRisk.contains(highRisks.get(key))) { patientRisk.add(highRisks.get(key)); + //骨盆狭窄或产道畸形 + if(key.equals("4ec114d7-9c78-4dfc-878c-1139ef3ff04c")){ + patientRisk.add("5a40c747422b03d4ad2bf7c0"); + } modCount++; } } -- 1.8.3.1