From 9e662c26084671469f2b9deb341a603859bd14ab 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?= Date: Thu, 2 May 2024 00:46:07 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D0=BF=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BE=D1=82=D1=87=D0=B5=D1=82=20=D0=B2=20=D0=B4=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=20=D1=8D=D0=BA=D1=81=D0=B5=D0=BB=D1=8C=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D0=B4=D1=83=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=B2=D1=8C=D1=8E=D1=88=D0=BA=D1=83=20=D0=BF=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BE=D1=82=D1=87=D0=B5=D1=82=20=D0=B2=20=D0=B4=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=20=D1=8D=D0=BA=D1=81=D0=B5=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/ReportCoursesByProcedures.cs | 2 ++ .../ViewModels/ReportProceduresViewModel.cs | 2 +- .../Views/Home/ListCoursesByProcedures.cshtml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Polyclinic/PolyclinicContracts/ViewModels/ReportCoursesByProcedures.cs b/Polyclinic/PolyclinicContracts/ViewModels/ReportCoursesByProcedures.cs index 171f262..ed74567 100644 --- a/Polyclinic/PolyclinicContracts/ViewModels/ReportCoursesByProcedures.cs +++ b/Polyclinic/PolyclinicContracts/ViewModels/ReportCoursesByProcedures.cs @@ -8,5 +8,7 @@ namespace PolyclinicContracts.ViewModels { public class ReportCoursesByProcedures { + public string Name { get; set; } = string.Empty; + public List<(int countDays, int pillsPerDay, string comment)> Courses = new(); } } diff --git a/Polyclinic/PolyclinicContracts/ViewModels/ReportProceduresViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/ReportProceduresViewModel.cs index 07ba83c..0baba92 100644 --- a/Polyclinic/PolyclinicContracts/ViewModels/ReportProceduresViewModel.cs +++ b/Polyclinic/PolyclinicContracts/ViewModels/ReportProceduresViewModel.cs @@ -12,6 +12,6 @@ namespace PolyclinicContracts.ViewModels public int Procedure { get; set; } public DateTime DateStartProcedure { get; set; } public DateTime DateStopProcedure { get; set;} - public List<(string, string)> MedicamentSymptom { get; set; } = new(); + public List<(string medicamentName, string symptomName)> MedicamentSymptom { get; set; } = new(); } } diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ListCoursesByProcedures.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ListCoursesByProcedures.cshtml index b6a68f1..5d23885 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ListCoursesByProcedures.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ListCoursesByProcedures.cshtml @@ -10,7 +10,7 @@

- Выберите процедуры из списка + Выберите процедуру из списка

    @@ -19,7 +19,7 @@ for (int i = 1; i <= count; i++) {
  • - +
  • }