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 7c0b5a4..6e56dd4 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
@@ -2651,7 +2651,6 @@ public class MatDeliverFacade {
         String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
         matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
 //        matDeliverQuery.setWeight(childbirthManagerRequest.getWeight());
-
         if (childbirthManagerRequest.getWeight() != null) {
             BabyModelQuery babyModelQuery = new BabyModelQuery();
 //            babyModelQuery.setDataStatus(false);
@@ -2754,6 +2753,10 @@ public class MatDeliverFacade {
                 }
             }
         }
+        //隆化需求按接诊医生查询
+        if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {
+            matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
+        }
         /**********增加完毕***********/
 
 
@@ -2761,7 +2764,8 @@ public class MatDeliverFacade {
         List <MaternalDeliverModel> maternalDeliverModelList;
         if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null
                 || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) || childbirthManagerRequest.getWeight() != null)
-                || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {//根据出血量查询继续分页
+                || StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())
+                || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {//根据出血量查询继续分页
             matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
             matDeliverQuery.setPage(childbirthManagerRequest.getPage());
             matDeliverQuery.setNeed("need");
@@ -2851,14 +2855,7 @@ public class MatDeliverFacade {
                 // 这里就设置分页内容
                 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
             }else {//否则按常规查询
-                //隆化需求按接诊医生查询
-                matDeliverQuery.setLimit(null!=childbirthManagerRequest.getLimit()?childbirthManagerRequest.getLimit():20);
-                matDeliverQuery.setPage(null!=childbirthManagerRequest.getPage()?childbirthManagerRequest.getPage():1);
-                matDeliverQuery.setNeed("need");
-                matDeliverQuery.setDeliverDoctor(StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())?childbirthManagerRequest.getDeliverDoctor():null);
                 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
-                // 这里就设置分页内容
-                childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
             }
         }