Реализация логики для отчетов исполнителя

Polyclinic/PolyclinicBusinessLogic/BusinessLogics/ImplementerReportLogic.cs

@@ -1,8 +1,14 @@
-using PolyclinicContracts.BindingModels;
+using PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.Excel;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.PDF;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.Word;
+using PolyclinicContracts.BindingModels;
 using PolyclinicContracts.BusinessLogicsContracts;
 using PolyclinicContracts.SearchModels;
 using PolyclinicContracts.StoragesContracts;
 using PolyclinicContracts.ViewModels;
+using PolyclinicDataModels.Models;
 
 namespace PolyclinicBusinessLogic.BusinessLogics
 {
@@ -13,21 +19,35 @@ namespace PolyclinicBusinessLogic.BusinessLogics
         private readonly ICourseStorage _courseStorage;
         private readonly ISymptomStorage _symptomStorage;
 
-        public ImplementerReportLogic(IDiagnoseStorage diagnoseStorage, IMedicamentStorage medicamentStorage, ICourseStorage courseStorage, ISymptomStorage symptomStorage)
+        private readonly AbstractReportDiagnosesByPeriodSaveToExcel _saveToExcel;
+        private readonly AbstractReportDiagnosesByPeriodSaveToWord _saveToWord;
+        private readonly AbstractReportMedicamentsByDiagnosesSaveToPdf _saveToPdf;
+
+        public ImplementerReportLogic(
+            IDiagnoseStorage diagnoseStorage,
+            IMedicamentStorage medicamentStorage,
+            ICourseStorage courseStorage,
+            ISymptomStorage symptomStorage,
+            AbstractReportDiagnosesByPeriodSaveToWord saveToWord,
+            AbstractReportMedicamentsByDiagnosesSaveToPdf saveToPdf,
+            AbstractReportDiagnosesByPeriodSaveToExcel saveToExcel)
         {
             _diagnoseStorage = diagnoseStorage;
             _medicamentStorage = medicamentStorage;
             _courseStorage = courseStorage;
             _symptomStorage = symptomStorage;
+            _saveToWord = saveToWord;
+            _saveToPdf = saveToPdf;
+            _saveToExcel = saveToExcel;
         }
 
-        public List<ReportDiagnoseWithCoursesAndSymptomesViewModel> GetDiagnoses()
+        public ReportDiagnosesByPeriodViewModel GetReportDiagnosesByPeriod(DateTime? dateStart, DateTime? dateEnd)
         {
-            var diagnoses = _diagnoseStorage.GetFullList();
+            var diagnoses = _diagnoseStorage.GetFilteredList(new DiagnoseSearchModel { From = dateStart, To = dateEnd });
             var courses = _courseStorage.GetFullList();
             var symptomes = _symptomStorage.GetFullList();
 
-            var result = new List<ReportDiagnoseWithCoursesAndSymptomesViewModel>();
+            var report = new ReportDiagnosesByPeriodViewModel();
 
             foreach (var diagnose in diagnoses)
             {
@@ -35,38 +55,24 @@ namespace PolyclinicBusinessLogic.BusinessLogics
                 var diagnoseSymptomes = symptomes.Where(x => x.SymptomDiagnoses.ContainsKey(diagnose.Id)).ToList();
                 if (diagnoseCourses.Count > 0 && diagnoseSymptomes.Count > 0)
                 {
-                    var dianoseReportModel = new ReportDiagnoseWithCoursesAndSymptomesViewModel {
+                    report.DiagnosesData.Add((diagnose, diagnoseSymptomes, diagnoseCourses));
-                        DiagnoseId = diagnose.Id,
-                        DiagnoseName = diagnose.Name,
-                        DiagnoseComment = diagnose.Comment,
-                        DiagnoseDateStart = diagnose.DateStartDiagnose,
-                        DiagnoseDateStop = diagnose.DateStopDiagnose,
-                        Courses = diagnoseCourses.Select(x => (x.DaysCount, x.PillsPerDay)).ToList(),
-                        Symptomes = diagnoseSymptomes.Select(x => x.Name).ToList()
-                    };
-                    result.Add(dianoseReportModel);
                 }
             }
-            return result;
+            report.DateStart = dateStart;
+            report.DateEnd = dateEnd;
+            return report;
         }
 
-        public List<ReportMedicamentsByDiagnoseViewModel> GetMedicamentsByDiagnoses(ReportBindingModel model)
+        public List<ReportMedicamentsByDiagnoseViewModel> GetReportMedicamentsByDiagnoses(List<IDiagnoseModel> diagnoses)
         {
-            var diagnoses = _diagnoseStorage
+            List<DiagnoseViewModel> diagnoseViewModels = diagnoses.Select(x => _diagnoseStorage.GetElement(new DiagnoseSearchModel { Id = x.Id })).ToList();
-                .GetFilteredList(new DiagnoseSearchModel
-                {
-                    From = model.DateFrom,
-                    To = model.DateTo
-                });
-
-            var symptomes = _symptomStorage
-                .GetFullList();
             
+            var symptomes = _symptomStorage.GetFullList();
             var medicaments = _medicamentStorage.GetFullList();
 
-            List<ReportMedicamentsByDiagnoseViewModel> result = new();
+            List<ReportMedicamentsByDiagnoseViewModel> report = new();
 
-            foreach (var diagnose in diagnoses)
+            foreach (var diagnose in diagnoseViewModels)
             {
                 var diagnoseSymptomes = symptomes
                     .Where(x => x.SymptomDiagnoses.ContainsKey(diagnose.Id))
@@ -76,32 +82,46 @@ namespace PolyclinicBusinessLogic.BusinessLogics
                 {
                     diagnoseMedicaments.AddRange(medicaments.Where(x => x.SymptomId == symptom.Id));
                 }
-                var diagnoseReportModel = new ReportMedicamentsByDiagnoseViewModel {
+
-                    DiagnoseId = diagnose.Id,
+                report.Add(new ReportMedicamentsByDiagnoseViewModel
-                    DiagnoseName = diagnose.Name,
+                {
-                    DiagnoseComment = diagnose.Comment,
+                    Diagnose = diagnose,
-                    DiagnoseDateStart = diagnose.DateStartDiagnose,
+                    Medicaments = diagnoseMedicaments.DistinctBy(x => x.Name).ToList()
-                    DiagnoseDateStop = diagnose.DateStopDiagnose,
+                });
-                    Medicaments = diagnoseMedicaments.Distinct().Select(x => x.Name).ToList() 
-                };
-                result.Add(diagnoseReportModel);
             }
-            return result;
+            return report;
         }
 
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
+        public void SaveReportDiagnosesByPeriodToPdfFile(ReportBindingModel reportInfo, ReportDiagnosesByPeriodViewModel reportModel)
         {
-            throw new NotImplementedException();
+            _saveToPdf.CreateDoc(new PdfDiagnosesByPeriodInfo
+            {
+                Title = "Отчет по болезням за период с расшифровкой по симптомам и курсам",
+                DateFrom = reportModel.DateStart,
+                DateTo = reportModel.DateEnd,
+                FileName = reportInfo.FileName,
+                Report = reportModel
+            });
         }
 
-        public void SaveSecureComponentToExcelFile(ReportBindingModel model)
+        public void SaveReportMedicamentsByDiagnosesToExcelFile(ReportBindingModel reportInfo, List<ReportMedicamentsByDiagnoseViewModel> reportModel)
         {
-            throw new NotImplementedException();
+            _saveToExcel.CreateReport(new ReportMedicamentsByDiagnosesInfo
+            {
+                FileName = reportInfo.FileName,
+                Title = "Лекарства по болезням",
+                ReportModel = reportModel
+            });
         }
 
-        public void SaveSecuresToWordFile(ReportBindingModel model)
+        public void SaveReportMedicamentsByDiagnosesToWordFile(ReportBindingModel reportInfo, List<ReportMedicamentsByDiagnoseViewModel> reportModel)
         {
-            throw new NotImplementedException();
+            _saveToWord.CreateDoc(new ReportMedicamentsByDiagnosesInfo
+            {
+                FileName = reportInfo.FileName,
+                Title = "Лекарства по болезням",
+                ReportModel = reportModel
+            });
         }
     }
 }

Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractImplementerReports/AbstractReportDiagnosesByPeriodSaveToExcel.cs

