ns.potapov/PIbd-21_Potapov_SUBD_Medical
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Финальные правки

Browse Source
This commit is contained in:
Никита Потапов 2024-05-19 16:31:22 +04:00
parent e16b154578
commit 13f4d91366
9 changed files with 180 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Medical/MedicalBusinessLogic/BusinessLogics/PatientLogic.cs
View File

@ -53,7 +53,8 @@ namespace MedicalBusinessLogic.BusinessLogics
Gender = model.Gender,
Birthday = model.Birthday,
Weight = model.Weight,
Height = model.Height
Height = model.Height,
Age = model.GetAge()
};
}
}

16
Medical/MedicalBusinessLogic/BusinessLogics/VisitLogic.cs
View File

@ -11,16 +11,19 @@ namespace MedicalBusinessLogic.BusinessLogics
private readonly IStorage<Patient> _patientStorage;
private readonly IStorage<Doctor> _doctorStorage;
private readonly IStorage<Diagnose> _diagnoseStorage;
private readonly IStorage<Specialization> _specializationStorage;
public VisitLogic(
ILogger<AbstractLogic<Visit, VisitViewModel, VisitSearchModel>> logger,
IStorage<Visit> storage,
IStorage<Patient> patientStorage,
IStorage<Doctor> doctorStorage,
IStorage<Diagnose> diagnoseStorage) : base(logger, storage)
IStorage<Diagnose> diagnoseStorage,
IStorage<Specialization> specializationStorage) : base(logger, storage)
{
_patientStorage = patientStorage;
_doctorStorage = doctorStorage;
_diagnoseStorage = diagnoseStorage;
_specializationStorage = specializationStorage;
}
protected override bool CheckModelBySearchModel(Visit model, VisitSearchModel searchModel)
@ -53,6 +56,17 @@ namespace MedicalBusinessLogic.BusinessLogics
{
throw new ArgumentNullException(nameof(model));
}
var patient = _patientStorage.Get(model.PatientId);
var doctor = _doctorStorage.Get(model.DoctorId);
var specialization = _specializationStorage.Get(doctor.SpecializationId);
if (patient.GetAge() < 18 && !specialization.IsPediatric)
{
throw new InvalidOperationException("Нельзя записать ребенка к взрослому врачу");
}
if (patient.GetAge() >= 18 && !specialization.IsTherapeutic)
{
throw new InvalidOperationException("Нельзя записать взрослого к детскому врачу");
}
if (!modelUpdate && ReadList(new VisitSearchModel {
DoctorId = model.DoctorId,
Date = model.Date,

7
Medical/MedicalDatabaseContracts/Models/Patient.cs
View File

@ -8,5 +8,12 @@ namespace MedicalDatabaseContracts.Models
public DateTime Birthday { get; set; }
public int Weight { get; set; }
public int Height { get; set; }
public int GetAge()
{
var today = DateTime.Today;
int age = today.Year - Birthday.Year;
if (Birthday.Date > today.AddYears(-age)) age--;
return age;
}
}
}

2
Medical/MedicalDatabaseContracts/ViewModels/PatientViewModel.cs
View File

@ -12,6 +12,8 @@ namespace MedicalDatabaseContracts.ViewModels
public int Weight { get; set; }
[DisplayName("Рост, см")]
public int Height { get; set; }
[DisplayName("Возраст")]
public int Age { get; set; }
public override string ToString()
{
return GetFIO() + ", " + Birthday.ToShortDateString();

4
Medical/MedicalPostgresqlDatabase/Storages/DoctorStorage.cs
View File

@ -16,7 +16,7 @@ namespace MedicalPostgresqlDatabase.Storages
Id = Convert.ToInt32(reader.GetValue(PRIMARY_KEY_COLUMN_NAME)),
Name = Convert.ToString(reader.GetValue("name")),
Surname = Convert.ToString(reader.GetValue("surname")),
Patronymic = Convert.ToString(reader.GetValue("patronymic")),
Patronymic = reader.GetValue("patronymic") is DBNull ? null : Convert.ToString(reader.GetValue("patronymic")),
PhoneNumber = Convert.ToString(reader.GetValue("phone_number")),
SpecializationId = Convert.ToInt32(reader.GetValue("specialization_id"))
};
@ -29,7 +29,7 @@ namespace MedicalPostgresqlDatabase.Storages
{ PRIMARY_KEY_COLUMN_NAME, item.Id },
{ "name", item.Name },
{ "surname", item.Surname },
{ "patronymic", item.Patronymic ?? string.Empty },
{ "patronymic", item.Patronymic },
{ "phone_number", item.PhoneNumber },
{ "specialization_id", item.SpecializationId }
};

