From 7ba2b8fab85a42d3e341afa3a2436116f1b9d617 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 25 Jan 2018 09:21:25 +0800 Subject: [PATCH] 1 --- .../operate/web/facade/AntenatalExaminationFacade.java | 5 ++--- .../lyms/platform/operate/web/utils/ResolveUtils.java | 16 ++++------------ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index b6876c5..4e7cab2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -789,7 +789,7 @@ public class AntenatalExaminationFacade { } score+=NumberUtils.toInt(map.get("score").toString()); - highScoreResult.getLevel().add(map.get("fyyse")); + highScoreResult.getLevel().add(map); } if(StringUtils.isNotEmpty(otherRisk.toString())){ highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1)); @@ -844,8 +844,7 @@ public class AntenatalExaminationFacade { } score+=NumberUtils.toInt(map.get("score").toString(),0); -// highScoreResult.getLevel().add(map); - highScoreResult.getLevel().add(map.get("fyyse")); + highScoreResult.getLevel().add(map); } highScoreResult.setScore(highScoreResult.getScore()+score); if(StringUtils.isNotEmpty(otherRisk.toString())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java index d0705e2..2229646 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java @@ -428,18 +428,10 @@ public class ResolveUtils { public static void main(String[] str) { -// String ssss = "{\"qztp\":true,\"yesOrNo\":\"no\",\"tpzb\":true,\"zxqqz\":true,\"zxqqq\":true,\"tpzl\":true," + -// "\"zxmxgxybfzxqq\":true,\"chcx\":true,\"rshbmxgxy\":true,\"tmzp\":true,\"rsqgxy\":true,\"qt\":false,\"qtText\":\"11\"}"; -// -// Map m = JsonUtil.str2Obj(ssss,Map.class); -// -// String a = replace(m); -// System.out.print("哈哈.................... " + a); - -// String s = "{\"qt\":true,\"jsjmj\":true,\"ydqjd\":\"5769ef930cf2d37f03479390\",\"qtText\":\"其他\",\"yesOrNO\":\"yes\",\"dc\":true}"; -// Map m = JsonUtil.str2Obj(s,Map.class); -// String a = replaceYDFMW(m,1); - + List> listMap = new ArrayList<>(); + String s="[{\"fxpf\":\"5769f0640cf2d37f034793a2\",\"fxysu\":\"色盲遗传史\",\"fyyse\":\"315107bd-91fe-42a1-9237-752f3c046a40\",\"score\":5,\"color\":\"risk_yellow\",\"otherId\":\"5a531d6bc07dbb92526b3566\"},{\"fxpf\":\"5769f0640cf2d37f034793a3\",\"fxysu\":\"阿斯顿发送到\",\"fyyse\":\"224b2329-cb82-4da3-a071-8527f8283aab\",\"score\":10,\"color\":\"risk_purple\",\"otherId\":\"5a531d6ac07dbb92526b3556\"}]"; + ResolveUtils.queryOtherRisk(s, listMap); + System.out.println(listMap); } } -- 1.8.3.1