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 4cb800e..86e4647 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 @@ -4955,43 +4955,6 @@ public class ViewFacade { handleEle(map, checkElement, patients, an.getResultSupple(), an.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); - } - } } @@ -5058,7 +5021,6 @@ public class ViewFacade { } catch (Exception e) { return document.asXML(); } - } @@ -5086,7 +5048,7 @@ public class ViewFacade { Element highriskDescElement = checkElement.addElement("highriskDesc"); - highriskDescElement.addText(highriskDesc); + highriskDescElement.addText(highriskDesc == null ? "" : highriskDesc); Element sieveStatuslement = checkElement.addElement("sieveStatus");