Commit 5e6ab6efa3a70ea7bd993029b715c6fbd6204f3a
1 parent
d55924591c
Exists in
master
and in
6 other branches
高危等级查询
Showing 1 changed file with 1 additions and 39 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
5e6ab6e
... | ... | @@ -4955,44 +4955,7 @@ |
4955 | 4955 | |
4956 | 4956 | handleEle(map, checkElement, patients, an.getResultSupple(), an.getHighriskDesc()); |
4957 | 4957 | |
4958 | - List riskList = (List)map.get("highRisk"); | |
4959 | - if (CollectionUtils.isNotEmpty(riskList)) | |
4960 | - { | |
4961 | - for (int i = 0 ;i < riskList.size() ; i++) | |
4962 | - { | |
4963 | - Map<String, String> rmap = (Map<String, String>) riskList.get(i); | |
4964 | - String color = rmap.get("color"); | |
4965 | - if ("risk_green".equals(color)) | |
4966 | - { | |
4967 | - color = "绿色"; | |
4968 | - } | |
4969 | - else if ("risk_orange".equals(color)) | |
4970 | - { | |
4971 | - color = "橙色"; | |
4972 | - } | |
4973 | - else if ("risk_yellow".equals(color)) | |
4974 | - { | |
4975 | - color = "黄色"; | |
4976 | - } | |
4977 | - else if ("risk_red".equals(color)) | |
4978 | - { | |
4979 | - color = "红色"; | |
4980 | - } | |
4981 | - else if ("risk_purple".equals(color)) | |
4982 | - { | |
4983 | - color = "紫色"; | |
4984 | - } | |
4985 | - Element riskFactorElement = checkElement.addElement("riskFactor"); | |
4986 | 4958 | |
4987 | - String name = rmap.get("name"); | |
4988 | - Element nElement = riskFactorElement.addElement("riskName"); | |
4989 | - nElement.addText(name); | |
4990 | - | |
4991 | - Element colorElement = riskFactorElement.addElement("color"); | |
4992 | - colorElement.addText(color); | |
4993 | - } | |
4994 | - } | |
4995 | - | |
4996 | 4959 | } |
4997 | 4960 | |
4998 | 4961 | AntExQuery exQuery = new AntExQuery(); |
... | ... | @@ -5058,7 +5021,6 @@ |
5058 | 5021 | } catch (Exception e) { |
5059 | 5022 | return document.asXML(); |
5060 | 5023 | } |
5061 | - | |
5062 | 5024 | } |
5063 | 5025 | |
5064 | 5026 | |
... | ... | @@ -5086,7 +5048,7 @@ |
5086 | 5048 | |
5087 | 5049 | |
5088 | 5050 | Element highriskDescElement = checkElement.addElement("highriskDesc"); |
5089 | - highriskDescElement.addText(highriskDesc); | |
5051 | + highriskDescElement.addText(highriskDesc == null ? "" : highriskDesc); | |
5090 | 5052 | |
5091 | 5053 | |
5092 | 5054 | Element sieveStatuslement = checkElement.addElement("sieveStatus"); |