ну что ту скажешь?

VeterinaryView/VeterinaryBusinessLogic/BusinessLogic/ReportLogicDoctor.cs

@@ -9,10 +9,11 @@ using VeterinaryContracts.BindingModels;
 using VeterinaryContracts.StorageContracts;
 using VeterinaryContracts.ViewModels;
 using VeterinaryContracts.SearchModels;
+using VeterinaryBusinessLogic.OfficePackage;
 
 namespace VeterinaryBusinessLogic.BusinessLogic
 {
-	public class ReportLogicDoctor : IReportLogicDoctor
+    public class ReportLogicDoctor : IReportLogicDoctor
 	{
 		private readonly IDrugStorage _drugStorage;
 		private readonly IMedicationStorage _medicationStorage;

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/AbstractSaveToExcelDoctor.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VeterinaryBusinessLogic.OfficePackage.HelperEnums;
+using VeterinaryBusinessLogic.OfficePackage.HelperModels;
+
+namespace VeterinaryBusinessLogic.OfficePackage
+{
+	public abstract class AbstractSaveToExcelDoctor
+	{
+		public void CreateReport(ExcelInfoDoctor info)
+		{
+			CreateExcel(info);
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = 1,
+				Text = info.Title,
+				StyleInfo = ExcelStyleInfoType.Title
+			});
+
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A1",
+				CellToName = "C1"
+			});
+
+			uint rowIndex = 2;
+
+			foreach (var rec in info.PurchaseMedications)
+			{
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = rec.MedicationName,
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+
+				foreach (var medication in rec.Purchases)
+				{
+					InsertCellInWorksheet(new ExcelCellParameters
+					{
+						ColumnName = "B",
+						RowIndex = rowIndex,
+						Text = medication.DateCreate.ToString(),
+						StyleInfo = ExcelStyleInfoType.TextWithBroder
+					});
+
+					rowIndex++;
+				}
+
+				rowIndex++;
+			}
+
+			SaveExcel(info);
+		}
+
+		protected abstract void CreateExcel(ExcelInfoDoctor info);
+
+		protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+
+		protected abstract void MergeCells(ExcelMergeParameters excelParams);
+
+		protected abstract void SaveExcel(ExcelInfoDoctor info);
+	}
+}

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/AbstractSaveToWordDoctor.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VeterinaryBusinessLogic.OfficePackage.HelperEnums;
+using VeterinaryBusinessLogic.OfficePackage.HelperModels;
+
+namespace VeterinaryBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToWordDoctor
+    {
+        public void CreateDoc(WordInfoDoctor info)
+        {
+            CreateWord(info);
+
+            CreateParagraph(new WordParagraph
+            {
+                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
+                TextProperties = new WordTextProperties
+                {
+                    Size = "24",
+                    JustificationType = WordJustificationType.Center
+                }
+            });
+
+            foreach (var rec in info.PurchaseMedications)
+            {
+                CreateParagraph(new WordParagraph
+                {
+                    Texts = new List<(string, WordTextProperties)>
+                    { (rec.MedicationName, new WordTextProperties { Size = "24", Bold=true})},
+                    TextProperties = new WordTextProperties
+                    {
+                        Size = "24",
+                        JustificationType = WordJustificationType.Both
+                    }
+                });
+
+                foreach (var medication in rec.Purchases)
+                {
+                    CreateParagraph(new WordParagraph
+                    {
+                        Texts = new List<(string, WordTextProperties)>
+                        { (medication.DateCreate.ToString(), new WordTextProperties { Size = "20", Bold=false})},
+                        TextProperties = new WordTextProperties
+                        {
+                            Size = "24",
+                            JustificationType = WordJustificationType.Both
+                        }
+                    });
+                }
+            }
+            SaveWord(info);
+        }
+
+        protected abstract void CreateWord(WordInfoDoctor info);
+        protected abstract void CreateParagraph(WordParagraph paragraph);
+        protected abstract void SaveWord(WordInfoDoctor info);
+    }
+}
+

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/HelperModels/ExcelInfoDoctor.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using VeterinaryContracts.ViewModels;
 
 namespace VeterinaryBusinessLogic.OfficePackage.HelperModels
 {

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/HelperModels/WordInfoDoctor.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VeterinaryContracts.ViewModels;
+
+namespace VeterinaryBusinessLogic.OfficePackage.HelperModels
+{
+	public class WordInfoDoctor
+	{
+		public string FileName { get; set; } = string.Empty;
+		public string Title { get; set; } = string.Empty;
+		public List<ReportPurchaseMedicationViewModel> PurchaseMedications { get; set; } = new();
+	}
+}

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VeterinaryBusinessLogic.OfficePackage.Implements
-{
-	public class SaveToExcel : AbstractSaveToExcel
-	{
-		private SpreadsheetDocument? _spreadsheetDocument;
-
-		private SharedStringTablePart? _shareStringPart;
-
-		private Worksheet? _worksheet;
-
-	}
-}

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/Implements/SaveToExcelDoctor.cs

@@ -0,0 +1,333 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VeterinaryBusinessLogic.OfficePackage.HelperEnums;
+using VeterinaryBusinessLogic.OfficePackage.HelperModels;
+
+namespace VeterinaryBusinessLogic.OfficePackage.Implements
+{
+	public class SaveToExcelDoctor : AbstractSaveToExcelDoctor
+	{
+		private SpreadsheetDocument? _spreadsheetDocument;
+		private SharedStringTablePart? _shareStringPart;
+		private Worksheet? _worksheet;
+
+		private static void CreateStyles(WorkbookPart workbookpart)
+		{
+			var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
+			sp.Stylesheet = new Stylesheet();
+
+			var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+
+			var fontUsual = new Font();
+			fontUsual.Append(new FontSize() { Val = 12D });
+			fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+			fontUsual.Append(new FontName() { Val = "Times New Roman" });
+			fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
+			fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+			var fontTitle = new Font();
+			fontTitle.Append(new Bold());
+			fontTitle.Append(new FontSize() { Val = 14D });
+			fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+			fontTitle.Append(new FontName() { Val = "Times New Roman" });
+			fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
+			fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+			fonts.Append(fontUsual);
+			fonts.Append(fontTitle);
+
+			var fills = new Fills() { Count = 2U };
+
+			var fill1 = new Fill();
+			fill1.Append(new PatternFill() { PatternType = PatternValues.None });
+
+			var fill2 = new Fill();
+			fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
+
+			fills.Append(fill1);
+			fills.Append(fill2);
+
+			var borders = new Borders() { Count = 2U };
+
+			var borderNoBorder = new Border();
+			borderNoBorder.Append(new LeftBorder());
+			borderNoBorder.Append(new RightBorder());
+			borderNoBorder.Append(new TopBorder());
+			borderNoBorder.Append(new BottomBorder());
+			borderNoBorder.Append(new DiagonalBorder());
+
+			var borderThin = new Border();
+
+			var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
+			leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+			var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
+			rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+			var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
+			topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+			var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
+			bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+			borderThin.Append(leftBorder);
+			borderThin.Append(rightBorder);
+			borderThin.Append(topBorder);
+			borderThin.Append(bottomBorder);
+			borderThin.Append(new DiagonalBorder());
+
+			borders.Append(borderNoBorder);
+			borders.Append(borderThin);
+
+			var cellStyleFormats = new CellStyleFormats()
+			{
+				Count = 1U
+			};
+			var cellFormatStyle = new CellFormat()
+			{
+				NumberFormatId = 0U,
+				FontId = 0U,
+				FillId = 0U,
+				BorderId = 0U
+			};
+
+			cellStyleFormats.Append(cellFormatStyle);
+
+			var cellFormats = new CellFormats()
+			{
+				Count = 3U
+			};
+			var cellFormatFont = new CellFormat()
+			{
+				NumberFormatId = 0U,
+				FontId = 0U,
+				FillId = 0U,
+				BorderId = 0U,
+				FormatId = 0U,
+				ApplyFont = true
+			};
+			var cellFormatFontAndBorder = new CellFormat()
+			{
+				NumberFormatId = 0U,
+				FontId = 0U,
+				FillId = 0U,
+				BorderId = 1U,
+				FormatId = 0U,
+				ApplyFont = true,
+				ApplyBorder = true
+			};
+			var cellFormatTitle = new CellFormat()
+			{
+				NumberFormatId = 0U,
+				FontId = 1U,
+				FillId = 0U,
+				BorderId = 0U,
+				FormatId = 0U,
+				Alignment = new Alignment()
+				{
+					Vertical = VerticalAlignmentValues.Center,
+					WrapText = true,
+					Horizontal = HorizontalAlignmentValues.Center
+				},
+				ApplyFont = true
+			};
+			cellFormats.Append(cellFormatFont);
+			cellFormats.Append(cellFormatFontAndBorder);
+			cellFormats.Append(cellFormatTitle);
+			var cellStyles = new CellStyles() { Count = 1U };
+			cellStyles.Append(new CellStyle()
+			{
+				Name = "Normal",
+				FormatId = 0U,
+				BuiltinId = 0U
+			});
+			var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
+			{
+				Count = 0U
+			};
+
+			var tableStyles = new TableStyles()
+			{
+				Count = 0U,
+				DefaultTableStyle = "TableStyleMedium2",
+				DefaultPivotStyle = "PivotStyleLight16"
+			};
+			var stylesheetExtensionList = new StylesheetExtensionList();
+			var stylesheetExtension1 = new StylesheetExtension()
+			{
+				Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+			};
+			stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+			stylesheetExtension1.Append(new SlicerStyles()
+			{
+				DefaultSlicerStyle = "SlicerStyleLight1"
+			});
+			var stylesheetExtension2 = new StylesheetExtension()
+			{
+				Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+			};
+			stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+			stylesheetExtension2.Append(new TimelineStyles()
+			{
+				DefaultTimelineStyle = "TimeSlicerStyleLight1"
+			});
+
+			stylesheetExtensionList.Append(stylesheetExtension1);
+			stylesheetExtensionList.Append(stylesheetExtension2);
+
+			sp.Stylesheet.Append(fonts);
+			sp.Stylesheet.Append(fills);
+			sp.Stylesheet.Append(borders);
+			sp.Stylesheet.Append(cellStyleFormats);
+			sp.Stylesheet.Append(cellFormats);
+			sp.Stylesheet.Append(cellStyles);
+			sp.Stylesheet.Append(differentialFormats);
+			sp.Stylesheet.Append(tableStyles);
+			sp.Stylesheet.Append(stylesheetExtensionList);
+		}
+
+		private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+		{
+			return styleInfo switch
+			{
+				ExcelStyleInfoType.Title => 2U,
+				ExcelStyleInfoType.TextWithBroder => 1U,
+				ExcelStyleInfoType.Text => 0U,
+				_ => 0U,
+			};
+		}
+
+		protected override void CreateExcel(ExcelInfoDoctor info)
+		{
+			_spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
+			var workbookpart = _spreadsheetDocument.AddWorkbookPart();
+			workbookpart.Workbook = new Workbook();
+			CreateStyles(workbookpart);
+			_shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any() ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First() : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
+
+			if (_shareStringPart.SharedStringTable == null)
+			{
+				_shareStringPart.SharedStringTable = new SharedStringTable();
+			}
+
+			var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
+			worksheetPart.Worksheet = new Worksheet(new SheetData());
+
+			var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+			var sheet = new Sheet()
+			{
+				Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+				SheetId = 1,
+				Name = "Лист"
+			};
+			sheets.Append(sheet);
+			_worksheet = worksheetPart.Worksheet;
+		}
+
+		protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
+		{
+			if (_worksheet == null || _shareStringPart == null)
+			{
+				return;
+			}
+
+			var sheetData = _worksheet.GetFirstChild<SheetData>();
+
+			if (sheetData == null)
+			{
+				return;
+			}
+
+			Row row;
+
+			if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
+			{
+				row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+			}
+			else
+			{
+				row = new Row() { RowIndex = excelParams.RowIndex };
+				sheetData.Append(row);
+			}
+
+			Cell cell;
+
+			if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+			{
+				cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
+			}
+			else
+			{
+				Cell? refCell = null;
+				foreach (Cell rowCell in row.Elements<Cell>())
+				{
+					if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
+					{
+						refCell = rowCell;
+						break;
+					}
+				}
+				var newCell = new Cell()
+				{
+					CellReference = excelParams.CellReference
+				};
+				row.InsertBefore(newCell, refCell);
+				cell = newCell;
+			}
+
+			_shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
+			_shareStringPart.SharedStringTable.Save();
+			cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
+			cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
+			cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+		}
+
+		protected override void MergeCells(ExcelMergeParameters excelParams)
+		{
+			if (_worksheet == null)
+			{
+				return;
+			}
+			MergeCells mergeCells;
+			if (_worksheet.Elements<MergeCells>().Any())
+			{
+				mergeCells = _worksheet.Elements<MergeCells>().First();
+			}
+			else
+			{
+				mergeCells = new MergeCells();
+				if (_worksheet.Elements<CustomSheetView>().Any())
+				{
+					_worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+				}
+				else
+				{
+					_worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
+				}
+			}
+			var mergeCell = new MergeCell()
+			{
+				Reference = new StringValue(excelParams.Merge)
+			};
+			mergeCells.Append(mergeCell);
+		}
+
+		protected override void SaveExcel(ExcelInfoDoctor info)
+		{
+			if (_spreadsheetDocument == null)
+			{
+				return;
+			}
+			_spreadsheetDocument.WorkbookPart!.Workbook.Save();
+			_spreadsheetDocument.Dispose();
+		}
+	}
+}

VeterinaryView/VeterinaryBusinessLogic/OfficePackage/Implements/SaveToWordDoctor.cs

@@ -0,0 +1,117 @@
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VeterinaryBusinessLogic.OfficePackage.HelperEnums;
+using VeterinaryBusinessLogic.OfficePackage.HelperModels;
+
+namespace VeterinaryBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToWordDoctor : AbstractSaveToWordDoctor
+	{
+		private WordprocessingDocument? _wordDocument;
+		private Body? _docBody;
+		private static JustificationValues
+	   GetJustificationValues(WordJustificationType type)
+		{
+			return type switch
+			{
+				WordJustificationType.Both => JustificationValues.Both,
+				WordJustificationType.Center => JustificationValues.Center,
+				_ => JustificationValues.Left,
+			};
+		}
+		private static SectionProperties CreateSectionProperties()
+		{
+			var properties = new SectionProperties();
+			var pageSize = new PageSize
+			{
+				Orient = PageOrientationValues.Portrait
+			};
+			properties.AppendChild(pageSize);
+			return properties;
+		}
+
+		private static ParagraphProperties?
+	   CreateParagraphProperties(WordTextProperties? paragraphProperties)
+		{
+			if (paragraphProperties == null)
+			{
+				return null;
+			}
+			var properties = new ParagraphProperties();
+			properties.AppendChild(new Justification()
+			{
+				Val =
+		   GetJustificationValues(paragraphProperties.JustificationType)
+			});
+			properties.AppendChild(new SpacingBetweenLines
+			{
+				LineRule = LineSpacingRuleValues.Auto
+			});
+			properties.AppendChild(new Indentation());
+			var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+			if (!string.IsNullOrEmpty(paragraphProperties.Size))
+			{
+				paragraphMarkRunProperties.AppendChild(new FontSize
+				{
+					Val =
+			   paragraphProperties.Size
+				});
+			}
+			properties.AppendChild(paragraphMarkRunProperties);
+			return properties;
+		}
+		protected override void CreateWord(WordInfoDoctor info)
+		{
+			_wordDocument = WordprocessingDocument.Create(info.FileName,
+		   WordprocessingDocumentType.Document);
+			MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+			mainPart.Document = new Document();
+			_docBody = mainPart.Document.AppendChild(new Body());
+		}
+		protected override void CreateParagraph(WordParagraph paragraph)
+		{
+			if (_docBody == null || paragraph == null)
+			{
+				return;
+			}
+			var docParagraph = new Paragraph();
+
+			docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+			foreach (var run in paragraph.Texts)
+			{
+				var docRun = new Run();
+				var properties = new RunProperties();
+				properties.AppendChild(new FontSize { Val = run.Item2.Size });
+				if (run.Item2.Bold)
+				{
+					properties.AppendChild(new Bold());
+				}
+				docRun.AppendChild(properties);
+				docRun.AppendChild(new Text
+				{
+					Text = run.Item1,
+					Space =
+			   SpaceProcessingModeValues.Preserve
+				});
+				docParagraph.AppendChild(docRun);
+			}
+			_docBody.AppendChild(docParagraph);
+		}
+		protected override void SaveWord(WordInfoDoctor info)
+		{
+			if (_docBody == null || _wordDocument == null)
+			{
+				return;
+			}
+			_docBody.AppendChild(CreateSectionProperties());
+			_wordDocument.MainDocumentPart!.Document.Save();
+			_wordDocument.Dispose();
+		}
+	}
+}

VeterinaryView/VeterinaryDatabaseImplement/Implements/PetStorage.cs

@@ -42,24 +42,6 @@ namespace VeterinaryDatabaseImplement.Implements
 			(model.Id.HasValue && x.Id == model.Id))
 			?.GetViewModel;
 		}
-		public List<Tuple<PetViewModel, List<Tuple<VisitViewModel, List<ServiceViewModel>>>>> GetReportInfo(ReportServicesSearchModel model)
-		{
-			if (model.petsIds == null)
-			{
-				return new();
-			}
-			using var context = new VeterinaryDatabase();
-			return context.Pets
-				.Where(pet => model.petsIds.Contains(pet.Id))
-				.Select(pet => new Tuple<PetViewModel, List<Tuple<VisitViewModel, List<ServiceViewModel>>>>(pet.GetViewModel,
-				context.VisitPets.Include(visit => visit.Visit)
-				.Include(visit => visit.Pet).Where(visit => pet.Id == visit.PetId).
-				Select(visit => new Tuple<VisitViewModel, List<ServiceViewModel>>(visit.Visit.GetViewModel,
-				 context.Services.Include(service => service.VisitId).Include()
-				 .Where(x => x.VisitId == visit.Visit.Id).
-				Select(x => x.Service.GetViewModel).ToList())).ToList())).ToList();
-
-		}
 		public List<ReportPetServicesViewModel> GetReportPetServicesList(ReportServicesSearchModel model)
 		{
 			if (model.petsIds == null)
@@ -68,9 +50,14 @@ namespace VeterinaryDatabaseImplement.Implements
 			}
 			using var context = new VeterinaryDatabase();
 			return context.Pets
