From 9e8c7b46d2a58ee5a26770b8994b003465816ab2 Mon Sep 17 00:00:00 2001
From: Alenka <Alenka@DESKTOP-ANJF2LU>
Date: Sat, 27 Apr 2024 22:21:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HospitalContracts/BindingModels/MedicineBindingModel.cs   | 3 +--
 .../HospitalContracts/BindingModels/ProcedureBindingModel.cs  | 4 ++--
 Hospital/HospitalContracts/ViewModels/MedicineViewModel.cs    | 3 +--
 Hospital/HospitalContracts/ViewModels/ProcedureViewModel.cs   | 4 ++--
 Hospital/HospitalDataModels/Models/IMedicineModel.cs          | 3 +--
 Hospital/HospitalDataModels/Models/IProcedureModel.cs         | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Hospital/HospitalContracts/BindingModels/MedicineBindingModel.cs b/Hospital/HospitalContracts/BindingModels/MedicineBindingModel.cs
index 9892b8d..13349f7 100644
--- a/Hospital/HospitalContracts/BindingModels/MedicineBindingModel.cs
+++ b/Hospital/HospitalContracts/BindingModels/MedicineBindingModel.cs
@@ -15,7 +15,6 @@ namespace HospitalContracts.BindingModels
         public double Price { get; set; }
         public int Id { get; set; }
         public int PharmacistId { get; set; }
-        public Dictionary<int, IProcedureModel> MedicineProcedures { get; set; } = new();
-        public Dictionary<int, IRecipeModel> MedicineRecipes { get; set; } = new();
+        
     }
 }
diff --git a/Hospital/HospitalContracts/BindingModels/ProcedureBindingModel.cs b/Hospital/HospitalContracts/BindingModels/ProcedureBindingModel.cs
index aa44d5f..1a6538c 100644
--- a/Hospital/HospitalContracts/BindingModels/ProcedureBindingModel.cs
+++ b/Hospital/HospitalContracts/BindingModels/ProcedureBindingModel.cs
@@ -19,8 +19,8 @@ namespace HospitalContracts.BindingModels
             public int PharmacistId { get; set; }
 
             public int Id { get; set; }
-            public Dictionary<int, IMedicineModel> MedicineProcedures { get; set; } = new();
-            public Dictionary<int, IPatientModel> PatientProcedures { get; set; } = new();
+            public Dictionary<int, IMedicineModel> ProcedureMedicines { get; set; } = new();
+            
     }
     }
 
diff --git a/Hospital/HospitalContracts/ViewModels/MedicineViewModel.cs b/Hospital/HospitalContracts/ViewModels/MedicineViewModel.cs
index ff90dac..73ffa42 100644
--- a/Hospital/HospitalContracts/ViewModels/MedicineViewModel.cs
+++ b/Hospital/HospitalContracts/ViewModels/MedicineViewModel.cs
@@ -20,7 +20,6 @@ namespace HospitalContracts.ViewModels
 
         [DisplayName("Фармацевт")]
         public int PharmacistId { get; set; }
-        public Dictionary<int, IProcedureModel> MedicineProcedures { get; set; } = new();
-        public Dictionary<int, IRecipeModel> MedicineRecipes { get; set; } = new();
+       
     }
 }
diff --git a/Hospital/HospitalContracts/ViewModels/ProcedureViewModel.cs b/Hospital/HospitalContracts/ViewModels/ProcedureViewModel.cs
index 132b6cc..3fae7f3 100644
--- a/Hospital/HospitalContracts/ViewModels/ProcedureViewModel.cs
+++ b/Hospital/HospitalContracts/ViewModels/ProcedureViewModel.cs
@@ -20,7 +20,7 @@ namespace HospitalContracts.ViewModels
         public int PharmacistId { get; set; }
         [DisplayName("Описание процедуры")]
         public int DescriptionOfTheProcedureId { get; set; }
-        public Dictionary<int, IMedicineModel> MedicineProcedures { get; set; } = new();
-        public Dictionary<int, IPatientModel> PatientProcedures { get; set; } = new();
+        public Dictionary<int, IMedicineModel> ProcedureMedicines { get; set; } = new();
+        
     }
 }
diff --git a/Hospital/HospitalDataModels/Models/IMedicineModel.cs b/Hospital/HospitalDataModels/Models/IMedicineModel.cs
index 438ba57..8dd96e7 100644
--- a/Hospital/HospitalDataModels/Models/IMedicineModel.cs
+++ b/Hospital/HospitalDataModels/Models/IMedicineModel.cs
@@ -12,7 +12,6 @@ namespace HospitalDataModels.Models
         string CountryOrigin { get; }
         double Price { get; }
         int PharmacistId { get; }
-        /*Dictionary<int, IProcedureModel> MedicineProcedures { get; }*/
-        Dictionary<int, IRecipeModel> MedicineRecipes { get; } //во всех сущностях проверить связи*/
+       
     }
 }
diff --git a/Hospital/HospitalDataModels/Models/IProcedureModel.cs b/Hospital/HospitalDataModels/Models/IProcedureModel.cs
index 38d13cf..9a6deac 100644
--- a/Hospital/HospitalDataModels/Models/IProcedureModel.cs
+++ b/Hospital/HospitalDataModels/Models/IProcedureModel.cs
@@ -14,7 +14,7 @@ namespace HospitalDataModels.Models
             int PharmacistId { get; }
         Dictionary<int, IMedicineModel> ProcedureMedicines { get; }
 
-        //Dictionary<int, IPatientModel> PatientProcedures { get; }//проверка коммита
+        
         }
     }