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 be13983..c43f024 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
@@ -29,12 +29,9 @@ import java.util.List;
 public class BabyManagerFacade {
 
     @Autowired
-    private PuerperaService puerperaService;
-    @Autowired
     private PatientsService patientsService;
     @Autowired
     private CommunityConfigService communityConfigService;
-
     @Autowired
     private BabyService babyService;
     @Autowired
@@ -52,34 +49,6 @@ public class BabyManagerFacade {
      */
     public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest,int userId) {
 
-        /*PatientsQuery patientsQuery =  new PatientsQuery();
-        patientsQuery.setType(2);
-        patientsQuery.setYn(YnEnums.YES.getId());
-        Date date = DateUtil.parseYMD(babyManagerRequest.getdEnd());
-        if (null != date) {
-            long d = date.getTime() + 86398000;
-            date = new Date(d);
-        }
-        patientsQuery.setBirthEnd(date);
-        patientsQuery.setBirthStart(DateUtil.parseYMD(babyManagerRequest.getdStart()));
-        patientsQuery.setPhone(babyManagerRequest.getPhone());
-        patientsQuery.setName(babyManagerRequest.getName());
-        patientsQuery.setVisitstatus(babyManagerRequest.getVisitstatus());
-        patientsQuery.setPage(babyManagerRequest.getPage());
-        patientsQuery.setLimit(babyManagerRequest.getLimit());
-        patientsQuery.setNeed("1");
-        if (StringUtils.isNotEmpty(babyManagerRequest.getKeyword())) {
-            patientsQuery.setKeyword(babyManagerRequest.getKeyword());
-        }
-        List<Patients> patientsList =  patientsService.queryPatient(patientsQuery);
-
-        List<BabyResult> data =new ArrayList<BabyResult>();
-
-        if(CollectionUtils.isNotEmpty(patientsList)){
-            for(Patients patients:patientsList){
-                data.add(buildResult(patients));
-            }
-        }*/
         Date date = DateUtil.parseYMD(babyManagerRequest.getdEnd());
         if (null != date) {
             long d = date.getTime() + 86398000;
@@ -96,7 +65,9 @@ public class BabyManagerFacade {
         babyQuery.setMname(babyManagerRequest.getName());
         babyQuery.setLimit(babyManagerRequest.getLimit());
         babyQuery.setYn(YnEnums.YES.getId());
+
         String areaid= autoMatchFacade.match(userId);
+
         if(StringUtils.isNotEmpty(areaid)){
             babyQuery.setAreaId(areaid);
         }
@@ -141,60 +112,19 @@ public class BabyManagerFacade {
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
+
     /**
-     * 构建放回的数据
+     * 构建返回的数据
      *
-     * @param baby
-     * @param puerModel
-     * @return
+     * @param patients
+     *
+     * @param communityId 社区id
+     *
+     * @return 新生儿访视
      */
-    public BabyResult buildResult(BabyModel baby, PuerperaModel puerModel) {
-        BabyResult babyResult = new BabyResult();
-
-        // 填充小孩信息
-        babyResult.convertToResult(baby);
-        babyResult.setMotherName(puerModel.getName());
-        babyResult.setMotherPhone(puerModel.getPhone());
-        // HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class);
-        // 需要将数据库中的json结构地址解析出来
-        HashMap<String, String> map = new HashMap<>();
-        map.put("address", "测试地址");
-        babyResult.setAddress(map.get("address").toString());
-        babyResult.setParentId(puerModel.getId());
-        // TODO 需要根据产妇模型上的社区id获取社区信息
-        babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId()) ? "" : puerModel.getCommunityId());
-        return babyResult;
-    }
-
-    public BabyResult buildResult(BabyModel baby, Patients puerModel) {
-        BabyResult babyResult = new BabyResult();
-
-        // 填充小孩信息
-        babyResult.convertToResult(baby);
-        babyResult.setMotherName(puerModel.getUsername());
-        babyResult.setMotherPhone(puerModel.getPhone());
-        // HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class);
-        // 需要将数据库中的json结构地址解析出来
-        HashMap<String, String> map = new HashMap<>();
-        map.put("address", "测试地址");
-        babyResult.setAddress(map.get("address").toString());
-        babyResult.setParentId(puerModel.getId());
-        // TODO 需要根据产妇模型上的社区id获取社区信息
-        babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId()) ? "" : puerModel.getCommunityId());
-        return babyResult;
-    }
-
     public BabyResult buildResult(BabyModel patients, String communityId) {
         BabyResult babyResult = new BabyResult();
-      /*  String addr = "";
-        if (StringUtils.isNotEmpty(patients.getAddress())) {
-            try {
-                Map map = JsonUtil.str2Obj(patients.getAddress(), Map.class);
-                addr = map.get("d").toString();
-            } catch (Exception e) {
-                addr = "";
-            }
-        }*/
+
         babyResult.setAddress(patients.getAddress());
         babyResult.setFullAddr(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService));
         babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId);