From 296a2845ecb928c4fcb9db765546e33471a89057 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Wed, 17 Apr 2024 23:33:33 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20=D0=A4?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B1?= =?UTF-8?q?=D0=B8=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=20=D0=BC=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolyclinicContracts/BindingModels/.gitkeep | 0 .../BindingModels/CourseBindingModel.cs | 14 ++++++++++++++ .../BindingModels/DiagnosisBindingModel.cs | 12 ++++++++++++ .../BindingModels/ExecutorBindingModel.cs | 12 ++++++++++++ .../BindingModels/SymptomBindingModel.cs | 13 +++++++++++++ .../PolyclinicContracts/PolyclinicContracts.csproj | 5 ++++- .../PolyclinicDataModels/Models/ICourseModel.cs | 2 +- .../PolyclinicDataModels/Models/IDiagnosisModel.cs | 4 ++-- .../PolyclinicDataModels/Models/IExecutorModel.cs | 2 +- 9 files changed, 59 insertions(+), 5 deletions(-) delete mode 100644 Polyclinic/PolyclinicContracts/BindingModels/.gitkeep create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs diff --git a/Polyclinic/PolyclinicContracts/BindingModels/.gitkeep b/Polyclinic/PolyclinicContracts/BindingModels/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs new file mode 100644 index 0000000..611bfe5 --- /dev/null +++ b/Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs @@ -0,0 +1,14 @@ +using PolyclinicDataModels.Models; + +namespace PolyclinicContracts.BindingModels +{ + public class CourseBindingModel : ICourseModel + { + public int DaysCount { get; set; } + public int PillsPerDay { get; set; } + public string Comment { get; set; } = string.Empty; + public Dictionary CourseDiagnosis { get; set; } = new(); + public Dictionary CourseRecipes { get; set; } = new(); + public int Id { get; set; } + } +} diff --git a/Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs new file mode 100644 index 0000000..9d936df --- /dev/null +++ b/Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs @@ -0,0 +1,12 @@ +using PolyclinicDataModels.Models; + +namespace PolyclinicContracts.BindingModels +{ + public class DiagnosisBindingModel : IDiagnosisModel + { + public string Name { get; set; } = string.Empty; + public string Comment { get; set; } = string.Empty; + public int ExecutorId { get; set; } + public int Id { get; set; } + } +} diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs new file mode 100644 index 0000000..f97a6fe --- /dev/null +++ b/Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs @@ -0,0 +1,12 @@ +using PolyclinicDataModels.Models; + +namespace PolyclinicContracts.BindingModels +{ + public class ExecutorBindingModel : IExecutorModel + { + public string FIO { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + public int Id { get; set; } + } +} diff --git a/Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs new file mode 100644 index 0000000..bc4c191 --- /dev/null +++ b/Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs @@ -0,0 +1,13 @@ +using PolyclinicDataModels.Models; + +namespace PolyclinicContracts.BindingModels +{ + public class SymptomBindingModel : ISymptomModel + { + public string Name { get; set; } = string.Empty; + public string Comment { get; set; } = string.Empty; + public Dictionary SymptomDiagnosis { get; set; } = new(); + public Dictionary SymptomRecipes { get; set; } = new(); + public int Id { get; set; } + } +} diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj index d7f6b16..8eca715 100644 --- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj +++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj @@ -7,11 +7,14 @@ - + + + + diff --git a/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs b/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs index acd5ed7..f018879 100644 --- a/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs +++ b/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs @@ -1,6 +1,6 @@ namespace PolyclinicDataModels.Models { - public interface ICourseModel + public interface ICourseModel : IId { int DaysCount { get; } int PillsPerDay { get; } diff --git a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs index 484e6e9..7e23ea8 100644 --- a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs +++ b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs @@ -1,9 +1,9 @@ namespace PolyclinicDataModels.Models { - public interface IDiagnosisModel + public interface IDiagnosisModel : IId { string Name { get; } string Comment { get; } - string ExecutorId { get; } + int ExecutorId { get; } } } diff --git a/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs b/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs index 8806f42..44b0365 100644 --- a/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs +++ b/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs @@ -1,6 +1,6 @@ namespace PolyclinicDataModels.Models { - public interface IExecutorModel + public interface IExecutorModel : IId { string FIO { get; } string Email { get; }