From 4bb440036c31c68c9b0e5ffcaa18925c242573e9 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: Sat, 27 Apr 2024 23:14:58 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B8=20=D0=B2=20=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=81=D1=82=D0=B2=D0=B0=D1=85,=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=20-=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/MedicamentBindingModel.cs                   | 2 ++
 .../PolyclinicContracts/BindingModels/RecipeBindingModel.cs   | 2 +-
 Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs   | 4 ++--
 Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs       | 2 +-
 Polyclinic/PolyclinicDataModels/Enums/UserRole.cs             | 3 ++-
 Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs    | 4 ++--
 Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs        | 2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
index 20af809..1e208d6 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
@@ -10,6 +10,8 @@ namespace PolyclinicContracts.BindingModels
     public class MedicamentBindingModel : IMedicamentModel
     {
         public int Id { get; set; }
+        public int SymptomId { get; set; }
+        public int ProcedureId { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment { get; set; } = string.Empty;
         public Dictionary<int, ISymptomModel> MedicamentSymptom { get; set; } = new();
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
index 30560d2..b315e7e 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
@@ -10,7 +10,7 @@ namespace PolyclinicContracts.BindingModels
     public class RecipeBindingModel : IRecipeModel
     {
         public int Id { get; set; }
-        public int CountProcedures { get; set; }
+        public int ProceduresCount { get; set; }
         public string Comment { get; set; } = string.Empty;
         public Dictionary<int, IRecipeModel> ProcedureRecipe { get; set; } = new();
 
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs
index 345e93d..6238613 100644
--- a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs
+++ b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs
@@ -11,13 +11,13 @@ namespace PolyclinicContracts.ViewModels
     public class MedicamentView : IMedicamentModel
     {
         public int Id { get; set; }
+        public int ProcedureId { get; set; }
+        public int SymptomId { get; set; }
 
         [DisplayName("Название медикамента")]
         public string Name { get; set; } = string.Empty;
 
         [DisplayName("Комментарий")]
         public string Comment { get; set; } = string.Empty;
-        public Dictionary<int, ISymptomModel> MedicamentSymptom { get; set; } = new();
-        public Dictionary<int, IProcedureModel> MedicamentProcedure { get; set; } = new();
     }
 }
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs b/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs
index 083f25e..f98d2eb 100644
--- a/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs
+++ b/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs
@@ -14,7 +14,7 @@ namespace PolyclinicContracts.ViewModels
         public int Id { get; set; }
 
         [DisplayName("Количество процедур")]
-        public int CountProcedures { get; set; }
+        public int ProceduresCount { get; set; }
 
         [DisplayName("Комментарий")]
         public string Comment { get; set; } = string.Empty;
diff --git a/Polyclinic/PolyclinicDataModels/Enums/UserRole.cs b/Polyclinic/PolyclinicDataModels/Enums/UserRole.cs
index fbf5684..7c70dcd 100644
--- a/Polyclinic/PolyclinicDataModels/Enums/UserRole.cs
+++ b/Polyclinic/PolyclinicDataModels/Enums/UserRole.cs
@@ -5,6 +5,7 @@
         Неизвестный = -1,
         Администратор = 0,
         Исполнитель = 1,
-        Поручитель = 2
+        Поручитель = 2,
+        Клиент = 3
     }
 }
diff --git a/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
index d5fdfef..847433a 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
@@ -10,7 +10,7 @@ namespace PolyclinicDataModels.Models
     {
         string Name { get; }
         string Comment { get; }
-        Dictionary<int, ISymptomModel> MedicamentSymptom { get; }
-        Dictionary<int, IProcedureModel> MedicamentProcedure { get; }    
+        int ProcedureId { get; }
+        int SymptomId { get; }
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
index 072945a..07323a8 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
@@ -8,7 +8,7 @@ namespace PolyclinicDataModels.Models
 {
     public interface IRecipeModel : IId
     {
-        int CountProcedures { get; set; }
+        int ProceduresCount { get; set; }
         string Comment { get; set; }
         Dictionary<int, IRecipeModel> ProcedureRecipe { get; }