diff --git a/hb_server/apps/pm/filters.py b/hb_server/apps/pm/filters.py
index a53c29d..f01736b 100644
--- a/hb_server/apps/pm/filters.py
+++ b/hb_server/apps/pm/filters.py
@@ -27,10 +27,11 @@ class PlanFilterSet(DynamicFieldsFilterMixin, filters.FilterSet):
             ProductionPlan.PLAN_MTEST_DONE])
         elif value == 'near_done':
             queryset = queryset.filter(count_ok__lt=F('count'), 
-                    end_date__lte = datetime.date(day7_after))
+                    end_date__lte = datetime.date(day7_after),
+                    end_date__gte = datetime.date(now))
         elif value == 'out_done':
             queryset = queryset.filter(count_ok__lt=F('count'), 
-                    end_date__gt = datetime.date(now))
+                    end_date__lt = datetime.date(now))
         return queryset
     
     def filter_material(self, queryset, name, value):