From 9c1e707657179dbb8120f04171f94cb0f324c05f Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 7 Jun 2016 10:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=90=8E=E4=BF=AE?=
 =?UTF-8?q?=E5=85=BB=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientFacade.java |  3 ++-
 .../operate/web/result/PuerperaResult.java         | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 243a43b..5abb0e4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -152,7 +152,8 @@ public class PatientFacade {
                 }
                 String tips = visitFacade.getFindTips(model.getId(),Boolean.TRUE);
                 String addr=  CommonsHelper.getFullAddress(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getAddress(), basicConfigService);
-                data.add(result.convertToResult(model, comm, tips,addr));
+                String restAddr=CommonsHelper.getFullAddress(model.getProvincePostRestId(), model.getCityPostRestId(), model.getAreaPostRestId(), model.getAddressPostRest(), basicConfigService);
+                data.add(result.convertToResult(model, comm, tips,addr,restAddr));
             }
         }
 
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 fdeaf4e..34081a1 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
@@ -38,6 +38,15 @@ public class PuerperaResult {
     }
 
     private String fullAddr;
+    private String restFullAddr;
+
+    public String getRestFullAddr() {
+        return restFullAddr;
+    }
+
+    public void setRestFullAddr(String restFullAddr) {
+        this.restFullAddr = restFullAddr;
+    }
 
     public String getCommunityId() {
         return communityId;
@@ -138,16 +147,9 @@ public class PuerperaResult {
         return this;
     }
 
-    public PuerperaResult convertToResult(Patients model,String  comm,String tips,String addr) {
-       /* String addr = "";
-        if (StringUtils.isNotEmpty(model.getAddress())) {
-            try {
-                Map map = JsonUtil.str2Obj(model.getAddress(), Map.class);
-                addr = map.get("d").toString();
-            } catch (Exception e) {
-                addr = "";
-            }
-        }*/
+    public PuerperaResult convertToResult(Patients model,String  comm,String tips,String addr,String restFullAddr) {
+
+        setRestFullAddr(restFullAddr);
         setFullAddr(addr);
         setAddress(model.getAddress());
         setId(model.getId());
-- 
1.8.3.1