diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
index d15097e..c4118ea 100644
--- a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
+++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
@@ -21,7 +21,9 @@ namespace SewingDressesDatabaseImplement.Implements
 			}
 			using var context = new SewingDressesDatabase();
 			if (model.Id.HasValue)
-				return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
+				return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList(); return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
+			else if (model.ClientId.HasValue)
+				return context.Orders.Where(x => x.ClientId == model.ClientId).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
 			else
 				return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
 		}
@@ -80,12 +82,13 @@ namespace SewingDressesDatabaseImplement.Implements
 				return null;
 			}
 			var dress = context.Dresses.FirstOrDefault(x => x.Id == model.DressId);
-			if (dress == null)
-			{
+			var client = context.Clients.FirstOrDefault(x => x.Id == model.ClientId);
+			if (client == null || dress == null)
 				return null;
-			}
-			model.DressName = dress.DressName;
-			return model;
+			model.DressName = dress.DressName;		
+            model.ClientFIO = client.ClientFIO;		
+            model.ClientId = client.Id; 		
+            return model;
 		}
 
 	}