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

---
 .../operate/web/facade/BabyBookbuildingFacade.java       | 12 ++++++++++++
 .../platform/operate/web/facade/BabyCheckFacade.java     | 16 ++++++++++++++++
 .../platform/operate/web/result/BabyBuildResult.java     | 10 ++++++++++
 .../platform/operate/web/result/BabyCheckResult.java     |  9 +++++++++
 4 files changed, 47 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 3a18d70..02630a3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -686,6 +686,18 @@ public class BabyBookbuildingFacade {
             result = getBabyBuildResult(model);
 
         }
+
+        if (result != null && StringUtils.isNotEmpty(result.getBuildDoctor()))
+        {
+            Organization org = organizationService.getOrganization(Integer.parseInt(result.getBuildDoctor()));
+            if (org != null)
+            {
+                Map<String,String> doctorObj = new HashMap<>();
+                doctorObj.put("id",result.getBuildDoctor());
+                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/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index e372851..19661fc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -12,7 +12,9 @@ import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.common.utils.SystemConfig;
 import com.lyms.platform.operate.web.request.BabyCheckRequest;
 import com.lyms.platform.operate.web.result.*;
+import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
@@ -50,6 +52,9 @@ public class BabyCheckFacade {
 
 
     @Autowired
+    private OrganizationService organizationService;
+
+    @Autowired
     private AntenatalExaminationFacade antenatalExaminationFacade;
     /**
      * 更新检查
@@ -545,6 +550,17 @@ public class BabyCheckFacade {
                 result = getBabyCheckResult(checkModel);
 
             }
+            if (result != null && StringUtils.isNotEmpty(result.getCheckDoctor()))
+            {
+                Organization org = organizationService.getOrganization(Integer.parseInt(result.getCheckDoctor()));
+                if (org != null)
+                {
+                    Map<String,String> doctorObj = new HashMap<>();
+                    doctorObj.put("id",result.getCheckDoctor());
+                    doctorObj.put("name",org.getName());
+                    result.setCheckDoctorObj(doctorObj);
+                }
+            }
         }
 
         br.setData(result);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
index d39484e..e00d8e1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
@@ -130,6 +130,16 @@ public class BabyBuildResult {
     //体验类型
     private Integer expType;
 
+    private Map<String,String> buildDoctorObj;
+
+    public Map<String, String> getBuildDoctorObj() {
+        return buildDoctorObj;
+    }
+
+    public void setBuildDoctorObj(Map<String, String> buildDoctorObj) {
+        this.buildDoctorObj = buildDoctorObj;
+    }
+
     public Integer getExpType() {
         return expType;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
index f08f1d5..6d32935 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
@@ -209,6 +209,15 @@ public class BabyCheckResult {
     private String checkDate;
     private String monthAge;
 
+    private Map<String,String> checkDoctorObj;
+
+    public Map<String, String> getCheckDoctorObj() {
+        return checkDoctorObj;
+    }
+
+    public void setCheckDoctorObj(Map<String, String> checkDoctorObj) {
+        this.checkDoctorObj = checkDoctorObj;
+    }
 
     public String getMonthAge() {
         return monthAge;
-- 
1.8.3.1