diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
index 8df2a2b..9763d0e 100644
--- a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
+++ b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
@@ -34,9 +34,14 @@ model)
                 return new();
             }
             return source.Orders
-               .Where(x => x.Id == model.Id)
-               .Select( x => AccessIceCreamStorage( x.GetViewModel))
-               .ToList();
+               .Where(x => (
+                        (!model.Id.HasValue || x.Id == model.Id) &&
+                        (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
+                        (!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
+                    )
+                )
+           .Select(x => x.GetViewModel)
+           .ToList();
         }
 
         public OrderViewModel? GetElement(OrderSearchModel model)
diff --git a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs
index d10184b..12d1b4e 100644
--- a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs
+++ b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs
@@ -37,7 +37,7 @@ namespace IceCreamShopListImplement.Implements
             }
             foreach (var order in _source.Orders)
             {
-                if (order.Id == model.Id)
+                if ((model.Id.HasValue && order.Id == model.Id) || (model.DateFrom.HasValue && model.DateTo.HasValue && (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)))
                 {
                     result.Add(AccessIceCreamStorage(order.GetViewModel));
                 }