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 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 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 MedicamentSymptom { get; set; } = new(); - public Dictionary 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 MedicamentSymptom { get; } - Dictionary 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 ProcedureRecipe { get; }