From 2518b73dd1c2fc81373b181adbf317ff8128d455 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 7 Sep 2017 14:03:52 +0800 Subject: [PATCH] update code --- .../web/facade/AntenatalExaminationFacade.java | 26 +++++----------------- 1 file changed, 5 insertions(+), 21 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 319790c..28b8578 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 @@ -765,6 +765,7 @@ public class AntenatalExaminationFacade { } map1.put("oRiskId", map.get("fyyse")); + map1.put("fpId", map.get("fxpf")); if (needLevel) { Object idObj1 = map.get("fyyse"); @@ -846,6 +847,7 @@ public class AntenatalExaminationFacade { } map1.put("oRiskId", map.get("fyyse")); + map1.put("fpId", map.get("fxpf")); if (needLevel) { Object idObj1 = map.get("fyyse"); @@ -1459,8 +1461,6 @@ public class AntenatalExaminationFacade { if (patients != null) { HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true); - int score = 0; - int index = -1; highRisk = highScoreResult.getHighRisk(); if (CollectionUtils.isNotEmpty(highRisk)) { @@ -1469,35 +1469,19 @@ public class AntenatalExaminationFacade { Map risk = (Map)highRisk.get(i); if (risk != null && risk.size() > 0) { - Object codeObj = risk.get("code"); Object idObj = risk.get("id"); - if (codeObj != null) - { - Integer code = Integer.valueOf(codeObj.toString()); - score += code; - } - if (idObj == null || "".equals(idObj.toString())) { risk.put("color",risk.get("oRiskId")); risk.remove("oRiskId"); - index = i; + + risk.put("code", risk.get("pfId")); + risk.remove("pfId"); } } } } - - if (index > -1) - { - Integer otherScore = 0; - if (highScoreResult.getScore() != null) - { - otherScore = highScoreResult.getScore() - score; - } - Map risk = (Map)highRisk.get(index); - risk.put("code",otherScore); - } } return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); -- 1.8.3.1