diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
index 4749b00f..6356d764 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
@@ -1949,9 +1949,8 @@ public class FltPlanQueryRepository {
     	Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant();
 
     	builder.and(
-    	        ccb.cntrlStDt.between(startOfToday, startOfTomorrow)
-    	        .or(fpb.schFltStDt.between(startOfToday, startOfTomorrow)
-    	        		.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow)))
+    	        ccb.createDt.between(startOfToday, startOfTomorrow)
+    	        .or(fpb.createDt.between(startOfToday, startOfTomorrow))
     	    )
     	    .and(fpb.planSno.isNotNull());
     	
@@ -2009,9 +2008,8 @@ public class FltPlanQueryRepository {
     	Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant();
 
     	builder.and(
-    	        ccb.cntrlStDt.between(startOfToday, startOfTomorrow)
-    	        .or(fpb.schFltStDt.between(startOfToday, startOfTomorrow)
-    	        		.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow)))
+    	        ccb.createDt.between(startOfToday, startOfTomorrow)
+    	        .or(fpb.createDt.between(startOfToday, startOfTomorrow))
     	    )
     	    .and(fpb.planSno.isNotNull());