Commit eee6ff867aa3fb31eb5374e68a43cde0009afc01
1 parent
1377bf0074
Exists in
dev
产妇转诊
Showing 1 changed file with 7 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
eee6ff8
| ... | ... | @@ -596,7 +596,12 @@ |
| 596 | 596 | screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment()); |
| 597 | 597 | screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated())); |
| 598 | 598 | screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); |
| 599 | - screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor()); | |
| 599 | + if(StringUtils.isNotEmpty(screeningModels.get(0).getApplyDoctor())){ | |
| 600 | + Users users = usersService.getUsers(NumberUtils.toInt(screeningModels.get(0).getApplyDoctor())); | |
| 601 | + if (null != users) { | |
| 602 | + screeningOutResult.setApplyDoctor(users.getName()); | |
| 603 | + } | |
| 604 | + } | |
| 600 | 605 | screeningOutResult.setId(screeningModels.get(0).getId()); |
| 601 | 606 | } |
| 602 | 607 | data.add(screeningOutResult); |
| ... | ... | @@ -645,6 +650,7 @@ |
| 645 | 650 | applyScreeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModel.getCreated())); |
| 646 | 651 | } |
| 647 | 652 | applyScreeningOutResult.setrRisk(screeningModel.getrRisk()); |
| 653 | + applyScreeningOutResult.setPhone(screeningModel.getPhone()); | |
| 648 | 654 | data.add(applyScreeningOutResult); |
| 649 | 655 | } |
| 650 | 656 |