Commit 40476326e30d8f81e5599bd0f0939a6ca3c58851
1 parent
17cbdbb8fb
Exists in
master
and in
8 other branches
修改新电子病历
Showing 2 changed files with 22 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
4047632
| ... | ... | @@ -415,7 +415,18 @@ |
| 415 | 415 | zhuanRname = zhuanc1.getName(); |
| 416 | 416 | } |
| 417 | 417 | } |
| 418 | - | |
| 418 | + if (NumberUtils.isNumber(applyOrderModel.getApplyDoctor())) { | |
| 419 | + Users users = usersService.getUsers(NumberUtils.toInt(applyOrderModel.getApplyDoctor())); | |
| 420 | + if (null != users) { | |
| 421 | + babyApplyOrderResult.setApplyDoctor(users.getName()); | |
| 422 | + } | |
| 423 | + } | |
| 424 | + if (NumberUtils.isNumber(applyOrderModel.getRecDoctor())) { | |
| 425 | + Users users = usersService.getUsers(NumberUtils.toInt(applyOrderModel.getRecDoctor())); | |
| 426 | + if (null != users) { | |
| 427 | + babyApplyOrderResult.setRecDoctor(users.getName()); | |
| 428 | + } | |
| 429 | + } | |
| 419 | 430 | babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); |
| 420 | 431 | List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); |
| 421 | 432 | String diagnose = ""; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
View file @
4047632
| ... | ... | @@ -44,6 +44,8 @@ |
| 44 | 44 | private String potentialRisk; |
| 45 | 45 | //申请医生 |
| 46 | 46 | private String applyDoctor; |
| 47 | + //接收医生 | |
| 48 | + private String recDoctor; | |
| 47 | 49 | //接收日期 |
| 48 | 50 | private String received; |
| 49 | 51 | private String phone; |
| ... | ... | @@ -54,6 +56,14 @@ |
| 54 | 56 | //转入医院 |
| 55 | 57 | private String zhuanRname; |
| 56 | 58 | private String status; |
| 59 | + | |
| 60 | + public String getRecDoctor() { | |
| 61 | + return recDoctor; | |
| 62 | + } | |
| 63 | + | |
| 64 | + public void setRecDoctor(String recDoctor) { | |
| 65 | + this.recDoctor = recDoctor; | |
| 66 | + } | |
| 57 | 67 | |
| 58 | 68 | public String getPid() { |
| 59 | 69 | return pid; |