From cb592d89faa9b3565a3060d3b42cd15e7abe4669 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 5 May 2016 15:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0addr=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/BabyManagerFacade.java |  4 ++--
 .../com/lyms/platform/operate/web/result/BabyResult.java    | 10 ++++++++++
 .../lyms/platform/operate/web/result/PuerperaResult.java    | 13 ++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
index 762885c..63d223f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
@@ -194,8 +194,8 @@ public class BabyManagerFacade {
                 addr = "";
             }
         }*/
-        babyResult.setAddress(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService));
-
+        babyResult.setAddress(patients.getAddress());
+        babyResult.setFullAddr(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService));
         babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId);
         String comm = "未分配";
         if(StringUtils.isNotEmpty(patients.getCommunityId())){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java
index 5136230..8d4a6e1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java
@@ -35,6 +35,16 @@ public class BabyResult {
 
     private String address;
 
+    public String getFullAddr() {
+        return fullAddr;
+    }
+
+    public void setFullAddr(String fullAddr) {
+        this.fullAddr = fullAddr;
+    }
+
+    private String fullAddr;
+
     private String community;
     private String
             communityId;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
index a643df0..2b49714 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
@@ -28,6 +28,16 @@ public class PuerperaResult {
 
     private String communityId;
 
+    public String getFullAddr() {
+        return fullAddr;
+    }
+
+    public void setFullAddr(String fullAddr) {
+        this.fullAddr = fullAddr;
+    }
+
+    private String fullAddr;
+
     public String getCommunityId() {
         return communityId;
     }
@@ -137,7 +147,8 @@ public class PuerperaResult {
                 addr = "";
             }
         }*/
-        setAddress(addr);
+        setFullAddr(addr);
+        setAddress(model.getAddress());
         setId(model.getId());
         setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
         setVisit(tips);
-- 
1.8.3.1