From 07826a9fe06764085da19e052d7200a60355d394 Mon Sep 17 00:00:00 2001 From: Alenka Date: Sat, 4 May 2024 23:55:27 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D1=85=D0=BE=D0=B4=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BB=D0=B0=D0=B1=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ListProceduresBindingModel.cs | 14 +++++ .../IReportLogicDoctorcs.cs | 17 ++++++ .../SearchModels/ListProcedureSearchModel.cs | 13 +++++ .../ViewModels/ListProcedureViewModel.cs | 14 +++++ .../Controllers/HomeController.cs | 12 ++++ .../Views/Home/ProcedureListReport.cshtml | 30 ++++++++++ .../Views/Home/Report.cshtml | 55 +++++++++++++++++++ 7 files changed, 155 insertions(+) create mode 100644 Hospital/HospitalContracts/BindingModels/ListProceduresBindingModel.cs create mode 100644 Hospital/HospitalContracts/BusinessLogicContracts/IReportLogicDoctorcs.cs create mode 100644 Hospital/HospitalContracts/SearchModels/ListProcedureSearchModel.cs create mode 100644 Hospital/HospitalContracts/ViewModels/ListProcedureViewModel.cs create mode 100644 Hospital/HospitalDoctorApp/Views/Home/ProcedureListReport.cshtml create mode 100644 Hospital/HospitalDoctorApp/Views/Home/Report.cshtml diff --git a/Hospital/HospitalContracts/BindingModels/ListProceduresBindingModel.cs b/Hospital/HospitalContracts/BindingModels/ListProceduresBindingModel.cs new file mode 100644 index 0000000..5d73e6a --- /dev/null +++ b/Hospital/HospitalContracts/BindingModels/ListProceduresBindingModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalContracts.BindingModels +{ + public class ListProceduresBindingModel + { + public string FileName { get; set; } = string.Empty; + public List Recipes { get; set; } = new(); + } +} diff --git a/Hospital/HospitalContracts/BusinessLogicContracts/IReportLogicDoctorcs.cs b/Hospital/HospitalContracts/BusinessLogicContracts/IReportLogicDoctorcs.cs new file mode 100644 index 0000000..674ba2f --- /dev/null +++ b/Hospital/HospitalContracts/BusinessLogicContracts/IReportLogicDoctorcs.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HospitalContracts.BindingModels; +using HospitalContracts.ViewModels; + +namespace HospitalContracts.BusinessLogicContracts +{ + public interface IReportLogicDoctorcs + { + List GetProcedureRecipes(List animals); + void SaveServicesToWordFile(ListProceduresBindingModel model); + void SaveServicesToExcelFile(ListProceduresBindingModel model); + } +} diff --git a/Hospital/HospitalContracts/SearchModels/ListProcedureSearchModel.cs b/Hospital/HospitalContracts/SearchModels/ListProcedureSearchModel.cs new file mode 100644 index 0000000..bde786e --- /dev/null +++ b/Hospital/HospitalContracts/SearchModels/ListProcedureSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalContracts.SearchModels +{ + public class ListProcedureSearchModel + { + public List? recipesIds { get; set; } + } +} diff --git a/Hospital/HospitalContracts/ViewModels/ListProcedureViewModel.cs b/Hospital/HospitalContracts/ViewModels/ListProcedureViewModel.cs new file mode 100644 index 0000000..4e1d14f --- /dev/null +++ b/Hospital/HospitalContracts/ViewModels/ListProcedureViewModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalContracts.ViewModels +{ + public class ListProcedureViewModel + { + public string ProcedureName { get; set; } = string.Empty; + public List Procedures { get; set; } = new(); + } +} diff --git a/Hospital/HospitalDoctorApp/Controllers/HomeController.cs b/Hospital/HospitalDoctorApp/Controllers/HomeController.cs index 2e02da1..82a2e67 100644 --- a/Hospital/HospitalDoctorApp/Controllers/HomeController.cs +++ b/Hospital/HospitalDoctorApp/Controllers/HomeController.cs @@ -5,6 +5,7 @@ using HospitalDataModels.Models; using HospitalDoctorApp.Models; using Microsoft.AspNetCore.Mvc; using System.Diagnostics; +using System.IO.Pipelines; namespace HospitalDoctorApp.Controllers { @@ -505,6 +506,17 @@ View(APIClient.GetRequest>($"api/disease/getdiseases?dise return result; } [HttpGet] + public IActionResult ServiceListReport() + { + ViewBag.Animals = APIClient.GetRequest>($"api/animal/getanimallist?adminid={APIClient.Doctor.Id}"); + return View(); + } + [HttpGet] + public IActionResult Report() + { + return View(); + } + [HttpGet] public Tuple>? GetRecipe(int recipeId) { if (APIClient.Doctor == null) diff --git a/Hospital/HospitalDoctorApp/Views/Home/ProcedureListReport.cshtml b/Hospital/HospitalDoctorApp/Views/Home/ProcedureListReport.cshtml new file mode 100644 index 0000000..76eb66b --- /dev/null +++ b/Hospital/HospitalDoctorApp/Views/Home/ProcedureListReport.cshtml @@ -0,0 +1,30 @@ +@using HospitalContracts.ViewModels; + +@{ + + ViewData["Title"] = "ProcedureListReport"; +} + +
+

Создать списки процедур для рецептов

+
+ +
+ +
+
Рецепты:
+
+ +
+
+
+
+
+
+
+
diff --git a/Hospital/HospitalDoctorApp/Views/Home/Report.cshtml b/Hospital/HospitalDoctorApp/Views/Home/Report.cshtml new file mode 100644 index 0000000..b916fce --- /dev/null +++ b/Hospital/HospitalDoctorApp/Views/Home/Report.cshtml @@ -0,0 +1,55 @@ +@{ + ViewData["Title"] = "Report"; +} +
+

Список пациентов с расшифровкой по лекарствам и болезням

+
+
+ @{ + +
+
Начальная дата:
+
+ +
+
+
+
Конечная дата:
+
+ +
+
+ + + + + + + + + + + + будет заполняться вьюшками отчета + +
+ Номер + + Дата + + Пациент + + Лекарство + + Болезнь +
+
+
+
+
+
+
+
+
+ } +
\ No newline at end of file