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 8380142..bcd1725 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 @@ -521,6 +521,12 @@ public class ApplyOrderFacade { applyOrderResult.setApplyDoctor(users.getName()); } } + if (NumberUtils.isNumber(orderModel.getRecDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getRecDoctor())); + if (null != users) { + applyOrderResult.setRecDoctor(users.getName()); + } + } HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true); applyOrderResult.setrRisk(highScoreResult.gethighRiskStr()); applyOrderResult.setScore(highScoreResult.getScore()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 2c67433..f3cdee1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -49,6 +49,8 @@ public class ApplyOrderOutResult { private String applyDoctor; //接收日期 private String received; + //接收医生 + private String recDoctor; private String cardNo; //联系方式 private String phone; @@ -112,6 +114,14 @@ public class ApplyOrderOutResult { return cardNo; } + public String getRecDoctor() { + return recDoctor; + } + + public void setRecDoctor(String recDoctor) { + this.recDoctor = recDoctor; + } + public void setCardNo(String cardNo) { this.cardNo = cardNo; } @@ -313,6 +323,9 @@ public class ApplyOrderOutResult { if(null!=destModel.getDueWeek()){ setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); } + if(null!=destModel.getReceived()){ + setReceived(DateUtil.getyyyy_MM_dd(destModel.getReceived())); + } setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setApplyDoctor(destModel.getApplyDoctor()); setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated()));