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 cfc0657..76c16c9 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
@@ -1,9 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.biz.service.BabyService;
-import com.lyms.platform.biz.service.CommunityConfigService;
-import com.lyms.platform.biz.service.PatientsService;
-import com.lyms.platform.biz.service.PuerperaService;
+import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
@@ -12,6 +9,7 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.BabyManagerQueryRequest;
 import com.lyms.platform.operate.web.request.BabyManagerUpdateRequest;
 import com.lyms.platform.operate.web.result.BabyResult;
+import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.CommunityConfig;
 import com.lyms.platform.pojo.Patients;
@@ -41,6 +39,8 @@ public class BabyManagerFacade {
     private BabyService babyService;
     @Autowired
     private VisitFacade visitFacade;
+    @Autowired
+    private BasicConfigService basicConfigService;
 
     /**
      * 根据条件查询符合条件的新生儿
@@ -190,7 +190,7 @@ public class BabyManagerFacade {
                 addr = "";
             }
         }*/
-        babyResult.setAddress(patients.getAddress());
+        babyResult.setAddress(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService));
 
         babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId);
         String comm = "未分配";
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 fb3eb20..4f91272 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
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.facade;
 
 import com.lyms.platform.biz.service.BabyService;
+import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.CommunityConfigService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
@@ -13,6 +14,7 @@ import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
 import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest;
 import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest;
 import com.lyms.platform.operate.web.result.PuerperaResult;
+import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.CommunityConfig;
 import com.lyms.platform.pojo.Patients;
@@ -41,7 +43,8 @@ public class PatientFacade {
     private VisitFacade visitFacade;
     @Autowired
     private BabyService babyService;
-
+@Autowired
+    private BasicConfigService basicConfigService;
 
     /**
      * 修改产妇的社区
@@ -142,6 +145,7 @@ 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));
             }
         }
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 cc8c54a..a643df0 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
@@ -127,7 +127,7 @@ public class PuerperaResult {
         return this;
     }
 
-    public PuerperaResult convertToResult(Patients model,String  comm,String tips) {
+    public PuerperaResult convertToResult(Patients model,String  comm,String tips,String addr) {
        /* String addr = "";
         if (StringUtils.isNotEmpty(model.getAddress())) {
             try {
@@ -137,7 +137,7 @@ public class PuerperaResult {
                 addr = "";
             }
         }*/
-        setAddress(model.getAddress());
+        setAddress(addr);
         setId(model.getId());
         setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
         setVisit(tips);