From 48002178c7660cf0d11a04597057b8fcaefe76c0 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 18 Aug 2016 10:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=BB=BA=E6=A1=A3=E5=A4=96?=
 =?UTF-8?q?=E9=99=A2=E5=8C=BB=E7=94=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/BookbuildingFacade.java     | 11 +++++++++++
 .../platform/operate/web/result/PregnantInfoResult.java     | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index f6ce266..fd0f467 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -611,6 +611,17 @@ public class BookbuildingFacade {
 			Patients p  = patients.get(0);
 			result  = getResult(p);
 		}
+		if (result != null && StringUtils.isNotEmpty(result.getBookbuildingDoctor()))
+		{
+			Organization org = organizationService.getOrganization(Integer.parseInt(result.getBookbuildingDoctor()));
+			if (org != null)
+			{
+				Map<String,String> doctorObj = new HashMap<>();
+				doctorObj.put("id",result.getBookbuildingDoctor());
+				doctorObj.put("name",org.getName());
+				result.setBuildDoctorObj(doctorObj);
+			}
+		}
 		BaseObjectResponse objectResponse = new BaseObjectResponse();
 		objectResponse.setData(result);
 		objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
index 6fed1e4..8ca44a7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
@@ -1,5 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
+import java.util.Map;
+
 /**
  * Created by Administrator on 2016/6/15.
  */
@@ -133,6 +135,17 @@ public class PregnantInfoResult {
     //分娩状态 0未终止妊娠 1终止妊娠
     private Integer dueStatus;
 
+    //建档医生对象
+    private Map<String,String> buildDoctorObj;
+
+    public Map<String, String> getBuildDoctorObj() {
+        return buildDoctorObj;
+    }
+
+    public void setBuildDoctorObj(Map<String, String> buildDoctorObj) {
+        this.buildDoctorObj = buildDoctorObj;
+    }
+
     public Integer getDueStatus() {
         return dueStatus;
     }
-- 
1.8.3.1