Commit 6f7ddcb14a6ba8de79c1627a5a49ca696e615819
1 parent
f3b568ef22
Exists in
master
and in
6 other branches
儿童检查月龄
Showing 1 changed file with 14 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
6f7ddcb
| ... | ... | @@ -5044,13 +5044,13 @@ |
| 5044 | 5044 | |
| 5045 | 5045 | if (CollectionUtils.isNotEmpty(screens)) |
| 5046 | 5046 | { |
| 5047 | - | |
| 5047 | + String screenName = ""; | |
| 5048 | 5048 | for (int i = 0 ;i < screens.size() ; i++) { |
| 5049 | 5049 | Map<String, String> rmap = (Map<String, String>) screens.get(i); |
| 5050 | - String screenName = rmap.get("name"); | |
| 5051 | - Element nElement = checkElement.addElement("screenName"); | |
| 5052 | - nElement.addText(screenName); | |
| 5050 | + screenName+=rmap.get("name") + (i == screens.size() - 1 ? "": ","); | |
| 5053 | 5051 | } |
| 5052 | + Element nElement = checkElement.addElement("screenName"); | |
| 5053 | + nElement.addText(screenName); | |
| 5054 | 5054 | } |
| 5055 | 5055 | |
| 5056 | 5056 | Element resultSuppleElement = checkElement.addElement("resultSupple"); |
| ... | ... | @@ -5069,6 +5069,9 @@ |
| 5069 | 5069 | List riskList = (List)map.get("highRisk"); |
| 5070 | 5070 | if (CollectionUtils.isNotEmpty(riskList)) |
| 5071 | 5071 | { |
| 5072 | + String name = ""; | |
| 5073 | + String riskColor = ""; | |
| 5074 | + | |
| 5072 | 5075 | for (int i = 0 ;i < riskList.size() ; i++) |
| 5073 | 5076 | { |
| 5074 | 5077 | Map<String, String> rmap = (Map<String, String>) riskList.get(i); |
| 5075 | 5078 | |
| 5076 | 5079 | |
| ... | ... | @@ -5093,15 +5096,15 @@ |
| 5093 | 5096 | { |
| 5094 | 5097 | color = "紫色"; |
| 5095 | 5098 | } |
| 5096 | - //Element riskFactorElement = checkElement.addElement("riskFactor"); | |
| 5099 | + riskColor+=color + (i == screens.size() - 1 ? "": ",");; | |
| 5100 | + name+=rmap.get("name")+ (i == screens.size() - 1 ? "": ","); | |
| 5101 | + } | |
| 5097 | 5102 | |
| 5098 | - String name = rmap.get("name"); | |
| 5099 | - Element nElement = checkElement.addElement("riskName"); | |
| 5100 | - nElement.addText(name); | |
| 5103 | + Element nElement = checkElement.addElement("riskName"); | |
| 5104 | + nElement.addText(name); | |
| 5101 | 5105 | |
| 5102 | - Element colorElement = checkElement.addElement("color"); | |
| 5103 | - colorElement.addText(color); | |
| 5104 | - } | |
| 5106 | + Element colorElement = checkElement.addElement("color"); | |
| 5107 | + colorElement.addText(riskColor); | |
| 5105 | 5108 | } |
| 5106 | 5109 | } |
| 5107 | 5110 | } |