From 51cc93b256cc681cf397fa0af80c872211206bf3 Mon Sep 17 00:00:00 2001 From: gg12 darfren Date: Fri, 3 May 2024 19:25:52 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B1=D0=B5=D0=B1=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VetClinicContracts/SearchModels/AnimalSearchModel.cs | 3 --- .../VetClinicContracts/SearchModels/VisitSearchModel.cs | 3 --- .../VetClinicDataBaseImplement/Implements/VisitStorage.cs | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/VetClinic/VetClinicContracts/SearchModels/AnimalSearchModel.cs b/VetClinic/VetClinicContracts/SearchModels/AnimalSearchModel.cs index 61a5ca5..10aeeae 100644 --- a/VetClinic/VetClinicContracts/SearchModels/AnimalSearchModel.cs +++ b/VetClinic/VetClinicContracts/SearchModels/AnimalSearchModel.cs @@ -13,8 +13,5 @@ namespace VetClinicContracts.SearchModels public int? AdminId { get; set; } public string? AnimalName { get; set; } public string? Family { get; set; } - public int? MedicineId { get; set; } - - public int? VisitId { get; set; } } } diff --git a/VetClinic/VetClinicContracts/SearchModels/VisitSearchModel.cs b/VetClinic/VetClinicContracts/SearchModels/VisitSearchModel.cs index b28350f..483f842 100644 --- a/VetClinic/VetClinicContracts/SearchModels/VisitSearchModel.cs +++ b/VetClinic/VetClinicContracts/SearchModels/VisitSearchModel.cs @@ -16,8 +16,5 @@ namespace VetClinicContracts.SearchModels public string? DateVisit { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } - public int? ServiceId { get; set; } - - public int? AnimalId { get; set; } } } diff --git a/VetClinic/VetClinicDataBaseImplement/Implements/VisitStorage.cs b/VetClinic/VetClinicDataBaseImplement/Implements/VisitStorage.cs index b775af6..699045f 100644 --- a/VetClinic/VetClinicDataBaseImplement/Implements/VisitStorage.cs +++ b/VetClinic/VetClinicDataBaseImplement/Implements/VisitStorage.cs @@ -33,8 +33,7 @@ namespace VetClinicDataBaseImplement.Implements return context.Visits.Include(x => x.Admin).Include(x => x.Services) .ThenInclude(x => x.Service).Include(x => x.Animals).ThenInclude(x => x.Animal) .Where(x => (string.IsNullOrEmpty(model.NameVisit) || x.NameVisit.Contains(model.NameVisit)) - && (!model.AdminId.HasValue || x.AdminId == model.AdminId) - && (!model.ServiceId.HasValue || x.Services.Select(x => x.ServiceId).ToList().Contains(model.ServiceId.Value))) + && (!model.AdminId.HasValue || x.AdminId == model.AdminId)) .Select(x => x.GetViewModel) .ToList(); } @@ -53,7 +52,7 @@ namespace VetClinicDataBaseImplement.Implements .Include(animal => animal.Visit).Where(animal => visit.Id == animal.VisitId). Select(animal => new Tuple>(animal.Animal.GetViewModel, context.Vaccinations.Include(x => x.Animal).Where(x => x.AnimalId == animal.AnimalId && x.DateStamp >= model.DateFrom && x.DateStamp <= model.DateTo). - Select(x => x.GetViewModel).ToList())).ToList()).ToList(); + Select(x => x.GetViewModel).ToList())).ToList())).ToList(); } public List>>>> GetMedicinesInfo(MedicineVaccinationsSearchModel model)