4
Medical/MedicalPostgresqlDatabase/Storages/PatientStorage.cs
View File

@ -16,7 +16,7 @@ namespace MedicalPostgresqlDatabase.Storages
Id = Convert.ToInt32(reader.GetValue(PRIMARY_KEY_COLUMN_NAME)),
Name = Convert.ToString(reader.GetValue("name")),
Surname = Convert.ToString(reader.GetValue("surname")),
Patronymic = Convert.ToString(reader.GetValue("patronymic")),
Patronymic = reader.GetValue("patronymic") is DBNull ? null : Convert.ToString(reader.GetValue("patronymic")),
PhoneNumber = Convert.ToString(reader.GetValue("phone_number")),
Gender = Convert.ToString(reader.GetValue("gender")),
Birthday = Convert.ToDateTime(reader.GetValue("birthday")),
@ -32,7 +32,7 @@ namespace MedicalPostgresqlDatabase.Storages
{ PRIMARY_KEY_COLUMN_NAME, item.Id },
{ "name", item.Name },
{ "surname", item.Surname },
{ "patronymic", item.Patronymic ?? string.Empty },
{ "patronymic", item.Patronymic },
{ "phone_number", item.PhoneNumber },
{ "gender", item.Gender },
{ "birthday", item.Birthday },

134
Medical/MedicalView/FormMain.Designer.cs generated
View File

