From 72f0915f41aaaa75901e25949c82916e26d69927 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 14 Oct 2016 15:23:45 +0800 Subject: [PATCH] commit --- .../operate/web/worker/QuanPatientWorker.java | 1 + .../lyms/platform/operate/web/worker/WorkHR.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index 655902b..afeb4e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -162,6 +162,7 @@ public class QuanPatientWorker implements Callable> { if (name.indexOf("预警") > -1) { name = name.replace("预警", ""); } + map.put("name",name); map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index 7c476ca..576f056 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -170,6 +170,7 @@ public class WorkHR implements Callable> { if (name.indexOf("预警") > -1) { name = name.replace("预警", ""); } + map.put("name",name); map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } @@ -187,4 +188,27 @@ public class WorkHR implements Callable> { } return dataList; } + public static void main(String[] args){ + List level = new ArrayList(); + Map map = new HashMap(); + String name = "黄色预警"; + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); + } + map.put("name",name); + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + + Map map1 = new HashMap(); + String name1 = "绿色预警"; + if (name.indexOf("预警") > -1) { + name1 = name1.replace("预警", ""); + } + map1.put("name",name1); + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name1)); + level.add(map1); + + level.add(map); + System.out.print(HighScoreResult.filter(level)); + ; + } } \ No newline at end of file -- 1.8.3.1