-				.Where(pet =>  model.petsIds == null || model.petsIds.Contains(pet.Id))
-				.Include(pet => pet.VisitPets).Include(pet => pet.Visits)
-				.Where().Include()
+				.Where(pet => model.petsIds == null || model.petsIds.Contains(pet.Id))
+				.Select(pet => new ReportPetServicesViewModel()
+				{
+					PetName = pet.PetName,
+					Services = context.Services.Include(service => service.Visit).ThenInclude(visit => visit.Pets)
+				.Where(service => service.Visit!=null&&service.Visit.Pets.Select(x => x.PetId).ToList().Contains(pet.Id))
+				.Select(service => service.GetViewModel).ToList()
+				}).ToList();
 		}
 		public PetViewModel? Insert(PetBindingModel model)
 		{

VeterinaryView/VeterinaryDatabaseImplement/Models/Service.cs

@@ -22,6 +22,8 @@ namespace VeterinaryDatabaseImplement.Models
 		[Required]
 		public int VisitId { get; private set; }
 		public virtual Doctor? Doctor { get; private set; }
+		public virtual Visit? Visit { get; private set; }
+
 		private Dictionary<int, IMedicationModel>? _serviceMedications = null;
 		[NotMapped]
 		public Dictionary<int, IMedicationModel> ServiceMedications