@ -33,18 +33,18 @@
специализацииToolStripMenuItem = new ToolStripMenuItem();
диагнозыToolStripMenuItem = new ToolStripMenuItem();
врачиToolStripMenuItem = new ToolStripMenuItem();
пациентыToolStripMenuItem1 = new ToolStripMenuItem();
PatientsToolStripMenuItem = new ToolStripMenuItem();
RefreshToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView();
panel = new Panel();
buttonClearSearch = new Button();
buttonDeleteAllData = new Button();
buttonGenerateRandomData = new Button();
buttonEdit = new Button();
buttonDelete = new Button();
buttonAdd = new Button();
dateTimePicker1 = new DateTimePicker();
comboBoxDoctor = new ComboBox();
comboBoxPatient = new ComboBox();
statusStrip = new StatusStrip();
toolStripStatusLabel = new ToolStripStatusLabel();
buttonDeleteAllData = new Button();
menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
panel.SuspendLayout();
@ -54,17 +54,17 @@
// menuStrip
//
menuStrip.ImageScalingSize = new Size(20, 20);
menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пациентыToolStripMenuItem1 });
menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, RefreshToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Padding = new Padding(7, 3, 0, 3);
menuStrip.Size = new Size(1012, 30);
menuStrip.Size = new Size(1000, 30);
menuStrip.TabIndex = 0;
menuStrip.Text = "menuStrip1";
//
// справочникиToolStripMenuItem
//
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { специализацииToolStripMenuItem, диагнозыToolStripMenuItem, врачиToolStripMenuItem });
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { специализацииToolStripMenuItem, диагнозыToolStripMenuItem, врачиToolStripMenuItem, PatientsToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24);
справочникиToolStripMenuItem.Text = "Справочники";
@ -90,12 +90,19 @@
врачиToolStripMenuItem.Text = "Врачи";
врачиToolStripMenuItem.Click += DoctorsToolStripMenuItem_Click;
//
// пациентыToolStripMenuItem1
// PatientsToolStripMenuItem
//
пациентыToolStripMenuItem1.Name = "пациентыToolStripMenuItem1";
пациентыToolStripMenuItem1.Size = new Size(94, 24);
пациентыToolStripMenuItem1.Text = "Пациенты";
пациентыToolStripMenuItem1.Click += PatientsToolStripMenuItem1_Click;
PatientsToolStripMenuItem.Name = "PatientsToolStripMenuItem";
PatientsToolStripMenuItem.Size = new Size(203, 26);
PatientsToolStripMenuItem.Text = "Пациенты";
PatientsToolStripMenuItem.Click += PatientsToolStripMenuItem_Click;
//
// RefreshToolStripMenuItem
//
RefreshToolStripMenuItem.Name = "RefreshToolStripMenuItem";
RefreshToolStripMenuItem.Size = new Size(92, 24);
RefreshToolStripMenuItem.Text = "Обновить";
RefreshToolStripMenuItem.Click += RefreshToolStripMenuItem_Click;
//
// dataGridView
//
@ -111,51 +118,58 @@
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 25;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(1012, 331);
dataGridView.Size = new Size(1000, 331);
dataGridView.TabIndex = 1;
//
// panel
//
panel.Controls.Add(buttonClearSearch);
panel.Controls.Add(buttonDeleteAllData);
panel.Controls.Add(buttonGenerateRandomData);
panel.Controls.Add(buttonEdit);
panel.Controls.Add(buttonDelete);
panel.Controls.Add(buttonAdd);
panel.Controls.Add(dateTimePicker1);
panel.Controls.Add(comboBoxDoctor);
panel.Controls.Add(comboBoxPatient);
panel.Dock = DockStyle.Top;
panel.Location = new Point(0, 30);
panel.Margin = new Padding(3, 4, 3, 4);
panel.Name = "panel";
panel.Size = new Size(1012, 39);
panel.Size = new Size(1000, 39);
panel.TabIndex = 2;
//
// buttonClearSearch
//
buttonClearSearch.Location = new Point(360, 4);
buttonClearSearch.Name = "buttonClearSearch";
buttonClearSearch.Size = new Size(94, 29);
buttonClearSearch.TabIndex = 7;
buttonClearSearch.Text = "Сбросить";
buttonClearSearch.UseVisualStyleBackColor = true;
buttonClearSearch.Click += buttonClearSearch_Click;
//
// buttonDeleteAllData
//
buttonDeleteAllData.Location = new Point(852, 2);
buttonDeleteAllData.Name = "buttonDeleteAllData";
buttonDeleteAllData.Size = new Size(143, 31);
buttonDeleteAllData.TabIndex = 6;
buttonDeleteAllData.Text = "Очистить базу";
buttonDeleteAllData.UseVisualStyleBackColor = true;
buttonDeleteAllData.Click += buttonDeleteAllData_Click;
//
// buttonGenerateRandomData
//
buttonGenerateRandomData.Location = new Point(716, 5);
buttonGenerateRandomData.Location = new Point(711, 2);
buttonGenerateRandomData.Name = "buttonGenerateRandomData";
buttonGenerateRandomData.Size = new Size(135, 29);
buttonGenerateRandomData.Size = new Size(135, 31);
buttonGenerateRandomData.TabIndex = 5;
buttonGenerateRandomData.Text = "Сгенерировать";
buttonGenerateRandomData.UseVisualStyleBackColor = true;
buttonGenerateRandomData.Click += buttonGenerateRandomData_Click;
//
// buttonEdit
//
buttonEdit.Anchor = AnchorStyles.Left;
buttonEdit.Location = new Point(478, 3);
buttonEdit.Margin = new Padding(3, 4, 3, 4);
buttonEdit.Name = "buttonEdit";
buttonEdit.Size = new Size(86, 31);
buttonEdit.TabIndex = 4;
buttonEdit.Text = "Изменить";
buttonEdit.UseVisualStyleBackColor = true;
buttonEdit.Click += buttonEdit_Click;
//
// buttonDelete
//
buttonDelete.Anchor = AnchorStyles.Left;
buttonDelete.Location = new Point(570, 3);
buttonDelete.Location = new Point(601, 2);
buttonDelete.Margin = new Padding(3, 4, 3, 4);
buttonDelete.Name = "buttonDelete";
buttonDelete.Size = new Size(86, 31);
@ -167,7 +181,7 @@
// buttonAdd
//
buttonAdd.Anchor = AnchorStyles.Left;
buttonAdd.Location = new Point(385, 3);
buttonAdd.Location = new Point(509, 2);
buttonAdd.Margin = new Padding(3, 4, 3, 4);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(86, 31);
@ -176,25 +190,18 @@
buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click;
//
// dateTimePicker1
// comboBoxPatient
//
dateTimePicker1.Anchor = AnchorStyles.Left;
dateTimePicker1.Location = new Point(207, 4);
dateTimePicker1.Margin = new Padding(3, 4, 3, 4);
dateTimePicker1.Name = "dateTimePicker1";
dateTimePicker1.Size = new Size(158, 27);
dateTimePicker1.TabIndex = 1;
//
// comboBoxDoctor
//
comboBoxDoctor.Anchor = AnchorStyles.Left;
comboBoxDoctor.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxDoctor.FormattingEnabled = true;
comboBoxDoctor.Location = new Point(3, 4);
comboBoxDoctor.Margin = new Padding(3, 4, 3, 4);
comboBoxDoctor.Name = "comboBoxDoctor";
comboBoxDoctor.Size = new Size(196, 28);
comboBoxDoctor.TabIndex = 0;
comboBoxPatient.Anchor = AnchorStyles.Left;
comboBoxPatient.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
comboBoxPatient.AutoCompleteSource = AutoCompleteSource.ListItems;
comboBoxPatient.FormattingEnabled = true;
comboBoxPatient.Location = new Point(3, 5);
comboBoxPatient.Margin = new Padding(3, 4, 3, 4);
comboBoxPatient.Name = "comboBoxPatient";
comboBoxPatient.Size = new Size(351, 28);
comboBoxPatient.TabIndex = 0;
comboBoxPatient.SelectedIndexChanged += comboBoxPatient_SelectedIndexChanged;
//
// statusStrip
//
@ -202,7 +209,7 @@
statusStrip.Items.AddRange(new ToolStripItem[] { toolStripStatusLabel });
statusStrip.Location = new Point(0, 379);
statusStrip.Name = "statusStrip";
statusStrip.Size = new Size(1012, 22);
statusStrip.Size = new Size(1000, 22);
statusStrip.TabIndex = 3;
statusStrip.Text = "statusStrip1";
//
@ -211,28 +218,18 @@
toolStripStatusLabel.Name = "toolStripStatusLabel";
toolStripStatusLabel.Size = new Size(0, 16);
//
// buttonDeleteAllData
//
buttonDeleteAllData.Location = new Point(857, 5);
buttonDeleteAllData.Name = "buttonDeleteAllData";
buttonDeleteAllData.Size = new Size(143, 29);
buttonDeleteAllData.TabIndex = 6;
buttonDeleteAllData.Text = "Очистить базу";
buttonDeleteAllData.UseVisualStyleBackColor = true;
buttonDeleteAllData.Click += buttonDeleteAllData_Click;
//
// FormMain
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1012, 401);
ClientSize = new Size(1000, 401);
Controls.Add(statusStrip);
Controls.Add(panel);
Controls.Add(dataGridView);
Controls.Add(menuStrip);
MainMenuStrip = menuStrip;
Margin = new Padding(3, 4, 3, 4);
MinimumSize = new Size(683, 438);
MinimumSize = new Size(683, 448);
Name = "FormMain";
Text = "Записи посещений";
Load += FormMain_Load;
@ -255,15 +252,16 @@
private DataGridView dataGridView;
private ToolStripMenuItem специализацииToolStripMenuItem;
private Panel panel;
private DateTimePicker dateTimePicker1;
private ComboBox comboBoxDoctor;
private ComboBox comboBoxPatient;
private ToolStripMenuItem пациентыToolStripMenuItem1;
private Button buttonDelete;
private Button buttonAdd;
private Button buttonEdit;
private StatusStrip statusStrip;
private ToolStripStatusLabel toolStripStatusLabel;
private Button buttonGenerateRandomData;
private Button buttonDeleteAllData;
private ToolStripMenuItem RefreshToolStripMenuItem;
private ToolStripMenuItem PatientsToolStripMenuItem;
private Button buttonClearSearch;
}
}

