From c6344cbf816c2ada369b4801aa9666fa0533ac5f 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: Wed, 17 Apr 2024 23:03:34 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B5=D0=BD=D0=B0.=20=D0=B2=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=D0=BA=D0=BE=D0=BD=D0=B5=D1=86=20=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=81=D0=B2=D1=8F=D0=B7?=
 =?UTF-8?q?=D0=B8=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=B5=20=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/MedicamentBindingModel.cs                   | 4 ++--
 .../BindingModels/ProcedureBindingModel.cs                    | 2 +-
 .../PolyclinicContracts/BindingModels/RecipeBindingModel.cs   | 2 +-
 Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs    | 4 ++--
 Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs     | 3 +--
 Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs        | 3 ++-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
index cd56332..20af809 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/MedicamentBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment { get; set; } = string.Empty;
-        public Dictionary<int, (ISymptomModel, int)> MedicamentSymptom { get; set; } = new();
-        public Dictionary<int, (IProcedureModel, int)> MedicamentProcedure { get; set; } = new();
+        public Dictionary<int, ISymptomModel> MedicamentSymptom { get; set; } = new();
+        public Dictionary<int, IProcedureModel> MedicamentProcedure { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
index 2ce8983..c023140 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/ProcedureBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Comment {  get; set; } = string.Empty;
-        public Dictionary<int, (IRecipeModel, int)> ProcedureReciept { get; set; } = new();
+        public Dictionary<int, ICourseModel> ProcedureCourse { get; set; } = new();
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
index 1f61791..30560d2 100644
--- a/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
+++ b/Polyclinic/PolyclinicContracts/BindingModels/RecipeBindingModel.cs
@@ -12,7 +12,7 @@ namespace PolyclinicContracts.BindingModels
         public int Id { get; set; }
         public int CountProcedures { get; set; }
         public string Comment { get; set; } = string.Empty;
-        public Dictionary<int, (ICourseModel, int)> RecipeCourse { get; set; } = new();
+        public Dictionary<int, IRecipeModel> ProcedureRecipe { get; set; } = new();
 
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs b/Polyclinic/PolyclinicDataModels/Models/IMedicamentModel.cs
index 620c826..d5fdfef 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, int)> MedicamentSymptom { get; }    
-        Dictionary<int, (IProcedureModel, int)> MedicamentProcedure { get; }    
+        Dictionary<int, ISymptomModel> MedicamentSymptom { get; }
+        Dictionary<int, IProcedureModel> MedicamentProcedure { get; }    
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
index 60eed98..2a3345d 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IProcedureModel.cs
@@ -10,7 +10,6 @@ namespace PolyclinicDataModels.Models
     {
         string Name { get; }
         string Comment { get; }
-        Dictionary<int, (IRecipeModel, int)> ProcedureReciept { get; }
-
+        Dictionary<int, ICourseModel> ProcedureCourse { get; }
     }
 }
\ No newline at end of file
diff --git a/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
index d5f2144..072945a 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IRecipeModel.cs
@@ -10,6 +10,7 @@ namespace PolyclinicDataModels.Models
     {
         int CountProcedures { get; set; }
         string Comment { get; set; }
-        Dictionary<int, (ICourseModel, int)> RecipeCourse { get; }
+        Dictionary<int, IRecipeModel> ProcedureRecipe { get; }
+
     }
 }
\ No newline at end of file