diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java
index 714ccde..b6f6ede 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java
@@ -66,13 +66,13 @@ public class PostkfController extends BaseController {
     /**
      * 查询儿童评估表
      * @param request
-     * @param mid
+     * @param babyId
      * @return
      */
     @TokenRequired
     @ResponseBody
     @RequestMapping(value = "/getBabyAssess", method = RequestMethod.GET)
-    public BaseResponse getBabyAssess(HttpServletRequest request,@RequestParam(required = true) String mid) {
-        return postkfFaccade.getBabyAssess(mid, getUserId(request));
+    public BaseResponse getBabyAssess(HttpServletRequest request,@RequestParam(required = true) String babyId) {
+        return postkfFaccade.getBabyAssess(babyId, getUserId(request));
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 3406993..1ed04aa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2571,11 +2571,7 @@ public class MatDeliverFacade {
         // 分娩方式去另外一张表查
         patientsQuery.setDesc("fmDate");
         patientsQuery.setSort("fmDate");
-
-
-        //System.out.println("分娩档案查询" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
         List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
-        System.out.println("分娩档案查询结束" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
 
         // 这里就设置分页内容
         childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
@@ -2756,14 +2752,38 @@ public class MatDeliverFacade {
             childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
         } else {
             //秦皇岛要是有初诊医院查询，支持分页正确加的，以前逻辑不知道所以保留了
-            if(StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())){
+            if(StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())) {
                 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
                 matDeliverQuery.setPage(childbirthManagerRequest.getPage());
                 matDeliverQuery.setNeed("need");
                 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
                 // 这里就设置分页内容
                 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
+            }
+            else if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
+            {
+                if (StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()))
+                {
+                    matDeliverQuery.setParentIdList(null);
+                }
 
+                if (StringUtils.isNotEmpty(childbirthManagerRequest.getBirthDate())) {
+                    try {
+                        matDeliverQuery.setCreatedStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]);
+                        matDeliverQuery.setEndStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]);
+                    } catch (Exception e) {
+                        // 什么都不做，这里是数据传入错误了
+                    }
+                }
+
+                matDeliverQuery.setFmHospital(hid);
+                matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
+                matDeliverQuery.setPage(childbirthManagerRequest.getPage());
+                matDeliverQuery.setNeed("need");
+                System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
+                maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
+                // 这里就设置分页内容
+                childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
             }else {//否则按常规查询
                 maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
             }