diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
index 2242821..c88bbc6 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
@@ -47,7 +47,7 @@ public class AddressUtil {
     }
 
     public static void main(String[] ages) {
-        List<String> addrs = AddressUtil.getAddress("山东省荣成市曙光东区26号207室");
+        List<String> addrs = AddressUtil.getAddress("山东省荣成市曙光东县26号207室");
         for (String ad : addrs) {
             System.out.println(ad);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index badc2e6..75c198a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -489,8 +489,9 @@ public class MatDeliverController extends BaseController {
             header.put("babyHeight", "身长cm");
             header.put("babyWeight", "体重g");
             header.put("fmDate", "出生时间(具体到分)");
-            header.put("addressRegister", "产妇户籍地");
-            header.put("liveAddress", "居住地");
+
+            header.put("liveAddress", "产妇户籍地");
+            header.put("addressRegister", "居住地");
             header.put("postRest", "产后休养地址");
             header.put("riskLevel", "妊娠风险评估五色分级情况");
             header.put("risk", "妊娠期高危因素");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
index 5723fc4..0a736f2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
@@ -908,6 +908,7 @@ public class ViewController extends BaseController {
     }
 
 
+
     /**
      * 秦皇岛电子病历接口
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java
index 73a26db..4e728a5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java
@@ -15,22 +15,22 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- *
  * @Author dongqin
  * @Description 分娩导出
  * @Date 8:42 2019/5/24
  */
 
-public class MatDeliverWorker implements Runnable{
+public class MatDeliverWorker implements Runnable {
     private PatientsService patientsService;
     private ChildbirthManagerQueryModel queryModel;
     private BasicConfigService basicConfigService;
     private AntenatalExaminationFacade antenatalExaminationFacade;
     private List<Map<String, Object>> list;
     private AtomicInteger atomicInteger;
+
     public MatDeliverWorker(PatientsService patientsService, ChildbirthManagerQueryModel queryModel,
                             BasicConfigService basicConfigService, AntenatalExaminationFacade antenatalExaminationFacade,
-                            List<Map<String, Object>> list, AtomicInteger atomicInteger){
+                            List<Map<String, Object>> list, AtomicInteger atomicInteger) {
         this.patientsService = patientsService;
         this.queryModel = queryModel;
         this.basicConfigService = basicConfigService;
@@ -44,7 +44,7 @@ public class MatDeliverWorker implements Runnable{
     public void run() {
         try {
             setExcelDate();
-        }catch (Exception t){
+        } catch (Exception t) {
             t.fillInStackTrace();
         }
 
@@ -68,7 +68,8 @@ public class MatDeliverWorker implements Runnable{
         //居住地
         String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
                 patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService);
-        map.put("liveAddress", liveAddress);
+
+        map.put("regAddress", liveAddress);
         String regAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(),
                 patients.getCityRegisterId(),
                 patients.getAreaRegisterId(),
@@ -76,7 +77,7 @@ public class MatDeliverWorker implements Runnable{
                 patients.getAddressRegister(),
                 basicConfigService);
 
-        map.put("regAddress", regAddress);
+        map.put("liveAddress", regAddress);
         map.put("phone", queryModel.getPhone());
 
         if (null == queryModel.getGravidity()) {
@@ -258,16 +259,17 @@ public class MatDeliverWorker implements Runnable{
 
     /**
      * 获取 + 阳性/ - 阴性
+     *
      * @param amy
      * @param key
      * @return
      */
     private String getMyzdVal(Map<String, Object> amy, String key) {
         String str = "";
-        if (amy != null && amy.size() > 0){
+        if (amy != null && amy.size() > 0) {
             Object object = amy.get(key);
-            if (object != null){
-                if (object instanceof String){
+            if (object != null) {
+                if (object instanceof String) {
                     str = object.toString();
                 }
             }