diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index a9da5c3..48136d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -415,7 +415,18 @@ public class ApplyOrderFacade { zhuanRname = zhuanc1.getName(); } } - + if (NumberUtils.isNumber(applyOrderModel.getApplyDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(applyOrderModel.getApplyDoctor())); + if (null != users) { + babyApplyOrderResult.setApplyDoctor(users.getName()); + } + } + if (NumberUtils.isNumber(applyOrderModel.getRecDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(applyOrderModel.getRecDoctor())); + if (null != users) { + babyApplyOrderResult.setRecDoctor(users.getName()); + } + } babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); String diagnose = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java index 24c77b8..1acea81 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java @@ -44,6 +44,8 @@ public class BabyApplyOrderResult { private String potentialRisk; //申请医生 private String applyDoctor; + //接收医生 + private String recDoctor; //接收日期 private String received; private String phone; @@ -55,6 +57,14 @@ public class BabyApplyOrderResult { private String zhuanRname; private String status; + public String getRecDoctor() { + return recDoctor; + } + + public void setRecDoctor(String recDoctor) { + this.recDoctor = recDoctor; + } + public String getPid() { return pid; }