Commit 2995b3bb443971758e083d65175a5346f1cdf940
1 parent
13015a7f71
Exists in
master
and in
1 other branch
修改新电子病历
Showing 3 changed files with 12 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
2995b3b
| ... | ... | @@ -407,7 +407,7 @@ |
| 407 | 407 | } |
| 408 | 408 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); |
| 409 | 409 | quanPatientsResult.setcTime(nextCheckTime); |
| 410 | - quanPatientsResult.setrLevel(highScoreResult.getLevelStr()); | |
| 410 | + quanPatientsResult.setrLevel(highScoreResult.getLevel()); | |
| 411 | 411 | data.add(quanPatientsResult); |
| 412 | 412 | } |
| 413 | 413 | return data; |
| ... | ... | @@ -482,7 +482,7 @@ |
| 482 | 482 | } |
| 483 | 483 | riskPatientsResult.setcTime(nextCheckTime); |
| 484 | 484 | riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); |
| 485 | - riskPatientsResult.setrLevel(highScoreResult.getLevelStr()); | |
| 485 | + riskPatientsResult.setrLevel(highScoreResult.getLevel()); | |
| 486 | 486 | riskPatientsResult.sethScore(highScoreResult.getScore()); |
| 487 | 487 | data.add(riskPatientsResult); |
| 488 | 488 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
View file @
2995b3b
| ... | ... | @@ -8,6 +8,8 @@ |
| 8 | 8 | import com.lyms.platform.pojo.Patients; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | +import java.util.List; | |
| 12 | +import java.util.Map; | |
| 11 | 13 | |
| 12 | 14 | /** |
| 13 | 15 | * 全部孕妇管理 |
| ... | ... | @@ -24,7 +26,7 @@ |
| 24 | 26 | //孕周 |
| 25 | 27 | private String dueWeek; |
| 26 | 28 | //风险等级 |
| 27 | - private String rLevel; | |
| 29 | + private List<Map> rLevel; | |
| 28 | 30 | |
| 29 | 31 | //产检次数 |
| 30 | 32 | private int cTimes; |
| 31 | 33 | |
| ... | ... | @@ -162,14 +164,11 @@ |
| 162 | 164 | this.phone = phone; |
| 163 | 165 | } |
| 164 | 166 | |
| 165 | - public String getrLevel() { | |
| 166 | - if(org.apache.commons.lang.StringUtils.isEmpty(rLevel)){ | |
| 167 | - return SPIT; | |
| 168 | - } | |
| 167 | + public List<Map> getrLevel() { | |
| 169 | 168 | return rLevel; |
| 170 | 169 | } |
| 171 | 170 | |
| 172 | - public void setrLevel(String rLevel) { | |
| 171 | + public void setrLevel(List<Map> rLevel) { | |
| 173 | 172 | this.rLevel = rLevel; |
| 174 | 173 | } |
| 175 | 174 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
View file @
2995b3b
| ... | ... | @@ -11,6 +11,8 @@ |
| 11 | 11 | import com.lyms.platform.pojo.PuerperaModel; |
| 12 | 12 | |
| 13 | 13 | import java.util.Date; |
| 14 | +import java.util.List; | |
| 15 | +import java.util.Map; | |
| 14 | 16 | |
| 15 | 17 | /** |
| 16 | 18 | * 高危孕妇管理查询 |
| ... | ... | @@ -29,7 +31,7 @@ |
| 29 | 31 | //孕周 |
| 30 | 32 | private String dueWeek; |
| 31 | 33 | //风险等级 |
| 32 | - private String rLevel; | |
| 34 | + private List<Map> rLevel; | |
| 33 | 35 | //风险因素 |
| 34 | 36 | private String rFactor; |
| 35 | 37 | //高危评分 |
| 36 | 38 | |
| ... | ... | @@ -149,14 +151,11 @@ |
| 149 | 151 | this.rFactor = rFactor; |
| 150 | 152 | } |
| 151 | 153 | |
| 152 | - public String getrLevel() { | |
| 153 | - if(org.apache.commons.lang.StringUtils.isEmpty(rLevel)){ | |
| 154 | - return SPIT; | |
| 155 | - } | |
| 154 | + public List<Map> getrLevel() { | |
| 156 | 155 | return rLevel; |
| 157 | 156 | } |
| 158 | 157 | |
| 159 | - public void setrLevel(String rLevel) { | |
| 158 | + public void setrLevel(List<Map> rLevel) { | |
| 160 | 159 | this.rLevel = rLevel; |
| 161 | 160 | } |
| 162 | 161 | |
| ... | ... | @@ -208,7 +207,6 @@ |
| 208 | 207 | setId(destModel.getId()); |
| 209 | 208 | setName(destModel.getUsername()); |
| 210 | 209 | setAge(destModel.getAge()); |
| 211 | - setrLevel(destModel.getRiskLevelId()); | |
| 212 | 210 | // setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId())); |
| 213 | 211 | sethScore(destModel.getRiskScore()); |
| 214 | 212 | setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); |