diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
index eed2879..70de9ec 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
@@ -21,6 +21,15 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery
     private String name;
     private String cardNo;
     private String phone;
+    private String barCode;
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 
     public String getName() {
         return name;
@@ -52,10 +61,24 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery
     //孕妇状态
     private Integer status;
     private String levelId;
+    private String rFactor;
+
+    public String getrFactor() {
+        return rFactor;
+    }
+
+    public void setrFactor(String rFactor) {
+        this.rFactor = rFactor;
+    }
+
     //产检医生id
     private String cId;
     private Date buildTimeStart;
     private Date buildTimeEnd;
+
+    private Date checkTimeStart;
+    private Date checkTimeEnd;
+
     private Date dueDateStart;
     private Date dueDateEnd;
     //大于修改时间
@@ -63,6 +86,22 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery
     private Date gteCreated;
     private String pid;
 
+    public Date getCheckTimeStart() {
+        return checkTimeStart;
+    }
+
+    public void setCheckTimeStart(Date checkTimeStart) {
+        this.checkTimeStart = checkTimeStart;
+    }
+
+    public Date getCheckTimeEnd() {
+        return checkTimeEnd;
+    }
+
+    public void setCheckTimeEnd(Date checkTimeEnd) {
+        this.checkTimeEnd = checkTimeEnd;
+    }
+
     public List getHospitalList() {
         return hospitalList;
     }
@@ -237,6 +276,23 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery
             }
         }
 
+        if (null != checkTimeStart) {
+            if (null != c) {
+                c = c.and("checkTime").gte(checkTimeStart);
+            } else {
+                c = Criteria.where("checkTime").gte(checkTimeStart);
+            }
+        }
+
+        if (null != checkTimeEnd) {
+            if (null != c) {
+                c = c.lte(checkTimeEnd);
+            } else {
+                c = Criteria.where("checkTime").lte(checkTimeEnd);
+            }
+        }
+
+
         if (null != c) {
             condition = condition.andCondition(new MongoCondition(c));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index ce8ad0f..4c17473 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -70,7 +70,7 @@ public class AntExRecordFacade {
      * @param antExManagerQueryRequest
      * @param isRegion
      */
-    private AntExRecordQuery complayRequest(Integer userId,AntExManagerQueryRequest antExManagerQueryRequest,boolean isRegion){
+    private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion) {
 
         AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
         antExRecordQuery.setNeed("1");
@@ -78,6 +78,40 @@ public class AntExRecordFacade {
         antExRecordQuery.setLimit(antExManagerQueryRequest.getLimit());
         antExRecordQuery.setName(antExManagerQueryRequest.getName());
         antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone());
+        antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId());
+        antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel());
+        antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode());
+
+        //产检日期
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getcTime())) {
+            String nextDateStr = antExManagerQueryRequest.getcTime();
+            String[] dates = nextDateStr.split(" - ");
+
+            antExRecordQuery.setCheckTimeStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1]));
+            }
+        }
+        //建档日期
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getbTime())) {
+            String nextDateStr = antExManagerQueryRequest.getbTime();
+            String[] dates = nextDateStr.split(" - ");
+            antExRecordQuery.setBuildTimeStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                antExRecordQuery.setBuildTimeEnd(DateUtil.parseYMD(dates[1]));
+            }
+        }
+
+
+        //预产期
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getDueTime())) {
+            String nextDateStr = antExManagerQueryRequest.getDueTime();
+            String[] dates = nextDateStr.split(" - ");
+            antExRecordQuery.setDueDateStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                antExRecordQuery.setDueDateEnd(DateUtil.parseYMD(dates[1]));
+            }
+        }
 
         //区域范围内孕妇
         if (isRegion) {
@@ -85,7 +119,7 @@ public class AntExRecordFacade {
             //王平说的  必须要给区域医院权限，不然他就是蠢逼 201611124  16:41
             hospitalList = new ArrayList<>();
             String hospital = autoMatchFacade.getHospitalId(userId);
-            if(null!=hospital){
+            if (null != hospital) {
                 hospitalList.add(hospital);
             }
             DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
@@ -140,8 +174,8 @@ public class AntExRecordFacade {
      *
      * @return
      */
-    public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId,boolean isRegion) {
-       AntExRecordQuery antExRecordQuery =complayRequest(userId,antExManagerQueryRequest,isRegion);
+    public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion) {
+        AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion);
         String hospital = autoMatchFacade.getHospitalId(userId);
         List<AntExManagerResult> data = new ArrayList<>();
         List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery);
@@ -151,13 +185,13 @@ public class AntExRecordFacade {
             for (AntExRecordModel e : antExRecordModelList) {
                 AntExManagerResult antExManagerResult = new AntExManagerResult();
                 antExManagerResult.convertToResult(e);
-                if(isRegion){
+                if (isRegion) {
                     //产检医院
-                    if(StringUtils.isNotEmpty(e.getHospitalId())){
+                    if (StringUtils.isNotEmpty(e.getHospitalId())) {
                         Organization org = organizationService.getOrganization(Integer.valueOf(e.getHospitalId()));
-                        if(null!=org){
+                        if (null != org) {
                             antExManagerResult.setCheckHospital(org.getName());
-                        }else{
+                        } else {
                             antExManagerResult.setCheckHospital(e.getHospitalId());
                         }
                     }
@@ -180,7 +214,7 @@ public class AntExRecordFacade {
                 }
                 //产检医生
                 if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getCheckDoctor())) {
-                    if (NumberUtils.isNumber(e.getBuildDoctor())) {
+                    if (NumberUtils.isNumber(e.getCheckDoctor())) {
                         Users users = usersService.getUsers(NumberUtils.toInt(e.getCheckDoctor()));
                         if (null != users) {
                             antExManagerResult.setCheckDoctor(users.getName());