Commit fd8a89e66dc24d548cb27d6d14137ac42b683794
1 parent
c3b20889e3
Exists in
master
and in
1 other branch
听力诊断模块
Showing 2 changed files with 21 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
View file @
fd8a89e
| 1 | 1 | package com.lyms.platform.operate.web.controller; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSONObject; | |
| 3 | 4 | import com.lyms.platform.biz.service.BabyBookbuildingService; |
| 4 | 5 | import com.lyms.platform.biz.service.BabyService; |
| 5 | 6 | import com.lyms.platform.common.annotation.TokenRequired; |
| 6 | 7 | |
| 7 | 8 | |
| 8 | 9 | |
| ... | ... | @@ -125,13 +126,18 @@ |
| 125 | 126 | if (followUp.getMarkResult() != null) { |
| 126 | 127 | String cr[] = followUp.getMarkResult().split(","); |
| 127 | 128 | StringBuffer mrSb = new StringBuffer(); |
| 129 | + List highArr = new ArrayList(); | |
| 128 | 130 | for (int b = 0; b < cr.length; b++) { |
| 129 | 131 | if (StringUtils.isNotEmpty(cr[b])) { |
| 130 | - Map<Integer, String> map = new HashMap<>(); | |
| 131 | 132 | String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); |
| 132 | 133 | mrSb.append(title+"、"); |
| 134 | + JSONObject confiJo = new JSONObject(); | |
| 135 | + confiJo.put("id", cr[b]); | |
| 136 | + confiJo.put("name", title); | |
| 137 | + highArr.add(confiJo); | |
| 133 | 138 | } |
| 134 | 139 | } |
| 140 | + fuResult.setMarkResults(highArr); | |
| 135 | 141 | String hfString = null; |
| 136 | 142 | if (mrSb.toString().endsWith("、")) { |
| 137 | 143 | hfString = mrSb.substring(0, mrSb.length() - 1); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java
View file @
fd8a89e
| 1 | 1 | package com.lyms.platform.operate.web.result; |
| 2 | 2 | |
| 3 | +import java.util.List; | |
| 4 | + | |
| 3 | 5 | /** |
| 4 | 6 | * @auther yangfei |
| 5 | 7 | * @createTime 2017年05月25日 09时29分 |
| ... | ... | @@ -35,6 +37,10 @@ |
| 35 | 37 | */ |
| 36 | 38 | private String markResultStr; |
| 37 | 39 | /** |
| 40 | + * 确诊结果 | |
| 41 | + */ | |
| 42 | + private List markResults; | |
| 43 | + /** | |
| 38 | 44 | * 确诊详情 |
| 39 | 45 | */ |
| 40 | 46 | private String markDetail; |
| ... | ... | @@ -133,6 +139,14 @@ |
| 133 | 139 | |
| 134 | 140 | public void setAudiphoneStr(String audiphoneStr) { |
| 135 | 141 | this.audiphoneStr = audiphoneStr; |
| 142 | + } | |
| 143 | + | |
| 144 | + public List getMarkResults() { | |
| 145 | + return markResults; | |
| 146 | + } | |
| 147 | + | |
| 148 | + public void setMarkResults(List markResults) { | |
| 149 | + this.markResults = markResults; | |
| 136 | 150 | } |
| 137 | 151 | |
| 138 | 152 | public String getInterStrate() { |