Commit 13015a7f71ef05eb9674532a5851b5bc8811414f
1 parent
c107a80d90
Exists in
master
and in
1 other branch
修改新电子病历
Showing 2 changed files with 5 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
13015a7
| ... | ... | @@ -639,7 +639,7 @@ |
| 639 | 639 | applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); |
| 640 | 640 | applyOrderResult.setrRisk(stringBuilder.toString()); |
| 641 | 641 | applyOrderResult.setScore(orderModel.getScore()); |
| 642 | - applyOrderResult.setrLevel(highScoreResult.getLevelStr()); | |
| 642 | + applyOrderResult.setrLevel(highScoreResult.getLevel()); | |
| 643 | 643 | Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); |
| 644 | 644 | if (null != patients) { |
| 645 | 645 | if (1 == patients.getDueStatus()) |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
View file @
13015a7
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | import java.util.ArrayList; |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | import java.util.List; |
| 13 | +import java.util.Map; | |
| 13 | 14 | |
| 14 | 15 | /** |
| 15 | 16 | * 高危转诊(转出) |
| ... | ... | @@ -32,7 +33,7 @@ |
| 32 | 33 | //预产期 |
| 33 | 34 | private String dueDate; |
| 34 | 35 | //高危等级 |
| 35 | - private String rLevel; | |
| 36 | + private List<java.util.Map> rLevel; | |
| 36 | 37 | //风险因素 |
| 37 | 38 | private String rRisk; |
| 38 | 39 | |
| 39 | 40 | |
| ... | ... | @@ -268,14 +269,11 @@ |
| 268 | 269 | this.received = received; |
| 269 | 270 | } |
| 270 | 271 | |
| 271 | - public String getrLevel() { | |
| 272 | - if(StringUtils.isEmpty(rLevel)){ | |
| 273 | - return SPIT; | |
| 274 | - } | |
| 272 | + public List<Map> getrLevel() { | |
| 275 | 273 | return rLevel; |
| 276 | 274 | } |
| 277 | 275 | |
| 278 | - public void setrLevel(String rLevel) { | |
| 276 | + public void setrLevel(List<Map> rLevel) { | |
| 279 | 277 | this.rLevel = rLevel; |
| 280 | 278 | } |
| 281 | 279 |