75
Medical/MedicalView/FormMain.cs
View File

@ -14,18 +14,21 @@ namespace MedicalView.Visits
{
private readonly ILogger _logger;
private readonly ILogic<Visit, VisitViewModel, VisitSearchModel> _visitLogic;
public FormMain(ILogger<FormMain> logger, ILogic<Visit, VisitViewModel, VisitSearchModel> visitLogic)
private readonly ILogic<Patient, PatientViewModel, PatientSearchModel> _patientLogic;
public FormMain(ILogger<FormMain> logger, ILogic<Visit, VisitViewModel, VisitSearchModel> visitLogic, ILogic<Patient, PatientViewModel, PatientSearchModel> patientLogic)
{
InitializeComponent();
dataGridView.CellDoubleClick += buttonEdit_Click;
dataGridView.CellContentDoubleClick += buttonEdit_Click;
_logger = logger;
_visitLogic = visitLogic;
_patientLogic = patientLogic;
}
private void FormMain_Load(object sender, EventArgs e)
{
LoadData();
LoadPatients();
//LoadData();
}
private void DiagnosesToolStripMenuItem_Click(object sender, EventArgs e)
@ -55,22 +58,21 @@ namespace MedicalView.Visits
}
}
private void PatientsToolStripMenuItem1_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormPatients));
if (service is FormPatients form)
{
form.ShowDialog();
}
}
protected virtual void LoadData()
{
SetStatusStripText("Загрузка списка...");
try
{
double elapsed;
var items = _visitLogic.ReadList(out elapsed);
VisitSearchModel? searchModel = null;
if (comboBoxPatient.SelectedIndex != -1)
{
searchModel = new VisitSearchModel { PatientId = (comboBoxPatient.SelectedItem as PatientViewModel).Id };
}
var items = _visitLogic.ReadList(out elapsed, searchModel);
dataGridView.DataSource = items;
foreach (DataGridViewTextBoxColumn column in dataGridView.Columns)
@ -103,6 +105,10 @@ namespace MedicalView.Visits
var service = Program.ServiceProvider?.GetService(typeof(FormVisit));
if (service is FormVisit form)
{
if (comboBoxPatient.SelectedIndex != -1)
{
form.PatientId = (comboBoxPatient.SelectedItem as PatientViewModel).Id;
}
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
@ -176,5 +182,50 @@ namespace MedicalView.Visits
}
}
}
private void RefreshToolStripMenuItem_Click(object sender, EventArgs e)
{
LoadPatients();
//LoadData();
}
private void PatientsToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormPatients));
if (service is FormPatients form)
{
form.ShowDialog();
LoadPatients();
}
}
private void comboBoxPatient_SelectedIndexChanged(object sender, EventArgs e)
{
LoadData();
}
private void LoadPatients()
{
var patients = _patientLogic.ReadList();
int? selectedPatientId = null;
if (comboBoxPatient.SelectedItem != null)
{
selectedPatientId = (comboBoxPatient.SelectedItem as PatientViewModel).Id;
}
comboBoxPatient.DataSource = patients;
if (selectedPatientId != null)
{
comboBoxPatient.SelectedIndex = patients.FindIndex(x => x.Id == selectedPatientId);
}
else
{
comboBoxPatient.SelectedIndex = -1;
}
}
private void buttonClearSearch_Click(object sender, EventArgs e)
{
comboBoxPatient.SelectedIndex = -1;
}
}
}

