diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java
index 12243fd..cdb5833 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java
@@ -63,6 +63,8 @@ public class BreastAfterVisitQuery extends BaseQuery implements IConvertToNative
     private Date afterVisitTimeEnd;
     //预约下次追访日期
     private Date nextAfterVisitTime;
+    private Date nextAfterVisitTimeStart;
+    private Date nextAfterVisitTimeEnd;
     //逾期天数
     private Date overdueStart;
     private Date overdueEnd;
@@ -236,6 +238,22 @@ public class BreastAfterVisitQuery extends BaseQuery implements IConvertToNative
         this.overdueEnd = overdueEnd;
     }
 
+    public Date getNextAfterVisitTimeStart() {
+        return nextAfterVisitTimeStart;
+    }
+
+    public void setNextAfterVisitTimeStart(Date nextAfterVisitTimeStart) {
+        this.nextAfterVisitTimeStart = nextAfterVisitTimeStart;
+    }
+
+    public Date getNextAfterVisitTimeEnd() {
+        return nextAfterVisitTimeEnd;
+    }
+
+    public void setNextAfterVisitTimeEnd(Date nextAfterVisitTimeEnd) {
+        this.nextAfterVisitTimeEnd = nextAfterVisitTimeEnd;
+    }
+
     /**
      * @return
      */
@@ -345,12 +363,19 @@ public class BreastAfterVisitQuery extends BaseQuery implements IConvertToNative
                 }
             }
         }
+        Criteria c2=MongoCondition.newInstance().getCriteria();
+        if (null != nextAfterVisitTimeStart &&null!= nextAfterVisitTimeEnd) {
+            if (null != c2) {
+                c2 = c2.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
+            } else {
+                c2 = Criteria.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
+            }
+        }
 
         if (null != c) {
-            condition = condition.andCondition(new MongoCondition(c));
+            return new MongoCondition(c.andOperator(condition.getCriteria(),c2)).toMongoQuery();
         }
-
-        return condition.toMongoQuery();
+        return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery();
     }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
index 5d217dc..d7a835c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
@@ -682,6 +682,18 @@ public class CancerScreeningFacade {
             query.setCheckDateStart(DateUtil.parseYMD(arrs[0]));
             query.setCheckDateEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
         }
+        //随访日期筛选
+        if (StringUtils.isNotEmpty(queryRequest.getAfterVisitTime())) {
+            String[] arrs = queryRequest.getAfterVisitTime().split(" - ");
+            query.setAfterVisitTimeStart(DateUtil.parseYMD(arrs[0]));
+            query.setAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
+        }
+        //预约下次检查日期筛选
+        if (StringUtils.isNotEmpty(queryRequest.getNextAfterVisitTime())) {
+            String[] arrs = queryRequest.getNextAfterVisitTime().split(" - ");
+            query.setNextAfterVisitTimeStart(DateUtil.parseYMD(arrs[0]));
+            query.setNextAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
+        }
         //下次追访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则）
         query.setNextAfterVisitTime(new Date());
         //逾期天数
@@ -739,6 +751,7 @@ public class CancerScreeningFacade {
                     }
                 }
                 map.put("yqsj",yqsj);
+                map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(model.getAfterVisitTime()));//随访时间
                 map.put("nextAfterVisitTime", DateUtil.getyyyy_MM_dd(model.getNextAfterVisitTime()));//下次预约时间
                 map.put("checkDate", DateUtil.getyyyy_MM_dd(model.getCheckDate()));//检査日期
                 map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见