diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
index 6b08b8b..ab381cb 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
@@ -119,7 +119,7 @@
                 and blh = #{hospitalizationNo}
             </if>
             <if test="babyName != null and babyName!=''">
-                and hzxm =#{babyName}
+                and hzxm =#{babyName} or lxrdh=#{babyName}
             </if>
             <if test="finalDiagnosis != null and finalDiagnosis!= '' ">
                 and cyzddm like CONCAT(#{finalDiagnosis},'%')
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
index 9d7eeed..e81fb93 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
@@ -166,6 +166,31 @@ public class BabyCheckController extends BaseController {
         return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request));
     }
 
+    /**
+     * 区域儿保检查
+     *
+     * @param
+     */
+
+    @RequestMapping(value = "/queryRegionBabyCheckAll", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse lists(
+            @RequestParam(value = "checkTime", required = false) String checkTime,
+            @RequestParam(value = "queryNo", required = false) String queryNo,
+            @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge,
+            @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge,
+            @RequestParam(value = "nextDate", required = false) String nextDate,
+            @RequestParam(value = "highRisk", required = false) String highRisk,
+            @RequestParam(value = "waskSon", required = false) String waskSon,
+            @RequestParam(value = "hospitalId", required = false) String hospitalId,
+            @RequestParam(required = false) String proviceId,
+            @RequestParam(required = false) String cityId,
+            @RequestParam(required = false) String areaId,
+            Integer page, Integer limit, HttpServletRequest request) {
+        return babyCheckFacade.babyRegionCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, hospitalId, getUserId(request),proviceId,cityId,areaId);
+    }
+
 
     /**
      * 查询身长别体重值
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 84f8ba4..f3bbb89 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -4058,7 +4058,6 @@ public class BabyBookbuildingFacade {
             babyDiagnoseQuery.setStartBirthDate(babyDiagnoseQuery.getStartBirthDate() + " 00:00:00");
             babyDiagnoseQuery.setEndBirthDate(babyDiagnoseQuery.getEndBirthDate() + " 23:59:59");
         }
-
         List<BabyDiagnoseModel> babyDiagnoseModels = babyDiagnoseService.queryBabyDiagnosesList(babyDiagnoseQuery);
         if (babyDiagnoseModels.size() > 0) {
             for (BabyDiagnoseModel info : babyDiagnoseModels) {
@@ -4073,6 +4072,9 @@ public class BabyBookbuildingFacade {
                     map.put("sex", info.getSex());
                     map.put("hospitalizationNo", info.getBlh());
                     map.put("dischargeDiagnosis", info.getCyzdmc());
+                    map.put("contactsPhone", info.getLxrdh());
+                    map.put("contactPhone", info.getLxdh());
+                    map.put("contacts", info.getLxr());
                     result.add(map);
                 }
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 62cd9a9..4bf9de4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -844,6 +844,106 @@ public class BabyCheckFacade extends BaseServiceImpl {
 
     }
 
+    /**
+     * 区域查询
+     */
+    public BaseResponse babyRegionCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge,
+                                            String nextDate, String highRisk, String waskSon, Integer page, Integer limit, String hospitalId, Integer userId, String proviceId, String cityId, String areaId) {
+        boolean flag = false;
+        List<String> hospitalIds = new ArrayList<>();
+        if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospitalId)) {
+            hospitalIds.add(hospitalId);
+        } else {
+            //获取用户拥有的权限医院和条件筛选的医院交集
+            hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, proviceId,
+                    cityId, areaId);
+        }
+        Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
+        Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
+        if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
+            pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
+                    Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo));
+            flag = true;
+        }
+        if (flag) {
+            List<BabyModel> babykModelsList = mongoTemplate.find(Query.query(pCriteria), BabyModel.class);
+            List<String> ids = new ArrayList<>();
+            if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babykModelsList)) {
+                for (BabyModel babyModel : babykModelsList) {
+                    ids.add(babyModel.getId());
+                }
+            }
+            criteria.and("buildId").in(ids);
+        }
+        if (null != checkTime) {
+            try {
+                Date start = (DateUtil.getSNDate(checkTime)[0]);
+                Date end = (DateUtil.getSNDate(checkTime)[1]);
+                criteria.and("checkDate").gte(start).lte(end);
+            } catch (Exception e) {
+            }
+        }
+        if (null != checkTime) {
+            try {
+                Date start = (DateUtil.getSNDate(nextDate)[0]);
+                Date end = (DateUtil.getSNDate(nextDate)[1]);
+                criteria.and("nextDate").gte(start).lte(end);
+            } catch (Exception e) {
+            }
+        }
+        if (StringUtils.isNotEmpty(highRisk)) {
+            criteria.and("highRisk").is(highRisk);
+        }
+        if (StringUtils.isNotEmpty(waskSon)) {
+            criteria.and("waskSon").and(waskSon);
+        }
+        PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
+        List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid();
+        List<Map<String, Object>> list = new ArrayList();
+        for (BabyCheckModel babyCheckModel : babyCheckModelList) {
+            Map<String, Object> map = new HashMap<>();
+            if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) {
+                BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class);
+                map.put("id", babyModel.getId());
+                map.put("babyName", babyModel.getName());
+                map.put("sex", babyModel.getSex() != 0 ? "男" : "女");
+                map.put("mName", babyModel.getMname());
+                map.put("mCardNo", babyModel.getCardNo());
+                map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate()));
+                map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate()));
+            }
+            map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate()));
+            map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate()));
+            if (null != babyCheckModel.getHighRisk()) {
+                map.put("highRisk", babyCheckModel.getHighRisk() == 1 ? "高危儿" : "-");
+            } else {
+                map.put("highRisk", "-");
+            }
+            if (null != babyCheckModel.getWaskSon()) {
+                map.put("waskSon", babyCheckModel.getWaskSon() == 1 ? "低弱儿" : "-");
+            } else {
+                map.put("waskSon", "-");
+            }
+            map.put("height", babyCheckModel.getHeight());
+            map.put("weight", babyCheckModel.getWeight());
+            list.add(map);
+        }
+        if (null != checkMonthAge && null != endCheckMonthAge) {
+            List<Map<String, Object>> list1 = new ArrayList<>();
+            for (Map<String, Object> mapList : list) {
+                if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) {
+                    list1.add(mapList);
+                }
+            }
+            pageResult.setGrid(list1);
+            return RespBuilder.buildSuccess(pageResult);
+        } else {
+            pageResult.setGrid(list);
+            return RespBuilder.buildSuccess(pageResult);
+        }
+
+    }
+
     public void getBabyCheckList(String[] ids, PersonModel personModel, List<Map<String, String>> list) {
         List<BabyCheckModel> checkModels;
         if (personModel != null) {