From 0d85b6f4b4ff9a4b81405fec5a92557ba3ff9ab2 Mon Sep 17 00:00:00 2001 From: Bulat Date: Fri, 20 Dec 2024 10:01:46 +0400 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D1=87=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Doctor.cs | 2 +- .../Entities/DoctorPayments.cs | 3 --- .../Entities/Drug.cs | 2 +- .../Entities/DrugMedicalHistory.cs | 2 +- .../Entities/MedicalHistory.cs | 16 ++-------------- .../Forms/FormDoctor.cs | 4 +--- .../Forms/FormDoctorPayment.cs | 4 ---- .../Forms/FormDoctors.cs | 6 +----- .../Reports/TableReport.cs | 4 ++-- 9 files changed, 9 insertions(+), 34 deletions(-) diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Doctor.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Doctor.cs index b1e00d3..4850987 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Doctor.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Doctor.cs @@ -20,7 +20,7 @@ public class Doctor public string FullName => $"{Last_Name} {First_Name}"; [DisplayName("Должность")] - public DoctorPost DoctorPost { get; private set; } // объявляется свойство DoctorPost, которое имеет тип DoctorPost + public DoctorPost DoctorPost { get; private set; } public static Doctor CreateEntity(int id, string first_Name, string last_Name, DoctorPost doctorPost) { diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DoctorPayments.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DoctorPayments.cs index 46b95c4..15228cd 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DoctorPayments.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DoctorPayments.cs @@ -24,8 +24,6 @@ public class DoctorPayments public int Count_Patient { get; private set; } - //[DisplayName("Дата оплаты")] - //public DateTime DoctorPaymentData { get; private set; } [DisplayName("Оплата")] public int Payment { get; private set; } @@ -37,7 +35,6 @@ public class DoctorPayments IdDoctor = idDoctor, Month = month, Count_Patient = count_patient, - // DoctorPaymentData = DateTime.Now, Payment = payment }; } diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Drug.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Drug.cs index fdb03f1..5225770 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Drug.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/Drug.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace RegistrationPatientsPolyclinic.Entities; -public class Drug // Наподобие Feed +public class Drug { public int Id { get; private set; } diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DrugMedicalHistory.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DrugMedicalHistory.cs index caf9098..4ab6e2c 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DrugMedicalHistory.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/DrugMedicalHistory.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace RegistrationPatientsPolyclinic.Entities; -public class DrugMedicalHistory // Тоже самое что FeedFeedRepleshments +public class DrugMedicalHistory { public int Id { get; private set; } diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/MedicalHistory.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/MedicalHistory.cs index f01decc..6cd71bc 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/MedicalHistory.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Entities/MedicalHistory.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace RegistrationPatientsPolyclinic.Entities; -public class MedicalHistory // сущность пополнения, наподобие FeedReplenushment +public class MedicalHistory { public int Id { get; private set; } @@ -49,19 +49,7 @@ public class MedicalHistory // сущность пополнения, напо DrugMedicalHistory = drugMedicalHistory }; } - /* - public static MedicalHistory CreateOpeartion(TempDrugMedicalHistory tempDrugMedicalHistory, IEnumerable drugMedicalHistories) - { - return new MedicalHistory - { - Id = tempDrugMedicalHistory.Id, - PatientId = tempDrugMedicalHistory.PatientId, - DoctorId = tempDrugMedicalHistory.DoctorId, - VisitDate = tempDrugMedicalHistory.VisitDate, - DrugMedicalHistory = drugMedicalHistories - }; - } - */ + public void SetDrugMedHistory(IEnumerable drugMedicalHistory) { if (drugMedicalHistory != null && drugMedicalHistory.Any()) diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctor.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctor.cs index 6965cc6..a611eb1 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctor.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctor.cs @@ -16,8 +16,6 @@ namespace RegistrationPatientsPolyclinic.Forms { public partial class FormDoctor : Form { - // Понадобиться интерфейс работника - // так же будет сеттер с id private readonly IDoctorRepository _doctorRepository; @@ -53,7 +51,7 @@ namespace RegistrationPatientsPolyclinic.Forms _doctorRepository = doctorRepository ?? throw new ArgumentNullException(nameof(doctorRepository)); - comboBoxPost.DataSource = Enum.GetValues(typeof(DoctorPost)); // вытащи значение из этого перечисления, вернет массив строк, т.е. массив тпеих элементов(DoctorPost) + comboBoxPost.DataSource = Enum.GetValues(typeof(DoctorPost)); } private void ButtonSave_Click(object sender, EventArgs e) diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctorPayment.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctorPayment.cs index 6dff994..f5be442 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctorPayment.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctorPayment.cs @@ -36,18 +36,15 @@ namespace RegistrationPatientsPolyclinic.Forms throw new Exception("Имеются не заполненные поля"); } - // Получаем значение из первой строки колонки ColumnMonth string month = dataGridViewPayment.Rows[0].Cells["ColumnMonth"].Value?.ToString(); int countPatient = int.Parse(dataGridViewPayment.Rows[0].Cells["ColumnCount"].Value?.ToString() ?? "0"); int payment = int.Parse(dataGridViewPayment.Rows[0].Cells["ColumnPayment"].Value?.ToString() ?? "0"); - // Проверяем, что месяц не пустой if (string.IsNullOrEmpty(month)) { throw new Exception("Месяц не заполнен"); } - // Создаем элемент DoctorPayments _doctorPaymentsRepository.CreateDoctorPayments(DoctorPayments.CreateElement(0, (int)comboBoxDoctor.SelectedValue!, month, countPatient, payment)); @@ -71,7 +68,6 @@ namespace RegistrationPatientsPolyclinic.Forms { continue; } - // ДОДЕЛАТЬ!!! list.Add(DoctorPayments.CreateElement(0, 0, row.Cells["ColumnMonth"].Value.ToString(), Convert.ToInt32(row.Cells["ColumnCount"].Value), Convert.ToInt32(row.Cells["ColumnPayment"].Value))); } diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctors.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctors.cs index 1c90a95..a29e80a 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctors.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Forms/FormDoctors.cs @@ -15,8 +15,6 @@ namespace RegistrationPatientsPolyclinic.Forms { public partial class FormDoctors : Form { - // Здесь понадобится экземпляр IUnity контейнер через который мы будем создавать объекты FormDoctor и вызывать его - // IPatientRepository через который мы будем получать список private readonly IUnityContainer _container; @@ -25,7 +23,7 @@ namespace RegistrationPatientsPolyclinic.Forms public FormDoctors(IUnityContainer container, IDoctorRepository doctorRepository) { InitializeComponent(); - _container = container ?? // мы получаем через контейнер объект + _container = container ?? throw new ArgumentNullException(nameof(container)); _doctorRepository = doctorRepository ?? throw new ArgumentNullException(nameof(doctorRepository)); ; @@ -33,7 +31,6 @@ namespace RegistrationPatientsPolyclinic.Forms private void FormDoctors_Load(object sender, EventArgs e) { - // метод, при загрузки формы будет прогружаться все данные try { LoadList(); @@ -43,7 +40,6 @@ namespace RegistrationPatientsPolyclinic.Forms MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - // отдельный метод который будет загружать в GridView private void LoadList() { diff --git a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Reports/TableReport.cs b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Reports/TableReport.cs index 1b14c80..3059bab 100644 --- a/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Reports/TableReport.cs +++ b/RegistrationPatientsPolyclinic/RegistrationPatientsPolyclinic/Reports/TableReport.cs @@ -57,13 +57,13 @@ internal class TableReport .AddParagraph($"За период с {startOfMonth:MMMM yyyy} по {endOfMonth:MMMM yyyy}", 0) .AddParagraph($"Врач: {doctorFullName}", 0) .AddTable(new[] { 25, 25, 25 }, tableData); - + /* excelBuilder.AddParagraph("", 0); excelBuilder .AddHeader("Назначенные лекарства", 0, 2) .AddTable(new[] { 25, 25 }, GetDrugData(doctorId, startOfMonth, endOfMonth)); - + */ excelBuilder.Build(); return true; }