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();
     }
 }

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();
 
     }
 }

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();
 
     }
 }

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; }    
     }
 }

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; }
     }
 }

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; }
+
     }
 }