23
Medical/MedicalView/Visits/FormVisit.cs
View File

@ -15,6 +15,7 @@ namespace MedicalView.Visits
private readonly ILogic<Doctor, DoctorViewModel, DoctorSearchModel> _doctorLogic;
private readonly ILogic<Patient, PatientViewModel, PatientSearchModel> _patientLogic;
private readonly ILogic<Specialization, SpecializationViewModel, SpecializationSearchModel> _specLogic;
public int? PatientId { get; set; }
public FormVisit(
ILogger<FormVisit> logger,
ILogic<Visit, VisitViewModel, VisitSearchModel> visitLogic,
@ -44,6 +45,19 @@ namespace MedicalView.Visits
MessageBox.Show("Выберите врача", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
var patient = _patientLogic.ReadElement((comboBoxPatient.SelectedItem as PatientViewModel).Id);
var doctor = _doctorLogic.ReadElement((comboBoxDoctor.SelectedItem as DoctorViewModel).Id);
var specialization = _specLogic.ReadElement(doctor.SpecializationId);
if (patient.Age < 18 && !specialization.IsPediatric)
{
MessageBox.Show("Нельзя записать ребенка к взрослому врачу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (patient.Age >= 18 && !specialization.IsTherapeutic)
{
MessageBox.Show("Нельзя записать взрослого к детскому врачу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_logger.LogInformation("Сохранение модели приема");
try
{
@ -51,8 +65,8 @@ namespace MedicalView.Visits
{
Id = ModelId ?? 0,
Comment = textBoxComment.Text,
PatientId = (comboBoxPatient.SelectedItem as PatientViewModel).Id,
DoctorId = (comboBoxDoctor.SelectedItem as DoctorViewModel).Id,
PatientId = patient.Id,
DoctorId = doctor.Id,
DiagnoseId = comboBoxDiagnose.SelectedItem != null ? (comboBoxDiagnose.SelectedItem as DiagnoseViewModel).Id : null,
Date = DateOnly.FromDateTime(datePicker.Value),
Time = TimeOnly.FromDateTime(timePicker.Value)
@ -87,6 +101,11 @@ namespace MedicalView.Visits
comboBoxPatient.DataSource = patients;
comboBoxPatient.SelectedIndex = -1;
if (PatientId.HasValue)
{
comboBoxPatient.SelectedIndex = patients.FindIndex(x => x.Id == PatientId);
}
comboBoxDoctor.DataSource = doctors;
comboBoxDoctor.SelectedIndex = -1;