From 13cc61509aef533b4e7fca1740f8396f36546a51 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 23 Aug 2016 19:45:54 +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/MatDeliverFacade.java | 14 ++++++++++++++
 .../platform/operate/web/result/MaternalDeliverResult.java |  7 +++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index ff0fdc8..4b9c79d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -19,6 +19,7 @@ import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -537,7 +538,20 @@ public class MatDeliverFacade {
                 babyList.add(maternalDeliverResult.new Baby(baby));
             }
         }
+        Map<String,String> map1  =new HashMap<>();
+        String fmHospital=deliverModel.getFmHospital();
+
+        map1.put("id","-1");
+        map1.put("name",fmHospital);
+        if(NumberUtils.isNumber(fmHospital)){
+            Organization organization=  organizationService.getOrganization(Integer.valueOf(fmHospital));
+            if(null!=organization){
+                map1.put("id",organization.getId()+"");
+                map1.put("name",organization.getName());
+            }
+        }
 
+        maternalDeliverResult.setFmHospital(map1);
         maternalDeliverResult.setBabies(babyList);
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(maternalDeliverResult);
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index 4339bfb..da76280 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -73,7 +73,7 @@ public class MaternalDeliverResult  {
 
     private List<Baby> babies;
     //分娩医院
-    private String fmHospital;
+    private Map<String,String> fmHospital;
     //接生医生
     private Map<String,String> deliverDoctor;
 
@@ -107,7 +107,6 @@ public class MaternalDeliverResult  {
         setLoseBloodCause(JsonUtil.jkstr2Obj(destModel.getLoseBloodCause(), Map.class));
         setOcs(JsonUtil.str2Obj(destModel.getOcs(), Map.class));
         setExtPlacentas(destModel.getExtPlacentas());
-        setFmHospital(destModel.getFmHospital());
 
 
         return this;
@@ -360,11 +359,11 @@ public class MaternalDeliverResult  {
         this.dueWeek = dueWeek;
     }
 
-    public String getFmHospital() {
+    public Map<String, String> getFmHospital() {
         return fmHospital;
     }
 
-    public void setFmHospital(String fmHospital) {
+    public void setFmHospital(Map<String, String> fmHospital) {
         this.fmHospital = fmHospital;
     }
 
-- 
1.8.3.1