From 40476326e30d8f81e5599bd0f0939a6ca3c58851 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 26 Aug 2016 14:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/ApplyOrderFacade.java  | 13 ++++++++++++-
 .../platform/operate/web/result/BabyApplyOrderResult.java   | 10 ++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

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<String> 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;
     }
-- 
1.8.3.1