From d55924591cba3808252c8e2610700c795420e3bd Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 30 Jul 2018 11:44:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E7=AD=89=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 119 ++++++++++++++------- 1 file changed, 78 insertions(+), 41 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9292fb8..4cb800e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4950,9 +4950,10 @@ public class ViewFacade { //处理高危因素 getRisk(an.getHighrisk(), an.getOtherHighRisk(), map); - Element scoreElement = checkElement.addElement("score"); - scoreElement.addText(String.valueOf(map.get("score"))); + //完善筛查结果 + getscreenResult(an.getScreenResult(), map); + handleEle(map, checkElement, patients, an.getResultSupple(), an.getHighriskDesc()); List riskList = (List)map.get("highRisk"); if (CollectionUtils.isNotEmpty(riskList)) @@ -5046,46 +5047,10 @@ public class ViewFacade { //处理高危因素 getRisk(ae.getRiskFactor(), ae.getOtherRisk(), map); - Element scoreElement = checkElement.addElement("score"); - scoreElement.addText(String.valueOf(map.get("score"))); + //完善筛查结果 + getscreenResult(ae.getScreenResult(), map); + handleEle( map, checkElement, patients, ae.getResultSupple(), ae.getHighriskDesc()); - List riskList = (List)map.get("highRisk"); - if (CollectionUtils.isNotEmpty(riskList)) - { - for (int i = 0 ;i < riskList.size() ; i++) - { - Map rmap = (Map) riskList.get(i); - String color = rmap.get("color"); - if ("risk_green".equals(color)) - { - color = "绿色"; - } - else if ("risk_orange".equals(color)) - { - color = "橙色"; - } - else if ("risk_yellow".equals(color)) - { - color = "黄色"; - } - else if ("risk_red".equals(color)) - { - color = "红色"; - } - else if ("risk_purple".equals(color)) - { - color = "紫色"; - } - Element riskFactorElement = checkElement.addElement("riskFactor"); - - String name = rmap.get("name"); - Element nElement = riskFactorElement.addElement("riskName"); - nElement.addText(name); - - Element colorElement = riskFactorElement.addElement("color"); - colorElement.addText(color); - } - } } } } @@ -5095,4 +5060,76 @@ public class ViewFacade { } } + + + private void handleEle(Map map,Element checkElement,Patients patients,String resultSupple,String highriskDesc) + { + + Element scoreElement = checkElement.addElement("score"); + scoreElement.addText(String.valueOf(map.get("score"))); + + List screens = (List)map.get("screenResult"); + Element screenlement = checkElement.addElement("screen"); + if (CollectionUtils.isNotEmpty(screens)) + { + + for (int i = 0 ;i < screens.size() ; i++) { + Map rmap = (Map) screens.get(i); + String screenName = rmap.get("name"); + Element nElement = screenlement.addElement("screenName"); + nElement.addText(screenName); + } + } + + Element resultSuppleElement = checkElement.addElement("resultSupple"); + resultSuppleElement.addText(resultSupple == null ? "" : resultSupple); + + + Element highriskDescElement = checkElement.addElement("highriskDesc"); + highriskDescElement.addText(highriskDesc); + + + Element sieveStatuslement = checkElement.addElement("sieveStatus"); + String siveStatus = sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId()); + sieveStatuslement.addText(siveStatus == null ? "" : siveStatus); + + + List riskList = (List)map.get("highRisk"); + if (CollectionUtils.isNotEmpty(riskList)) + { + for (int i = 0 ;i < riskList.size() ; i++) + { + Map rmap = (Map) riskList.get(i); + String color = rmap.get("color"); + if ("risk_green".equals(color)) + { + color = "绿色"; + } + else if ("risk_orange".equals(color)) + { + color = "橙色"; + } + else if ("risk_yellow".equals(color)) + { + color = "黄色"; + } + else if ("risk_red".equals(color)) + { + color = "红色"; + } + else if ("risk_purple".equals(color)) + { + color = "紫色"; + } + Element riskFactorElement = checkElement.addElement("riskFactor"); + + String name = rmap.get("name"); + Element nElement = riskFactorElement.addElement("riskName"); + nElement.addText(name); + + Element colorElement = riskFactorElement.addElement("color"); + colorElement.addText(color); + } + } + } } -- 1.8.3.1