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 2c85940..51940e5 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
@@ -2614,9 +2614,9 @@ public class MatDeliverFacade {
         }
         if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null
                 && StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) && childbirthManagerRequest.getWeight() == null) {//导出excel和根据出血量查询
-            patientsQuery.setLimit(childbirthManagerRequest.getLimit());
-            patientsQuery.setPage(childbirthManagerRequest.getPage());
-            patientsQuery.setNeed("need");
+//            patientsQuery.setLimit(childbirthManagerRequest.getLimit());
+//            patientsQuery.setPage(childbirthManagerRequest.getPage());
+//            patientsQuery.setNeed("need");
         }
         patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId());
         patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
@@ -2868,6 +2868,8 @@ public class MatDeliverFacade {
             }else {//否则按常规查询
                 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
                 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
+                // 这里就设置分页内容
+                childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
             }
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java
index 0af8669..89547b1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java
@@ -73,9 +73,15 @@ public class MaterDeliverWorker2 implements Callable<List<Map>> {
                         initQueryMapqhdky.put("dt", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1==Integer.parseInt(exChuModel.getTireNumber())?"是":"否":"");
                         initQueryMapqhdky.put("dantai", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1<Integer.parseInt(exChuModel.getTireNumber())?"是":"否":"");
                         if(StringUtils.isNotEmpty(exChuModel.getBp())){
-                            Map<String, Integer> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
-                            initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():"");
-                            initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():"");
+                            Map<String, Object> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
+                            if(MapUtils.isNotEmpty(map)){
+                                initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():"");
+                                initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():"");
+                            }else {
+                                initQueryMapqhdky.put("ssy", "");
+                                initQueryMapqhdky.put("szy", "");
+                            }
+
                         }else {
                             initQueryMapqhdky.put("ssy", "");
                             initQueryMapqhdky.put("szy", "");
@@ -127,11 +133,11 @@ public class MaterDeliverWorker2 implements Callable<List<Map>> {
                             if(2==antExRecordModel.getType()){ //初诊
                                 Criteria criteriaf= Criteria.where("id").is(antExRecordModel.getfId());
                                 AntExChuModel AntExChu = mongoTemplate.findOne(Query.query(criteriaf), AntExChuModel.class);
-                                initQueryMapqhdky.put("cweight", null!=AntExChu.getWeight()?AntExChu.getWeight().toString():"");
+                                initQueryMapqhdky.put("cweight", null!=AntExChu?null!=AntExChu.getWeight()?AntExChu.getWeight().toString():"":"");
                             }else { //复诊
                                 Criteria criteriaf= Criteria.where("id").is(antExRecordModel.getfId());
                                 AntenatalExaminationModel AntExFu = mongoTemplate.findOne(Query.query(criteriaf), AntenatalExaminationModel.class);
-                                initQueryMapqhdky.put("cweight", null!=AntExFu.getWeight()?AntExFu.getWeight().toString():"");
+                                initQueryMapqhdky.put("cweight", null!=AntExFu?null!=AntExFu.getWeight()?AntExFu.getWeight().toString():"":"");
                             }
                         }else {
                             initQueryMapqhdky.put("cweight", "");