отчеты готовы
This commit is contained in:
parent
01ae38d58c
commit
9a361f715a
@ -62,28 +62,22 @@ namespace VeterinaryDatabaseImplement.Implements
|
||||
using var context = new VeterinaryDatabase();
|
||||
|
||||
return context.Pets
|
||||
.Select(pet => new ReportVisitsDrugsViewModel()
|
||||
{
|
||||
PetName = pet.PetName,
|
||||
Visits = context.Visits
|
||||
.Where(visit => visit.DateVisit <= model.DateTo &&
|
||||
visit.DateVisit >= model.DateFrom && visit.Pets
|
||||
.Select(x => x.PetId)
|
||||
.ToList()
|
||||
.Contains(pet.Id))
|
||||
.Select(visit => visit.GetViewModel)
|
||||
.ToList(),
|
||||
Drugs = context.Purchases
|
||||
.Include(purchase => purchase.Drug)
|
||||
.Where(purchase => purchase.DateCreate <= model.DateTo &&
|
||||
purchase.DateCreate >= model.DateFrom && purchase.Pets
|
||||
.Select(x => x.PetId)
|
||||
.ToList()
|
||||
.Contains(pet.Id))
|
||||
.Select(purchase => purchase.Drug.GetViewModel)
|
||||
.ToList(),
|
||||
})
|
||||
.ToList();
|
||||
.Select(pet => new ReportVisitsDrugsViewModel()
|
||||
{
|
||||
PetName = pet.PetName,
|
||||
Visits = context.Visits
|
||||
.Where(visit => visit.DateVisit <= model.DateTo &&
|
||||
visit.DateVisit >= model.DateFrom && visit.Pets.Any(p => p.PetId == pet.Id))
|
||||
.Select(visit => visit.GetViewModel)
|
||||
.ToList(),
|
||||
Drugs = context.Purchases
|
||||
.Include(purchase => purchase.Drug)
|
||||
.Where(purchase => purchase.DateCreate <= model.DateTo &&
|
||||
purchase.DateCreate >= model.DateFrom && purchase.Pets.Any(p => p.PetId == pet.Id))
|
||||
.Select(purchase => purchase.Drug.GetViewModel)
|
||||
.ToList(),
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
public PetViewModel? Insert(PetBindingModel model)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user