diff --git a/Polyclinic/PolyclinicBusinessLogic/PolyclinicBusinessLogic.csproj b/Polyclinic/PolyclinicBusinessLogic/PolyclinicBusinessLogic.csproj index 968b6ae..fa12928 100644 --- a/Polyclinic/PolyclinicBusinessLogic/PolyclinicBusinessLogic.csproj +++ b/Polyclinic/PolyclinicBusinessLogic/PolyclinicBusinessLogic.csproj @@ -9,7 +9,7 @@ - + diff --git a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs index af24ea7..1ae776e 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs +++ b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs @@ -425,8 +425,10 @@ namespace PolyclinicWebAppSuretor.Controllers _suretorReportLogic.SaveProceduresToPdfFile(reportBindingModel); // Чтение сгенерированного файла - var fileBytes = System.IO.File.ReadAllBytes(reportBindingModel.FileName); + //var fileBytes = System.IO.File.ReadAllBytes(reportBindingModel.FileName); var fileName = "ProceduresReport.pdf"; + var filePath = Path.Combine(Directory.GetCurrentDirectory(), fileName); + byte[] fileBytes = System.IO.File.ReadAllBytes(filePath); // Возвращаем файл в виде скачиваемого контента return File(fileBytes, "application/pdf", fileName); diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ProceduresReport.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ProceduresReport.cshtml index 9f4a5ca..f1c29f1 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ProceduresReport.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/ProceduresReport.cshtml @@ -1,7 +1,7 @@ п»ї@using PolyclinicContracts.ViewModels @model List @{ - ViewData["Title"] = "ProceduresReport"; + ViewData["Title"] = "Отчет РїРѕ процедурам"; }
@@ -53,13 +53,9 @@ @item.DateStopProcedure?.ToShortDateString() - - @* @string.Join("
", item.MedicamentSymptom.Select(ms => ms.medicamentName)) - @string.Join("
", item.MedicamentSymptom.Select(ms => ms.symptomName)) *@ @foreach (var ms in item.MedicamentSymptom) { - @@ -68,9 +64,7 @@ @ms.medicamentName @ms.symptomName - } - }