Egor/Salin_O.A._Kislitsa_E.D._CourseWork_Veterinary_Clinic_Aibolit
Egor/Salin_O.A._Kislitsa_E.D._CourseWork_Veterinary_Clinic_Aibolit
1
1
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

бебра

Browse Source
This commit is contained in:
gg12 darfren 2024-05-03 19:25:52 +04:00
parent c0fe740dc9
commit 51cc93b256
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VetClinic/VetClinicContracts/SearchModels/AnimalSearchModel.cs
View File

@ -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; }
}
}

3
VetClinic/VetClinicContracts/SearchModels/VisitSearchModel.cs
View File

@ -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; }
}
}

5
VetClinic/VetClinicDataBaseImplement/Implements/VisitStorage.cs
View File

@ -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<AnimalViewModel, List<VaccinationViewModel>>(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<Tuple<VisitViewModel, List<Tuple<AnimalViewModel, List<MedicineViewModel>>>>> GetMedicinesInfo(MedicineVaccinationsSearchModel model)