From 6474741823eca3ff2dd7b0b2286132d214d153f2 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 3 Aug 2020 12:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A1=E6=B0=B4=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/worker/MaterDeliverWorker.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index 3d7fbe3..66a8070 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -105,18 +105,22 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                 childbirthManagerQueryModel.setPatientId(patients.getId());
                 // 居住地
                 if (initQuery.contains("address")) {
-                    childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
+
+                    String liveAddress =  CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
+                            patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
+
+                    childbirthManagerQueryModel.setAddress(liveAddress);
                 }
                 //产后修养地址
                 if (initQuery.contains("postAddress")) {
-                    childbirthManagerQueryModel.setPostAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(),
-                            patients.getCityPostRestId(), patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService));
+                    childbirthManagerQueryModel.setPostAddress( CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(),
+                            patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService));
                 }
 
                 // 户籍地址
                 if (initQuery.contains("registerAddress")) {
-                    childbirthManagerQueryModel.setPostAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(),
-                            patients.getStreetId(), patients.getAddress(), basicConfigService));
+                    childbirthManagerQueryModel.setRegisterAddress( CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
+                            patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
                 }
 
                 //带*
-- 
1.8.3.1