@@ -0,0 +1,43 @@
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.Excel;
+
+namespace PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports
+{
+    public abstract class AbstractReportDiagnosesByPeriodSaveToExcel
+    {
+        public void CreateReport(ReportMedicamentsByDiagnosesInfo 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 diagnoseMedicaments in info.ReportModel)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = diagnoseMedicaments.Diagnose.Name,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+            }
+            SaveExcel(info);
+        }
+        protected abstract void CreateExcel(ReportMedicamentsByDiagnosesInfo info);
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+        protected abstract void MergeCells(ExcelMergeParameters excelParams);
+        protected abstract void SaveExcel(ReportMedicamentsByDiagnosesInfo info);
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractImplementerReports/AbstractReportDiagnosesByPeriodSaveToWord.cs

@@ -0,0 +1,46 @@
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.Word;
+
+namespace PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports
+{
+    public abstract class AbstractReportDiagnosesByPeriodSaveToWord
+    {
+        public void CreateDoc(ReportMedicamentsByDiagnosesInfo info)
+        {
+            CreateWord(info);
+            CreateParagraph(new WordParagraph
+            {
+                Texts = new List<(string, WordTextProperties)>
+                {
+                    (info.Title, new WordTextProperties { Bold = true, Size = "32", })
+                },
+                TextProperties = new WordTextProperties
+                {
+                    Size = "32",
+                    JustificationType = WordJustificationType.Center
+                }
+            });
+            foreach (var diagnoseMedicaments in info.ReportModel)
+            {
+                CreateParagraph(new WordParagraph
+                {
+                    Texts = new List<(string, WordTextProperties)>
+                    {
+                        (diagnoseMedicaments.Diagnose.Name, new WordTextProperties{ Size = "24"}),
+                    },
+
+                    TextProperties = new WordTextProperties
+                    {
+                        Size = "24",
+                        JustificationType = WordJustificationType.Both
+                    }
+                });
+            }
+            SaveWord(info);
+        }
+        protected abstract void CreateWord(ReportMedicamentsByDiagnosesInfo info);
+        protected abstract void CreateParagraph(WordParagraph paragraph);
+        protected abstract void SaveWord(ReportMedicamentsByDiagnosesInfo info);
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractImplementerReports/AbstractReportMedicamentsByDiagnosesSaveToPdf.cs

@@ -0,0 +1,78 @@
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.PDF;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports
+{
+    public abstract class AbstractReportMedicamentsByDiagnosesSaveToPdf
+    {
+        public void CreateDoc(PdfDiagnosesByPeriodInfo info)
+        {
+            CreatePdf(info);
+            CreateParagraph(new PdfParagraph
+            {
+                Text = info.Title,
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"с {(info.DateFrom == null ? "-" : info.DateFrom?.ToShortDateString())} по {(info.DateTo == null ? "-" : info.DateTo?.ToShortDateString())}",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            CreateTable(new List<string> { "2cm", "3cm", "3cm", "4cm", "4cm", "4cm" });
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Номер", "Название", "Начало", "Конец", "Симптомы", "Курсы" },
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            foreach (var diagnoseData in info.Report.DiagnosesData)
+            {
+                var diagnose = diagnoseData.Diagnose;
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string>
+                    {
+                        diagnose.Id.ToString(),
+                        diagnose.Name,
+                        diagnose.DateStartDiagnose.ToShortTimeString(),
+                        diagnose.DateStopDiagnose?.ToShortTimeString() ?? "нет даты окончания процедуры",
+                        "",
+                        ""
+                    },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left,
+                });
+                int maxLength = Math.Max(diagnoseData.Symptomes.Count(), diagnoseData.Courses.Count());
+                for (int i = 0; i < maxLength; i++)
+                {
+                    SymptomViewModel? symptom = diagnoseData.Symptomes.Count() > i ? diagnoseData.Symptomes[i] : null;
+                    CourseViewModel? course = diagnoseData.Courses.Count() > i ? diagnoseData.Courses[i] : null;
+                    CreateRow(new PdfRowParameters
+                    {
+                        Texts = new List<string>
+                        {
+                            "",
+                            "",
+                            "",
+                            "",
+                            symptom?.Name ?? string.Empty,
+                            (course == null ? string.Empty : $"#{course.Id} {course.Comment}")
+                        },
+                        Style = "Normal",
+                        ParagraphAlignment = PdfParagraphAlignmentType.Left,
+                    });
+                }
+            }
+            SavePdf(info);
+        }
+
+        protected abstract void CreatePdf(PdfDiagnosesByPeriodInfo info);
+        protected abstract void CreateParagraph(PdfParagraph paragraph);
+        protected abstract void CreateTable(List<string> columns);
+        protected abstract void CreateRow(PdfRowParameters rowParameters);
+        protected abstract void SavePdf(PdfDiagnosesByPeriodInfo info);
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/HelperEnums/ReportType.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace PolyclinicBusinessLogic.OfficePackage.HelperEnums
+{
+    public enum ReportType
+    {
+        Web = 0,
+        Email = 1,
+        Word = 2,
+        Excel = 3,
+        Pdf = 4,
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/HelperModels/PDF/PdfDiagnosesByPeriodInfo.cs

@@ -0,0 +1,13 @@
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicBusinessLogic.OfficePackage.HelperModels.PDF
+{
+    public class PdfDiagnosesByPeriodInfo
+    {
+        public string Title { get; set; } = string.Empty;
+        public string FileName { get; set; } = string.Empty;
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
+        public ReportDiagnosesByPeriodViewModel Report { get; set; } = new();
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/HelperModels/ReportMedicamentsByDiagnosesInfo.cs

@@ -0,0 +1,11 @@
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicBusinessLogic.OfficePackage.HelperModels
+{
+    public class ReportMedicamentsByDiagnosesInfo
+    {
+        public string FileName { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public List<ReportMedicamentsByDiagnoseViewModel> ReportModel { get; set; } = new();
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/Implements/ImplementerReports/ReportDiagnosesByPeriodSaveToExcel.cs

@@ -0,0 +1,336 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.Excel;
+using PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels;
+
+namespace PolyclinicBusinessLogic.OfficePackage.Implements.ImplementerReports
+{
+    public class ReportDiagnosesByPeriodSaveToExcel : AbstractReportDiagnosesByPeriodSaveToExcel
+    {
+        private SpreadsheetDocument? _spreadsheetDocument;
+        private SharedStringTablePart? _shareStringPart;
+        private Worksheet? _worksheet;
+        /// <summary>
+        /// Настройка стилей для файла
+        /// </summary>
+        /// <param name="workbookpart"></param>
+        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);
+        }
+        /// <summary>
+        /// Получение номера стиля из типа
+        /// </summary>
+        /// <param name="styleInfo"></param>
+        /// <returns></returns>
+        private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+        {
+            return styleInfo switch
+            {
+                ExcelStyleInfoType.Title => 2U,
+                ExcelStyleInfoType.TextWithBorder => 1U,
+                ExcelStyleInfoType.Text => 0U,
+                _ => 0U,
+            };
+        }
+        protected override void CreateExcel(ReportMedicamentsByDiagnosesInfo 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>();
+            // Создаем SharedStringTable, если его нет
+            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(ReportMedicamentsByDiagnosesInfo info)
+        {
+            if (_spreadsheetDocument == null)
+            {
+                return;
+            }
+            _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+            _spreadsheetDocument.Dispose();
+        }
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/Implements/ImplementerReports/ReportDiagnosesByPeriodSaveToWord.cs

@@ -0,0 +1,121 @@
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using DocumentFormat.OpenXml;
+using PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports;
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.Word;
+
+namespace PolyclinicBusinessLogic.OfficePackage.Implements.ImplementerReports
+{
+    public class ReportDiagnosesByPeriodSaveToWord : AbstractReportDiagnosesByPeriodSaveToWord
+    {
+        private WordprocessingDocument? _wordDocument;
+        private Body? _docBody;
+        /// <summary>
+        /// Получение типа выравнивания
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private static JustificationValues GetJustificationValues(WordJustificationType type)
+        {
+            return type switch
+            {
+                WordJustificationType.Both => JustificationValues.Both,
+                WordJustificationType.Center => JustificationValues.Center,
+                _ => JustificationValues.Left,
+            };
+        }
+        /// <summary>
+        /// Настройки страницы
+        /// </summary>
+        /// <returns></returns>
+        private static SectionProperties CreateSectionProperties()
+        {
+            var properties = new SectionProperties();
+            var pageSize = new PageSize
+            {
+                Orient = PageOrientationValues.Portrait
+            };
+            properties.AppendChild(pageSize);
+            return properties;
+        }
+        /// <summary>
+        /// Задание форматирования для абзаца
+        /// </summary>
+        /// <param name="paragraphProperties"></param>
+        /// <returns></returns>
+        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(ReportMedicamentsByDiagnosesInfo 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(ReportMedicamentsByDiagnosesInfo info)
+        {
+            if (_docBody == null || _wordDocument == null)
+            {
+                return;
+            }
+            _docBody.AppendChild(CreateSectionProperties());
+            _wordDocument.MainDocumentPart!.Document.Save();
+            _wordDocument.Dispose();
+        }
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/Implements/ImplementerReports/ReportMedicamentsByDiagnosesSaveToPdf.cs

@@ -0,0 +1,98 @@
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.Rendering;
+using PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports;
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicBusinessLogic.OfficePackage.HelperModels.PDF;
+
+namespace PolyclinicBusinessLogic.OfficePackage.Implements.ImplementerReports
+{
+    public class ReportMedicamentsByDiagnosesSaveToPdf : AbstractReportMedicamentsByDiagnosesSaveToPdf
+    {
+        private Document? _document;
+        private Section? _section;
+        private Table? _table;
+        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+        {
+            return type switch
+            {
+                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
+                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
+                PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right,
+                _ => ParagraphAlignment.Justify,
+            };
+        }
+        /// <summary>
+        /// Создание стилей для документа
+        /// </summary>
+        /// <param name="document"></param>
+        private static void DefineStyles(Document document)
+        {
+            var style = document.Styles["Normal"];
+            style.Font.Name = "Times New Roman";
+            style.Font.Size = 14;
+            style = document.Styles.AddStyle("NormalTitle", "Normal");
+            style.Font.Bold = true;
+        }
+        protected override void CreatePdf(PdfDiagnosesByPeriodInfo info)
+        {
+            _document = new Document();
+            DefineStyles(_document);
+            _section = _document.AddSection();
+        }
+        protected override void CreateParagraph(PdfParagraph pdfParagraph)
+        {
+            if (_section == null)
+            {
+                return;
+            }
+            var paragraph = _section.AddParagraph(pdfParagraph.Text);
+            paragraph.Format.SpaceAfter = "1cm";
+            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+            paragraph.Style = pdfParagraph.Style;
+        }
+        protected override void CreateTable(List<string> columns)
+        {
+            if (_document == null)
+            {
+                return;
+            }
+            _table = _document.LastSection.AddTable();
+            foreach (var elem in columns)
+            {
+                _table.AddColumn(elem);
+            }
+        }
+        protected override void CreateRow(PdfRowParameters rowParameters)
+        {
+            if (_table == null)
+            {
+                return;
+            }
+            var row = _table.AddRow();
+            for (int i = 0; i < rowParameters.Texts.Count; ++i)
+            {
+                row.Cells[i].AddParagraph(rowParameters.Texts[i]);
+                if (!string.IsNullOrEmpty(rowParameters.Style))
+                {
+                    row.Cells[i].Style = rowParameters.Style;
+                }
+                Unit borderWidth = 0.5;
+                row.Cells[i].Borders.Left.Width = borderWidth;
+                row.Cells[i].Borders.Right.Width = borderWidth;
+                row.Cells[i].Borders.Top.Width = borderWidth;
+                row.Cells[i].Borders.Bottom.Width = borderWidth;
+                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
+                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
+            }
+        }
+        protected override void SavePdf(PdfDiagnosesByPeriodInfo info)
+        {
+            var renderer = new PdfDocumentRenderer(true)
+            {
+                Document = _document
+            };
+            renderer.RenderDocument();
+            renderer.PdfDocument.Save(info.FileName);
+        }
+    }
+}

Polyclinic/PolyclinicBusinessLogic/OfficePackage/Implements/SaveToPdfProcedures.cs

@@ -29,7 +29,7 @@ namespace PolyclinicBusinessLogic.OfficePackage.Implements
         {
             var style = document.Styles["Normal"];
             style.Font.Name = "Times New Roman";
-            style.Font.Size = 11;
+            style.Font.Size = 14;
             style = document.Styles.AddStyle("NormalTitle", "Normal");
             style.Font.Bold = true;
         }
@@ -57,19 +57,6 @@ namespace PolyclinicBusinessLogic.OfficePackage.Implements
                 return;
             }
             _table = _document.LastSection.AddTable();
-            // Получаем доступную ширину страницы, чтобы таблица не вылезала за края
-            var pageWidth = _document.DefaultPageSetup.PageWidth - _document.DefaultPageSetup.LeftMargin - _document.DefaultPageSetup.RightMargin;
-            var totalWidth = columns.Sum(col => Unit.FromCentimeter(double.Parse(col.Replace("cm", ""))));
-
-            // Если ширина таблицы превышает доступную ширину страницы, уменьшаем ширину колонок пропорционально
-            if (totalWidth > pageWidth)
-            {
-                var scale = pageWidth / totalWidth;
-                for (int i = 0; i < columns.Count; i++)
-                {
-                    columns[i] = $"{Unit.FromCentimeter(double.Parse(columns[i].Replace("cm", "")) * scale).Centimeter}cm";
-                }
-            }
             foreach (var elem in columns)
             {
                 _table.AddColumn(elem);

Polyclinic/PolyclinicContracts/BindingModels/ReportBindingModel.cs

@@ -2,7 +2,7 @@
 {
     public class ReportBindingModel
     {
-        public string FileName { get; set; } = string.Empty;
+        public string? FileName { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
     }

Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IImplementerReportLogic.cs

@@ -1,14 +1,15 @@
 using PolyclinicContracts.BindingModels;
 using PolyclinicContracts.ViewModels;
+using PolyclinicDataModels.Models;
 
 namespace PolyclinicContracts.BusinessLogicsContracts
 {
     public interface IImplementerReportLogic
     {
-        List<ReportDiagnoseWithCoursesAndSymptomesViewModel> GetDiagnoses();
+        ReportDiagnosesByPeriodViewModel GetReportDiagnosesByPeriod(DateTime? dateStart, DateTime? dateEnd);
-        List<ReportMedicamentsByDiagnoseViewModel> GetMedicamentsByDiagnoses(ReportBindingModel model);
+        List<ReportMedicamentsByDiagnoseViewModel> GetReportMedicamentsByDiagnoses(List<IDiagnoseModel> diagnoses);
-        void SaveSecuresToWordFile(ReportBindingModel model);
+        void SaveReportMedicamentsByDiagnosesToWordFile(ReportBindingModel reportInfo, List<ReportMedicamentsByDiagnoseViewModel> reportModel);
-        void SaveSecureComponentToExcelFile(ReportBindingModel model);
+        void SaveReportMedicamentsByDiagnosesToExcelFile(ReportBindingModel reportInfo, List<ReportMedicamentsByDiagnoseViewModel> reportModel);
-        void SaveOrdersToPdfFile(ReportBindingModel model);
+        void SaveReportDiagnosesByPeriodToPdfFile(ReportBindingModel reportInfo, ReportDiagnosesByPeriodViewModel reportModel);
     }
 }

Polyclinic/PolyclinicContracts/ViewModels/ReportDiagnoseWithCoursesAndSymptomesViewModel.cs

@@ -1,13 +0,0 @@
-namespace PolyclinicContracts.ViewModels
-{
-    public class ReportDiagnoseWithCoursesAndSymptomesViewModel
-    {
-        public int DiagnoseId { get; set; }
-        public string DiagnoseName { get; set; } = string.Empty;
-        public string DiagnoseComment { get; set; } = string.Empty;
-        public DateTime DiagnoseDateStart { get; set; }
-        public DateTime? DiagnoseDateStop { get; set; } = null;
-        public List<string> Symptomes { get; set; } = new();
-        public List<(int DaysCount, int PillsPerDay)> Courses = new();
-    }
-}

Polyclinic/PolyclinicContracts/ViewModels/ReportDiagnosesByPeriodViewModel.cs

@@ -0,0 +1,9 @@
+namespace PolyclinicContracts.ViewModels
+{
+    public class ReportDiagnosesByPeriodViewModel
+    {
+        public DateTime? DateStart { get; set; }
+        public DateTime? DateEnd { get; set; }
+        public List<(DiagnoseViewModel Diagnose, List<SymptomViewModel> Symptomes, List<CourseViewModel> Courses)> DiagnosesData { get; set; } = new();
+    }
+}

Polyclinic/PolyclinicContracts/ViewModels/ReportMedicamentsByDiagnoseViewModel.cs

@@ -2,11 +2,7 @@
 {
     public class ReportMedicamentsByDiagnoseViewModel
     {
-        public int DiagnoseId { get; set; }
+        public DiagnoseViewModel Diagnose { get; set; } = new();
-        public string DiagnoseName { get; set; } = string.Empty;
+        public List<MedicamentViewModel> Medicaments { get; set; } = new();
-        public string DiagnoseComment { get; set; } = string.Empty;
-        public DateTime DiagnoseDateStart { get; set; }
-        public DateTime? DiagnoseDateStop { get; set; } = null;
-        public List<string> Medicaments = new();
     }
 }

Polyclinic/PolyclinicWebAppImplementer/Controllers/ReportsController.cs

@@ -0,0 +1,81 @@
+using Microsoft.AspNetCore.Mvc;
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.BusinessLogicsContracts;
+using PolyclinicContracts.ViewModels;
+using PolyclinicWebAppImplementer.Models;
+
+namespace PolyclinicWebAppImplementer.Controllers
+{
+    public class ReportsController : Controller
+    {
+        private readonly IImplementerReportLogic _reportLogic;
+        private readonly IDiagnoseLogic _diagnoseLogic;
+
+        public ReportsController(IImplementerReportLogic reportLogic, IDiagnoseLogic diagnoseLogic)
+        {
+            _reportLogic = reportLogic;
+            _diagnoseLogic = diagnoseLogic;
+        }
+
+        [HttpGet]
+        [HttpPost]
+        public IActionResult DiagnosesByPeriod(DiagnosesByPeriodFormModel model)
+        {
+            var currentUser = LoginManager.LogginedUser;
+            if (currentUser == null)
+            {
+                return RedirectToAction("Login", "User");
+            }
+            if (HttpContext.Request.Method == "GET")
+            {
+                return View(model);
+            }
+            else
+            {
+                var report = _reportLogic.GetReportDiagnosesByPeriod(model.DateStart, model.DateEnd);
+                if (model.ReportType == ReportType.Web)
+                {
+                    model.Report = report;
+                }
+                else
+                {
+                    ReportBindingModel reportInfo = new()
+                    {
+                        FileName = "diagnosesByPeriod.pdf",
+                        DateFrom = model.DateStart,
+                        DateTo = model.DateEnd
+                    };
+
+                    _reportLogic.SaveReportDiagnosesByPeriodToPdfFile(reportInfo, report);
+
+                    var fileName = reportInfo.FileName;
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), fileName);
+                    byte[] fileBytes = System.IO.File.ReadAllBytes(filePath);
+
+                    return File(fileBytes, "application/pdf", fileName);
+                }
+                return View(model);
+            }
+        }
+
+        [HttpGet]
+        [HttpPost]
+        public IActionResult MedicamentsByDiagnoses(MedicamentsByDiagnosesFormModel model)
+        {
+            var currentUser = LoginManager.LogginedUser;
+            if (currentUser == null)
+            {
+                return RedirectToAction("Login", "User");
+            }
+            if (HttpContext.Request.Method == "GET")
+            {
+                return View(model);
+            }
+            else
+            {
+                return View(model);
+            }
+        }
+    }
+}

Polyclinic/PolyclinicWebAppImplementer/Models/DiagnosesByPeriodFormModel.cs

@@ -0,0 +1,16 @@
+using PolyclinicBusinessLogic.OfficePackage.HelperEnums;
+using PolyclinicContracts.ViewModels;
+using System.ComponentModel;
+
+namespace PolyclinicWebAppImplementer.Models
+{
+    public class DiagnosesByPeriodFormModel
+    {
+        [DisplayName("Начало периода")]
+        public DateTime? DateStart { get; set; }
+        [DisplayName("Конец периода")]
+        public DateTime? DateEnd { get; set; }
+        public ReportType ReportType { get; set; }
+        public ReportDiagnosesByPeriodViewModel? Report { get; set; }
+    }
+}

Polyclinic/PolyclinicWebAppImplementer/Models/MedicamentsByDiagnosesFormModel.cs

@@ -0,0 +1,6 @@
+namespace PolyclinicWebAppImplementer.Models
+{
+    public class MedicamentsByDiagnosesFormModel
+    {
+    }
+}

Polyclinic/PolyclinicWebAppImplementer/Program.cs

@@ -1,4 +1,5 @@
 using PolyclinicBusinessLogic.BusinessLogics;
+using PolyclinicBusinessLogic.OfficePackage.AbstractImplementerReports;
 using PolyclinicContracts.BusinessLogicsContracts;
 using PolyclinicContracts.StoragesContracts;
 using PolyclinicDatabaseImplement.Implements;
@@ -24,10 +25,16 @@ builder.Services.AddTransient<IProcedureLogic, ProcedureLogic>();
 builder.Services.AddTransient<IMedicamentLogic, MedicamentLogic>();
 builder.Services.AddTransient<IRecipeLogic, RecipeLogic>();
 
+builder.Services.AddTransient<IImplementerReportLogic, ImplementerReportLogic>();
+
 builder.Services.AddTransient<IProcedureStorage, ProcedureStorage>();
 builder.Services.AddTransient<IMedicamentStorage, MedicamentStorage>();
 builder.Services.AddTransient<IRecipeStorage, RecipeStorage>();
 
+builder.Services.AddTransient<AbstractReportDiagnosesByPeriodSaveToExcel, ReportDiagnosesByPerioSave>();
+builder.Services.AddTransient<AbstractReportDiagnosesByPeriodSaveToWord, AbstractReportDiagnosesByPeriodSaveToWord>();
+builder.Services.AddTransient<AbstractReportMedicamentsByDiagnosesSaveToPdf, AbstractReportMedicamentsByDiagnosesSaveToPdf>();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.

Polyclinic/PolyclinicWebAppImplementer/SiteMenuItems.cs

@@ -10,8 +10,8 @@
         public static (string Controller, string Action, string Title, PageVisible Visible) Register = ("User", "Register", "Регистрация", PageVisible.AllowOnlyNotAuthorized);
         public static (string Controller, string Action, string Title, PageVisible Visible) Privacy = ("User", "Privacy", "Личный кабинет", PageVisible.AllowOnlyAuthorized);
         public static (string Controller, string Action, string Title, PageVisible Visible) AddRecipeToCourse = ("Recipe", "LinkCourse", "Привязка рецептов", PageVisible.AllowOnlyAuthorized);
-        public static (string Controller, string Action, string Title, PageVisible Visible) MedicamentsByDiagnoses = ("Home", "MedicamentsByDiagnoses", "Лекарства по болезням", PageVisible.AllowOnlyAuthorized);
+        public static (string Controller, string Action, string Title, PageVisible Visible) MedicamentsByDiagnoses = ("Reports", "MedicamentsByDiagnoses", "Отчет по лекарствам", PageVisible.AllowOnlyAuthorized);
-        public static (string Controller, string Action, string Title, PageVisible Visible) DiagnosesReport = ("Home", "DiagnosesReport", "Отчет по болезням", PageVisible.AllowOnlyAuthorized);
+        public static (string Controller, string Action, string Title, PageVisible Visible) DiagnosesReport = ("Reports", "DiagnosesByPeriod", "Отчет по болезням", PageVisible.AllowOnlyAuthorized);
 
         public static List<(string Controller, string Action, string Title, PageVisible Visible)> MenuItemsOrder = new List<(string Controller, string Action, string Title, PageVisible Visible)>
         {

Polyclinic/PolyclinicWebAppImplementer/Views/Home/DiagnosesReport.cshtml

@@ -1,113 +0,0 @@
-@{
-    ViewBag.SelectedSiteMenuItem = SiteMenuItems.DiagnosesReport;
-}
-<div class="d-flex flex-column">
-    <form id="diagnosesReportForm" method="post" class="d-flex mb-4">
-        <div class="me-5">
-            <label for="dateFrom">
-                Дата начала
-            </label>
-            <input type="date" id="dateFrom" name="dateFrom" />
-        </div>
-        <div class="me-5">
-            <label for="dateTo">
-                Дата завершения
-            </label>
-            <input type="date" id="dateTo" name="dateTo" />
-        </div>
-        <div class="me-5">
-            <fieldset class="d-flex">
-                <div class="me-4">
-                    <label for="radioreportTypeEmail">Отправить на почту</label>
-                    <input id="radioreportTypeEmail" type="radio" name="reportType" value="email" />
-                </div>
-                <div>
-                    <label for="radioreportTypeForm">Показать на форме</label>
-                    <input id="radioreportTypeForm" type="radio" name="reportType" value="form" />
-                </div>
-            </fieldset>
-        </div>
-        <button class="btn btn-primary btn-sm" type="submit">
-            Сформировать
-        </button>
-    </form>
-    @if (ViewData.ContainsKey("ShowReport"))
-    {
-        <table class="table mt-3 caption-top table-hover">
-            <caption>Отчет по болезням с 01.01.2023 по 31.12.2023</caption>
-            <thead>
-                <tr>
-                    <th scope="col">
-                        #
-                    </th>
-                    <th scope="col">
-                        Болезнь
-                    </th>
-                    <th scope="col">
-                        Дата начала
-                    </th>
-                    <th scope="col">
-                        Дата завершения
-                    </th>
-                    <th scope="col">
-                        Курсы
-                    </th>
-                    <th scope="col">
-                        Симптомы
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                @{
-                    for (int i = 0; i < 5; i++)
-                    {
-                        <tr>
-                            <th scope="row">
-                                @(i + 1)
-                            </th>
-                            <td>
-                                Лихорадка Эбола
-                            </td>
-                            <td>
-                                16.03.2023
-                            </td>
-                            <td>
-                                20.10.2023
-                            </td>
-                            <td>
-                                Курс приема топорина<sup>&reg;</sup>
-                            </td>
-                            <td>
-                                Лихорадка
-                            </td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td>Курс приема четвертина<sup>&reg;</sup></td>
-                            <td>Покрасения</td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td>Курс приема колесовина<sup>&reg;</sup></td>
-                            <td>Головокружение</td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td>Курс электрофореза</td>
-                            <td></td>
-                        </tr>
-                    }
-                }
-            </tbody>
-        </table>
-    }
-</div>

Polyclinic/PolyclinicWebAppImplementer/Views/Reports/DiagnosesByPeriod.cshtml

@@ -0,0 +1,111 @@
+@using PolyclinicBusinessLogic.OfficePackage.HelperEnums
+@model DiagnosesByPeriodFormModel
+@{
+    ViewBag.SelectedSiteMenuItem = SiteMenuItems.DiagnosesReport;
+}
+<div class="d-flex flex-column">
+    <form id="diagnosesReportForm" method="post" class="d-flex mb-4">
+        <div class="me-5">
+            <label asp-for="DateStart"></label>
+            <input type="date" asp-for="DateStart" />
+        </div>
+        <div class="me-5">
+            <label asp-for="DateEnd"></label>
+            <input type="date" asp-for="DateEnd" />
+        </div>
+        <div class="me-5 d-flex">
+            <div class="me-4">
+                <label for="reportTypeWeb">Показать на форме</label>
+                <input id="reportTypeWeb" checked asp-for="ReportType" type="radio" value="@ReportType.Web" />
+            </div>
+            <div class="me-4">
+                <label for="reportTypeEmail">Отправить на почту</label>
+                <input id="reportTypeEmail" asp-for="ReportType" type="radio" value="@ReportType.Email" />
+            </div>
+        </div>
+        <button class="btn btn-primary btn-sm" type="submit">
+            Сформировать
+        </button>
+    </form>
+    @if (Model.Report != null)
+    {
+        <table class="table mt-3 caption-top table-hover">
+            @if (@Model.DateStart != null || @Model.DateEnd != null)
+            {
+                @if (Model.DateStart == null)
+                {
+                    <caption>Отчет по болезням по @Model.DateEnd?.ToShortDateString()</caption>
+                }
+                else if (Model.DateEnd == null)
+                {
+                    <caption>Отчет по болезням с @Model.DateStart?.ToShortDateString()</caption>
+                }
+                else
+                {
+                    <caption>Отчет по болезням с @Model.DateStart?.ToShortDateString() по @Model.DateEnd?.ToShortDateString()</caption>
+                }
+            }
+            else
+            {
+                <caption>Отчет по болезням за весь период</caption>
+            }
+            <thead>
+                <tr>
+                    <th scope="col">
+                        #
+                    </th>
+                    <th scope="col">
+                        Болезнь
+                    </th>
+                    <th scope="col">
+                        Дата начала
+                    </th>
+                    <th scope="col">
+                        Дата завершения
+                    </th>
+                    <th scope="col">
+                        Симптомы
+                    </th>
+                    <th scope="col">
+                        Курсы
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                @{
+                    int i = 0;
+                }
+                @foreach (var item in Model.Report.DiagnosesData)
+                {
+                    i++;
+                    <tr>
+                        <th scope="row">
+                            @i
+                        </th>
+                        <td>
+                            @item.Diagnose.Name
+                        </td>
+                        <td>
+                            @item.Diagnose.DateStartDiagnose.ToShortDateString()
+                        </td>
+                        <td>
+                            @item.Diagnose.DateStopDiagnose?.ToShortDateString()
+                        </td>
+                        <td>
+                            @foreach (var symptom in item.Symptomes)
+                            {
+                                <p>@symptom.Name</p>
+                            }
+                        </td>
+                        <td>
+                            @foreach (var course in item.Courses)
+                            {
+                                <p>курс #@course.Id @course.Comment</p>
+                            }
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    }
+</div>