From 4f3243bb1cd6f67a22df8b57bcf220f07b396d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= <elina_kallin@mail.ru>
Date: Tue, 28 May 2024 19:27:09 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8E=20=D0=B2=20Program=20=D0=B7=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessLogics/SuretorReportLogic.cs         |  4 ++--
 .../ISuretorReportLogic.cs                       | 16 ++++++++++------
 .../PolyclinicWebAppImplementer/Program.cs       |  8 ++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs b/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs
index 47bb243..e33f432 100644
--- a/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs
+++ b/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs
@@ -64,7 +64,7 @@ namespace PolyclinicBusinessLogic.BusinessLogics
             return list;
         }
 
-        public List<ReportProceduresViewModel> GetProcedures(ReportBindingModel model)
+        public List<ReportProceduresViewModel> GetProceduresByMedicametsAndSymptoms(ReportBindingModel model)
         {
             var procedures = procedureStorage.GetFullList();
             var medicaments = medicamentStorage.GetFullList();
@@ -108,7 +108,7 @@ namespace PolyclinicBusinessLogic.BusinessLogics
             throw new NotImplementedException();
         }
 
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
+        public void SaveProceduresToPdfFile(ReportBindingModel model)
         {
             throw new NotImplementedException();
         }
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorReportLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorReportLogic.cs
index 77a2835..ccfba9d 100644
--- a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorReportLogic.cs
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISuretorReportLogic.cs
@@ -12,30 +12,34 @@ namespace PolyclinicContracts.BusinessLogicsContracts
     public interface ISuretorReportLogic
     {
         /// <summary>
-        /// Получение данных (списка) курсов - ну он получается один по выбранным процедурам
+        /// Получение данных (списка) курсов по выбранным процедурам
         /// </summary>
         /// <returns></returns>
         List<ReportCoursesByProcedureViewModel> GetProcedureCourses(ProcedureSearchModel model);
+
         /// <summary>
-        /// Получение списка заказов за определенный период
+        /// Получение списка процедур
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        List<ReportProceduresViewModel> GetProcedures(ReportBindingModel model);
+        List<ReportProceduresViewModel> GetProceduresByMedicametsAndSymptoms(ReportBindingModel model);
+
         /// <summary>
-        /// Сохранение компонент в файл-Word
+        /// Сохранение курсов по процедурам в файл-Word
         /// </summary>
         /// <param name="model"></param>
         void SaveCoursesByProcedureToWordFile(ReportBindingModel model);
+
         /// <summary>
-        /// Сохранение компонент с указаеним продуктов в файл-Excel
+        /// Сохранение курсов по процедурам в файл-Excel
         /// </summary>
         /// <param name="model"></param>
         void SaveCoursesByProcedureToExcelFile(ReportBindingModel model);
+
         /// <summary>
         /// Сохранение заказов в файл-Pdf
         /// </summary>
         /// <param name="model"></param>
-        void SaveOrdersToPdfFile(ReportBindingModel model);
+        void SaveProceduresToPdfFile(ReportBindingModel model);
     }
 }
diff --git a/Polyclinic/PolyclinicWebAppImplementer/Program.cs b/Polyclinic/PolyclinicWebAppImplementer/Program.cs
index b57d1ed..ed8ed4f 100644
--- a/Polyclinic/PolyclinicWebAppImplementer/Program.cs
+++ b/Polyclinic/PolyclinicWebAppImplementer/Program.cs
@@ -17,6 +17,14 @@ builder.Services.AddTransient<IDiagnoseStorage, DiagnoseStorage>();
 builder.Services.AddTransient<ICourseStorage, CourseStorage>();
 builder.Services.AddTransient<ISymptomStorage, SymptomStorage>();
 
+builder.Services.AddTransient<IProcedureLogic, ProcedureLogic>();
+builder.Services.AddTransient<IMedicamentLogic, MedicamentLogic>();
+builder.Services.AddTransient<IRecipeLogic, RecipeLogic>();
+
+builder.Services.AddTransient<IProcedureStorage, ProcedureStorage>();
+builder.Services.AddTransient<IMedicamentStorage, MedicamentStorage>();
+builder.Services.AddTransient<IRecipeStorage, RecipeStorage>();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.