diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 9b471d1..044e526 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -156,11 +156,13 @@ public class MatDeliverController extends BaseController{
 
             // 根据查询规则构造返回bean
             List<Object> objectList = new ArrayList<>();
-            for (Object temp : childbirthManagerResult.getData()) {
-                for (String key : query.keySet()) {
-                    query.put(key, BeanUtils.objectToStringMap(temp).get(key));
+            if (childbirthManagerResult.getData() != null) {
+                for (Object temp : childbirthManagerResult.getData()) {
+                    for (String key : query.keySet()) {
+                        query.put(key, BeanUtils.objectToStringMap(temp).get(key));
+                    }
+                    objectList.add(BeanUtils.createStringBean(query));
                 }
-                objectList.add(BeanUtils.createStringBean(query));
             }
 
             baseListResponse = new BaseListResponse().setErrorcode(childbirthManagerResult.getErrorcode()).setErrormsg(childbirthManagerResult.getErrormsg()).setData(objectList).setPageInfo(childbirthManagerResult.getPageInfo());
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 381e9c5..b6ff71a 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
@@ -1026,6 +1026,8 @@ public class MatDeliverFacade {
         patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7);
         // 分娩方式去另外一张表查
         List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
+        // 这里就设置分页内容
+        childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
         List<String> parentIdList = new ArrayList<>();
         if (CollectionUtils.isEmpty(patientsList)) {
             // 没有查到，直接抛出
@@ -1412,7 +1414,6 @@ public class MatDeliverFacade {
 
 
         childbirthManagerResult.setData(childbirthManagerQueryModelList);
-        childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
         childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
         childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
         return childbirthManagerResult;