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 31b8c66..4749b00 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
@@ -1950,7 +1950,8 @@ public class FltPlanQueryRepository {
 
     	builder.and(
     	        ccb.cntrlStDt.between(startOfToday, startOfTomorrow)
-    	        .or(fpb.schFltStDt.loe(now).and(fpb.schFltEndDt.goe(now)))
+    	        .or(fpb.schFltStDt.between(startOfToday, startOfTomorrow)
+    	        		.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow)))
     	    )
     	    .and(fpb.planSno.isNotNull());
     	
@@ -2009,7 +2010,8 @@ public class FltPlanQueryRepository {
 
     	builder.and(
     	        ccb.cntrlStDt.between(startOfToday, startOfTomorrow)
-    	        .or(fpb.schFltStDt.loe(now).and(fpb.schFltEndDt.goe(now)))
+    	        .or(fpb.schFltStDt.between(startOfToday, startOfTomorrow)
+    	        		.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow)))
     	    )
     	    .and(fpb.planSno.isNotNull());