From 9dcefabf6308f744ea061c9f8f4ee9015d0fac02 Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 12 Oct 2023 15:13:00 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81=E0=B8=9A?= =?UTF-8?q?=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B8=9C=E0=B8=A5=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ProbationReportRepository.cs | 5 + .../Controllers/ProbationReportController.cs | 294 ++---------------- ...ļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp | Bin 0 -> 2252 bytes ...Ēāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp | Bin 2147 -> 2089 bytes 4 files changed, 39 insertions(+), 260 deletions(-) create mode 100644 BMA.EHR.Report.Service/Reports/18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index c4bfa0c4..930ebad6 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -282,6 +282,11 @@ namespace BMA.EHR.Application.Repositories.Reports ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name, ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, ChairmanDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "āļ§āļąāļ™āļ—āļĩāđˆ āđ€āļ”āļ·āļ­āļ™ āļž.āļĻ." : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Name = evaluate_assign.data.experimentee.name, + RoundNo = evaluate_assign.data.assign.round_no.ToString().ToThaiNumber(), + DateStart = string.IsNullOrEmpty(evaluate_assign.data.assign.date_start.ToString()) ? "āļ§āļąāļ™āļ—āļĩāđˆ āđ€āļ”āļ·āļ­āļ™ āļž.āļĻ." : DateTime.Parse(evaluate_assign.data.assign.date_start).ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_assign.data.assign.date_finish.ToString()) ? "āļ§āļąāļ™āļ—āļĩāđˆ āđ€āļ”āļ·āļ­āļ™ āļž.āļĻ." : DateTime.Parse(evaluate_assign.data.assign.date_finish).ToThaiFullDate().ToString().ToThaiNumber(), + }; } else diff --git a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs index f755da97..5dc32077 100644 --- a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs @@ -228,7 +228,7 @@ namespace BMA.EHR.Report.Service.Controllers } #endregion - #region 14-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļ”āļđāđāļĨ āđāļĨāļ° āļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē + #region 14,15-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļ”āļđāđāļĨ āđāļĨāļ° āļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē /// /// 14-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļ”āļđāđāļĨ āđāļĨāļ° āļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē /// @@ -500,166 +500,6 @@ namespace BMA.EHR.Report.Service.Controllers } #endregion - #region 15-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē (āļĒāļāđ€āļĨāļīāļāđƒāļŠāđ‰āļ‡āļēāļ™) - ///// - ///// 15-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē - ///// - ///// id - ///// pdf, docx āļŦāļĢāļ·āļ­ xlsx - ///// - ///// āđ€āļĄāļ·āđˆāļ­āļ—āļģāļāļēāļĢāļ­āđˆāļēāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāļˆāļēāļ Relational Database āļŠāļģāđ€āļĢāđ‡āļˆ - ///// āđ„āļĄāđˆāđ„āļ”āđ‰ Login āđ€āļ‚āđ‰āļēāļĢāļ°āļšāļš - ///// āđ€āļĄāļ·āđˆāļ­āđ€āļāļīāļ”āļ‚āđ‰āļ­āļœāļīāļ”āļžāļĨāļēāļ”āđƒāļ™āļāļēāļĢāļ—āļģāļ‡āļēāļ™ - //[HttpGet("15/{exportType}/{id}")] - //public async Task> GetProbation15ConvertReportAsync(Guid id, string exportType = "pdf") - //{ - // try - // { - // string authorizationHeader = Request.Headers["Authorization"]; - // string token = string.Empty; - - // if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) - // { - // token = authorizationHeader.Substring("Bearer ".Length).Trim(); - // var evaluateRecord = await _repository.GetEvaluateRecordAsync(id, token); - - // if (evaluateRecord != null) - // { - // var mimeType = ""; - // switch (exportType.Trim().ToLower()) - // { - // case "pdf": mimeType = "application/pdf"; break; - // case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; - // case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; - // } - - // var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"15-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē-1.trdp"); - // var rptFile2 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"15-āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē-2.trdp"); - - // ReportPackager reportPacker = new ReportPackager(); - // Telerik.Reporting.Report? report = null; - // Telerik.Reporting.Report? report2 = null; - - // using (var sourceStream = System.IO.File.OpenRead(rptFile)) - // using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) - // { - // report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); - // report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); - // } - - // report.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); - // report.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); - // report.ReportParameters["ExperimenteeName"].Value = evaluateRecord.GetType().GetProperty("ExperimenteeName").GetValue(evaluateRecord); - // report.ReportParameters["ExperimenteePosition"].Value = evaluateRecord.GetType().GetProperty("ExperimenteePosition").GetValue(evaluateRecord); - // report.ReportParameters["Department"].Value = evaluateRecord.GetType().GetProperty("Department").GetValue(evaluateRecord); - // report.ReportParameters["OrganizationOrganization"].Value = evaluateRecord.GetType().GetProperty("OrganizationOrganization").GetValue(evaluateRecord); - // report.ReportParameters["Oc"].Value = evaluateRecord.GetType().GetProperty("Oc").GetValue(evaluateRecord); - // report.ReportParameters["DateStart"].Value = evaluateRecord.GetType().GetProperty("DateStart").GetValue(evaluateRecord); - // report.ReportParameters["DateFinish"].Value = evaluateRecord.GetType().GetProperty("DateFinish").GetValue(evaluateRecord); - // report.ReportParameters["AchievementStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc1").GetValue(evaluateRecord); - // report.ReportParameters["AchievementStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc2").GetValue(evaluateRecord); - // report.ReportParameters["AchievementStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc3").GetValue(evaluateRecord); - // report.ReportParameters["AchievementImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc1").GetValue(evaluateRecord); - // report.ReportParameters["AchievementImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc2").GetValue(evaluateRecord); - // report.ReportParameters["AchievementImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc3").GetValue(evaluateRecord); - // report2.ReportParameters["BehaviorStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc1").GetValue(evaluateRecord); - // report2.ReportParameters["BehaviorStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc2").GetValue(evaluateRecord); - // report2.ReportParameters["BehaviorStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc3").GetValue(evaluateRecord); - // report2.ReportParameters["BehaviorImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc1").GetValue(evaluateRecord); - // report2.ReportParameters["BehaviorImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc2").GetValue(evaluateRecord); - // report2.ReportParameters["BehaviorImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc3").GetValue(evaluateRecord); - // report2.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); - // report2.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); - // report2.ReportParameters["MentorDate"].Value = evaluateRecord.GetType().GetProperty("MentorDate").GetValue(evaluateRecord); - - // var _evaluateslist = new List(); - // dynamic evaluates = evaluateRecord.GetType().GetProperty("Evaluates").GetValue(evaluateRecord); - // foreach (var evaluate in evaluates) - // { - // string Evaluate_expect_desc = string.Empty; - // string Evaluate_output_desc = string.Empty; - // int Evaluate_expect_level = 0; - // int Evaluate_output_level = 0; - // string Check_expect1 = string.Empty; - // string Check_expect2 = string.Empty; - // string Check_expect3 = string.Empty; - // string Check_expect4 = string.Empty; - // string Check_expect5 = string.Empty; - // string Check_output1 = string.Empty; - // string Check_output2 = string.Empty; - // string Check_output3 = string.Empty; - // string Check_output4 = string.Empty; - // string Check_output5 = string.Empty; - // var achievements = evaluate.achievements; - // foreach (var achievement in achievements) - // { - // Evaluate_expect_desc = achievement.evaluate_expect_desc; - // Evaluate_output_desc = achievement.evaluate_output_desc; - // Evaluate_expect_level = achievement.evaluate_expect_level; - // Evaluate_output_level = achievement.evaluate_output_level; - // } - // _evaluateslist.Add(new - // { - // No = evaluate.no, - // Date_start = evaluate.date_start, - // Date_finish = evaluate.date_finish, - // Evaluate_expect_desc = $" - {Evaluate_expect_desc}", - // Evaluate_output_desc = $" - {Evaluate_output_desc}", - // Check_expect1 = Evaluate_expect_level == 1 ? "/" : string.Empty, - // Check_expect2 = Evaluate_expect_level == 2 ? "/" : string.Empty, - // Check_expect3 = Evaluate_expect_level == 3 ? "/" : string.Empty, - // Check_expect4 = Evaluate_expect_level == 4 ? "/" : string.Empty, - // Check_expect5 = Evaluate_expect_level == 5 ? "/" : string.Empty, - // Check_output1 = Evaluate_output_level == 1 ? "/" : string.Empty, - // Check_output2 = Evaluate_output_level == 2 ? "/" : string.Empty, - // Check_output3 = Evaluate_output_level == 3 ? "/" : string.Empty, - // Check_output4 = Evaluate_output_level == 4 ? "/" : string.Empty, - // Check_output5 = Evaluate_output_level == 5 ? "/" : string.Empty, - // ApplyLevel = evaluate.apply_level, - // AchievementStrengthDesc = evaluate.achievement_strength_desc, - // AchievementImproveDesc = evaluate.achievement_improve_desc, - - // }); - // } - - // var tblEvaluate_1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; - // tblEvaluate_1.DataSource = _evaluateslist; - - // var tblEvaluate_2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; - // tblEvaluate_2.DataSource = _evaluateslist; - - // var reportBook = new ReportBook(); - // reportBook.Reports.Add(report); - // reportBook.Reports.Add(report2); - - // System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); - // InstanceReportSource instanceReportSource = new InstanceReportSource() - // { - // ReportDocument = reportBook, - // }; - - // ReportProcessor reportProcessor = new ReportProcessor(_configuration); - // RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); - // var content = result.DocumentBytes; - // return File(content, mimeType, $"āđāļšāļšāļšāļąāļ™āļ—āļķāļāļœāļĨ(āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē).{exportType.Trim().ToLower()}"); - // } - // else - // { - // return NotFound(); - // } - // } - // else - // { - // return Unauthorized(); - // } - // } - // catch - // { - // throw; - // } - //} - #endregion - #region 16-āđāļšāļšāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē /// /// 16-āđāļšāļšāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļē @@ -1123,89 +963,7 @@ namespace BMA.EHR.Report.Service.Controllers } #endregion - #region 18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™ (āļĒāļāđ€āļĨāļīāļāđƒāļŠāđ‰āļ‡āļēāļ™) - ///// - ///// 18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™ - ///// - ///// assign_id - ///// pdf, docx āļŦāļĢāļ·āļ­ xlsx - ///// - ///// āđ€āļĄāļ·āđˆāļ­āļ—āļģāļāļēāļĢāļ­āđˆāļēāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāļˆāļēāļ Relational Database āļŠāļģāđ€āļĢāđ‡āļˆ - ///// āđ„āļĄāđˆāđ„āļ”āđ‰ Login āđ€āļ‚āđ‰āļēāļĢāļ°āļšāļš - ///// āđ€āļĄāļ·āđˆāļ­āđ€āļāļīāļ”āļ‚āđ‰āļ­āļœāļīāļ”āļžāļĨāļēāļ”āđƒāļ™āļāļēāļĢāļ—āļģāļ‡āļēāļ™ - //[HttpGet("18/{exportType}/{id}")] - //public async Task> GetProbation18ConvertReportAsync(string id="9e8ec043-9f18-4f9a-bcde-3d11c909df19", string exportType = "pdf") - //{ - // try - // { - // Guid Id = Guid.Parse(id); - // string authorizationHeader = Request.Headers["Authorization"]; - // string token = string.Empty; - - // if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) - // { - // token = authorizationHeader.Substring("Bearer ".Length).Trim(); - // var evaluateAssign = await _repository.GetEvaluateResultAssignAsync(Id, token); - - // if (evaluateAssign != null) - // { - // var mimeType = ""; - // switch (exportType.Trim().ToLower()) - // { - // case "pdf": mimeType = "application/pdf"; break; - // case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; - // case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; - // } - - // var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp"); - - // ReportPackager reportPacker = new ReportPackager(); - // Telerik.Reporting.Report? report = null; - // //Telerik.Reporting.Report? report2 = null; - - - // using (var sourceStream = System.IO.File.OpenRead(rptFile)) - // //using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) - // { - // report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); - // //report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); - // } - - // report.ReportParameters["Name"].Value = evaluateAssign.GetType().GetProperty("Name").GetValue(evaluateAssign); - - // var reportBook = new ReportBook(); - // reportBook.Reports.Add(report); - // //reportBook.Reports.Add(report2); - - // System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); - // InstanceReportSource instanceReportSource = new InstanceReportSource() - // { - // ReportDocument = reportBook, - // }; - - // ReportProcessor reportProcessor = new ReportProcessor(_configuration); - // RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); - // var content = result.DocumentBytes; - // return File(content, mimeType, $"āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨ(āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™).{exportType.Trim().ToLower()}"); - // } - // else - // { - // return NotFound(); - // } - // } - // else - // { - // return Unauthorized(); - // } - // } - // catch - // { - // throw; - // } - //} - #endregion - - #region 19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™ āđāļĨāļ° āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē + #region 18,19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™ āđāļĨāļ° āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē /// /// 19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™ āđāļĨāļ° āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē /// @@ -1237,29 +995,45 @@ namespace BMA.EHR.Report.Service.Controllers case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; } - - var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp"); + var rptFile1 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp"); + var rptFile2 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp"); ReportPackager reportPacker = new ReportPackager(); - Telerik.Reporting.Report? report = null; - using (var sourceStream = System.IO.File.OpenRead(rptFile)) + Telerik.Reporting.Report? report1 = null; + Telerik.Reporting.Report? report2 = null; + using (var sourceStream1 = System.IO.File.OpenRead(rptFile1)) + using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) { - report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); + report1 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream1); + report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); } - - report.ReportParameters["EvaluateDateStart"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateStart").GetValue(evaluateAssign); - report.ReportParameters["EvaluateDateFinish"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateFinish").GetValue(evaluateAssign); - report.ReportParameters["Reson"].Value = evaluateAssign.GetType().GetProperty("Reson").GetValue(evaluateAssign); - report.ReportParameters["DevelopComplete"].Value = evaluateAssign.GetType().GetProperty("DevelopComplete").GetValue(evaluateAssign); - report.ReportParameters["PassResult"].Value = evaluateAssign.GetType().GetProperty("PassResult").GetValue(evaluateAssign); - report.ReportParameters["ExpandMonth"].Value = evaluateAssign.GetType().GetProperty("ExpandMonth").GetValue(evaluateAssign); - report.ReportParameters["ChairmanName"].Value = evaluateAssign.GetType().GetProperty("ChairmanName").GetValue(evaluateAssign); - report.ReportParameters["ChairmanPosition"].Value = evaluateAssign.GetType().GetProperty("ChairmanPosition").GetValue(evaluateAssign); - report.ReportParameters["ChairmanDate"].Value = evaluateAssign.GetType().GetProperty("ChairmanDate").GetValue(evaluateAssign); + //āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™ + if((evaluateAssign.GetType().GetProperty("ExpandMonth").GetValue(evaluateAssign)).ToString() == "āđ") + { + report1.DataSource = evaluateAssign; + System.Collections.Hashtable deviceInfo_ = new System.Collections.Hashtable(); + InstanceReportSource instanceReportSource_ = new InstanceReportSource() + { + ReportDocument = report1, + }; + ReportProcessor reportProcessor_ = new ReportProcessor(_configuration); + RenderingResult result_ = reportProcessor_.RenderReport($"{exportType}", instanceReportSource_, deviceInfo_); + return File(result_.DocumentBytes, mimeType, $"āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨ.{exportType.Trim().ToLower()}"); + } + //āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē (āđƒāļŠāđ‰āļĢāļđāļ›āđāļšāļšāđ€āļ”āļīāļĄ) + report2.ReportParameters["EvaluateDateStart"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateStart").GetValue(evaluateAssign); + report2.ReportParameters["EvaluateDateFinish"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateFinish").GetValue(evaluateAssign); + report2.ReportParameters["Reson"].Value = evaluateAssign.GetType().GetProperty("Reson").GetValue(evaluateAssign); + report2.ReportParameters["DevelopComplete"].Value = evaluateAssign.GetType().GetProperty("DevelopComplete").GetValue(evaluateAssign); + report2.ReportParameters["PassResult"].Value = evaluateAssign.GetType().GetProperty("PassResult").GetValue(evaluateAssign); + report2.ReportParameters["ExpandMonth"].Value = evaluateAssign.GetType().GetProperty("ExpandMonth").GetValue(evaluateAssign); + report2.ReportParameters["ChairmanName"].Value = evaluateAssign.GetType().GetProperty("ChairmanName").GetValue(evaluateAssign); + report2.ReportParameters["ChairmanPosition"].Value = evaluateAssign.GetType().GetProperty("ChairmanPosition").GetValue(evaluateAssign); + report2.ReportParameters["ChairmanDate"].Value = evaluateAssign.GetType().GetProperty("ChairmanDate").GetValue(evaluateAssign); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); InstanceReportSource instanceReportSource = new InstanceReportSource() { - ReportDocument = report, + ReportDocument = report2, }; ReportProcessor reportProcessor = new ReportProcessor(_configuration); RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); diff --git a/BMA.EHR.Report.Service/Reports/18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp b/BMA.EHR.Report.Service/Reports/18-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļŠāļģāļŦāļĢāļąāļšāļ›āļĢāļ°āļ˜āļēāļ™-1.trdp new file mode 100644 index 0000000000000000000000000000000000000000..68590ab75a3938aa96044ba7e59edc09923ac0c6 GIT binary patch literal 2252 zcmai$X*d*&7RLuMk|ku9rN%HamM|pCl%)*ABwiwu-C!6ogiN8(8!Dq@oici@S+kWb zne1Y+XBnbK#K<;->2>w(_TGD+d(Ly7^PK1TpD+I}zdy=~>(DU(0Kf|{i?DVSxdcNA z0Rez4bpSvRAPeyF_VEky!~5Za)FT413S>!u%JX09|Ey`}72J@8J&L+KQV>(FinJ#Ae(2&X(MiUszWKOIu@CTee~vX{m@MlcBQCZdD5{yO?xPf|6U$F#`43Kt+L*WF9bo5WT= zNh%^|^f(3*ibFD!OJ?#!tZT6xmT0SDS`EIt1KG>?!dWNgP&!+Jv^STia>k8&D_&a+ zu$vFiw0sWH=T;jCyyX8U_4u)GHEdDgaXGCkuuHW8lNI=5U=zCkSAc(sf@->tq0&oWHN zdO>f!TF5m};nzN6iaEcuKff)J_+QcF!AZOY-*8 z8n6|llMpE}9XH?9!IUn_dMc1XsfQDUK z1H)1(DEY%c%|Uq8_4i-|iu)E>JOswVC6$yr3+z@cGly1~az6xy+M~I0<1>Hohg9!< z%}@F}MkGxt;lpzCWW<%BitS3N{Vu_ED0G zHHJF3j6E!DlYnNRnI7N^lCZL=R(G2|&G%L&G=~4}+r?fBmkL*1a$b(1PWsIwm8^@a zS?KnHf~AO;dDAa|V<;70Q+QNlM?eq8V&(4z7E8R?JQ_oMhdckc`V2nw6+xu| z+)7yIU95+Cj)0ePa}G>+LW-dj+wjFo4;**&hxlmnXdD&mH{MZ{ydXp^&JJuh-izN< zx_>%*X9l{kO*$bxcZnU28RSOB74W7^!QOCPx_EW!K@imHNNvu>xUux;^(OMYjxsGk zeRN%LwoQ^t#Cm806p~(>Tvq4PxoCN^KTv`AG<>BUB*2e4YS_eoVT;tA5gW=? zt9De*t+2 z8ycty^Lr@pDiPTOLaS4@_aV;=@M97UlIC8?TC_Y?(XiAk9@M^_4t3f&-#cM+dsSE` zYU=e+c`LmMcy^P`VIM(nxxM!%2+YWAD6-2Y)m4FqSaL%v}>Qm*)oh7g862XpISz-z>tYJjIuSuj?9F>Wi5+ z3X5VMKf{or&sf$m&9aMc^K1CjFPKpgea^N=ok55UIhpzghnx;{N!i>Y%NhOtrK zr-9Ewk$U|DKZQ`gVf7w+GxEs+GwTjU^Z=_arnn%ycM$%XePpnAsO$e@tCEeCV4UXB zW`y=lNxXZqUoU5KtORBWkTM9vYc7sljQ~}+rGD9KW$c|?_LimGDOiYetUPt<=t5w_ z85$(xHS_^0Ad+B#IN?ID8`SO;^{6&V0Y6bB4j^O-sKE)B6RG2k-*}l0VQ?A4GZpZgNKK$H~+Clv6%qQgG}!tX)i hpTEER^Y6co2VvyDxP`Lf=J_S#JZQqfKEwO#`WNu-29y8* literal 0 HcmV?d00001 diff --git a/BMA.EHR.Report.Service/Reports/19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp b/BMA.EHR.Report.Service/Reports/19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp index 2bd6eee7d7ca82af90110e409ff4532e31115c25..73544793c649645244c9472c068c3224a0f9a329 100644 GIT binary patch delta 1747 zcmV;^1}ypG5UCItP)h>@6aWAK2mq;gOjnPC{@-i{008|ckr*(4-CEsm+f)>PN8*3D z3evQy%#PEfZCJ9YACygFsA@WRKs=b_uCZ|J%)S{NPjpP`;03g;d~9gaR-q!QO3*Rp z{5SqnIQQ5$wr`xq?b0q;ltlLN{W`z%anCuvmCKtglia3`YuHvbrz!ayp;p~)7}iEL z*I_p=%;zp&diR}w${KCk4kMo#4c3HqC8bnv<;W*`i^5&`f|et-ru}uz(%T<7Mx&Zr zcRDmjU~tQ==9-MPKTuV--lQ$vRTwp?V|=C5?Uw4`xGkaK(@nN$Z_0p(LG#M2Hp>Yg)0_O3U#{Ej@aj|D?7(b( zcgy!4<9FBh4t?*r?``A7Z@#yM7eIf4|9|`4Z+-8X@BNEUfA_sVVr_o$y+=qnz!9L! zkJu7M{>S%!cJO+ickF(TU7-C-zk6TI`$KQ2bMI{~UxdGfivkiBFd72``A3WiM`6J< zHb8ZjsKuxQyipKmT{lBAFrDm~S(=Ns+0!F6Ik_5Fj(`%%<0ugol^IDyX#xTbjESgv z?pDWU7ef(n4EGQ>z-l{qG`$MzZ&BdgRX)58y>v!@m*H1qy2BJspwmH1;(I^)-hV@T zt{9f#HWgffB!$8-DR6H3WN_VRG)y`sVwekHA0maBxS2$H{uK530h+*}-~A3RQbaRC zi;yHRlO}<2K~{D_X~-6pxdgV7CrR}-qxUlss>Sg|wWt&ZqBk_LALdn?MOHn^cMRJ_$U*=js)_7fU*Tv*U%|Tt@tou0XUK;vKwrD}xQF1HwS)gJ z(71a(_!<81pd$Vxf|{N`*uwVcD!fMoz0JOV-`&Rhd#J0s=-&6ylkB1h9{0NuG4}zk z=7}u7abBgYLt1_^m8hf~;rUXOsE~AeVqa zvSFmA9w%e-hSi{sX;^fmiG@-e$hW2i=|n2y$-P--J2lpSgVN0pWHQWsk;k$WUW#~s z()(4I3P|}OQnv8XE?U%^$#!#O!P+okop~Aj)EzxTy8BwG))|UP%O~A-%x5n(b;D`t z7EeV*5;_Q`(!|1)sTMG+%qI*MojF%9FVIODju9q@r{bxyWr*Ojk~SRdTe$Tl_OrXf z0s)II8rw5&X`J{%WFq&uivzRd=C>_>wz^%UdkAH)qsBMYL)bQ9_j@2`DW|g!tmvjY zs*OM@0%}UBTuMc_pv>e;CyTvD9q(ih*oMt~fZwf@qGB*rwo&e485E15yyYG``oj@A zeF+B~5R`T+_2gWxF&=cDVDx9(-9AQ1@Gz@cabzVG(mmYU9V0k%MHBY@fHaGdj_iSOwT#zOt zi|^+V(rv`&RbaYPX~rr77tUO2^*puAH4)KDHuUC|_?~i}9Ou(ljyS2#O$u1$^!GeF zJa*yl0>crJ*ggA8UB%Dq_;lnP8Lhkz0C=5OAWW)F5Joq-1gACqq=K| zi)4UF(0uPH{Qgu(55xggjl$5k?2`^>^2N{V1qu^V0;;Hqqd;onERdjouId|f#kOI& z@*$x@bVjHxH`1b$N6{QOR*f=#w8@3Yp-r7@h6OS8LJ>p)`-fWxTCe=D1Z*2t$L_e; zRM5r3uItW*VMPa!1mQ*~UGyqzv84ubRthNeMVm3Z1^4_$?LiP9w4%n>8;}sxT9Z;H zx*%n(6N9>MzXHA+{P0+RxUd43mRML)a>$=tW&F z+@!U>!dhmi4ASh?1lFc0O1+9C=w7IC3>hQeTRW!*bna!90D5J1#|GBt)zG1 zL)%A@+we6@6aWAQ00;o7cubS~2H_5= pcuZH1gZ|%a1^@v4D3j_3E(57}Op_Z38v(SFHwY#MmInX;002M?T@U~O delta 1823 zcmV+)2jKXr5aSRSP)h>@6aWAK2mqB;FIN&Vs)?os006Ejkr*(4)mrUu+e8@uj>P|P zGE%jv%!$*aX=t;lFI1bxP}OW8f%ssOTVmnZS$vr~KG89$gAaiA!b^uHZ51kFngks% z=fClv!gJ6068qvLZb`eOYAgGEZ_n>}f9_T;?KEw2o3=g6b;_EdXEj2ds#~+1dRgnR zn-`X}OBdgMYh{~%w%j%&A6qrnfPMwNP;F}DL$gWYt#rZA$S1DbENeN9z>JPp)*6hp z-pgdXYJ)aSPiNGoZR-oY>NYcNoD7!8I?m)YtcU8EI2qi6E<9@J8aF}Q7MqqX7xpXW05y}KyUI_{&?MOg-;)u zb_Z4qy1RkDkG}_je-!x71Ah-6ehK_te1P^R`2WwK`&HmS3;e(F>#u?TTcpoVf&U0w zUg8We-g6@5}?zg?E=HA)aScZSA%MubM2#tV&^jFv& zn-Y$~s%_POf!FKQVYCgjQD8;Yw8Lf~IzAG{Zn_Q&XTN@#RLr*ddB@qRT-8X$`jQL4 zVvA{H&9!ULq1~Yx$;21W;ObF!WI}$7Vo_djI>MqP2IX`k!lLrrt&YoAZo?i=HHZ@P7>af5(p8v>eN8=(q!g3%PMz z;M5H8;F?vd*>pMIzyG@2rxY81277?q-J)8D_soV@U}xWkl)!EL8=#{197q@zVi+ zYSh?#cmH(a&{d~y!#=Yr_=!F}MZ){PlC3jjlaYtpfqP`SUSTyEbzxrqa{1Mf$g-|Sq@}7ri=#M67^c5U%LJ->Bkji-y zEzIq-Os94YWGbx4%@bM8fB@xOAVa!^;L)Zi!1My4!4&jZndj(}*6-47TMQrAwrcQ;vwzN-F8?fwdQkkFH8HeEh{|M! z%85%nC`~-km&!l~pg3;RhQ7?gjvp(FPP2P)h{{000000ssO4 NeE