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 0f3db46..a33e1f0 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
@@ -904,8 +904,8 @@ public class MatDeliverFacade {
 
         if (StringUtils.isNotEmpty(childbirthManagerRequest.getBirthDate())) {
             try {
-                patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]);
-                patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]);
+                patientsQuery.setFmDateStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]);
+                patientsQuery.setFmDateEnd(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]);
             } catch (Exception e) {
                 // 什么都不做，这里是数据传入错误了
             }
@@ -953,6 +953,26 @@ public class MatDeliverFacade {
                     ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
                     BeanUtils.copy(patients, childbirthManagerQueryModel);
                     BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel);
+                    // 查询分娩方式
+                    String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
+                    Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);
+                    if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) {
+                        for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) {
+                            if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) {
+                                childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName());
+                                break;
+                            }
+                        }
+                    }
+                    // 产妇情况
+                    if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) {
+                        for (CfEnums cfEnums : CfEnums.values()) {
+                            if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) {
+                                childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName());
+                                break;
+                            }
+                        }
+                    }
                     // 查询接生医生
                     try {
                         childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
index 6ab7274..f090ea0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
@@ -40,7 +40,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest {
      * @createTime 2016年12月07日 14时14分
      * @discription 分娩方式
      */
-    private String DeliveryMode;
+    private String deliveryMode;
 
     /**
      * @auther HuJiaqi
@@ -86,11 +86,11 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest {
     }
 
     public String getDeliveryMode() {
-        return DeliveryMode;
+        return deliveryMode;
     }
 
     public void setDeliveryMode(String deliveryMode) {
-        DeliveryMode = deliveryMode;
+        this.deliveryMode = deliveryMode;
     }
 
     public Integer getOperatorId() {