From b7fd1b38a623fe5b818a0bb6ebe0b791655509ee Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 7 Jun 2024 15:47:06 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Reports/RetireReportRepository.cs | 5 +++-- BMA.EHR.Report.Service/Controllers/RetireReportController.cs | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs index a18c1ed0..d7d26408 100644 --- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Application.Repositories.Reports var retire = await _dbContext.Set() .Include(x => x.RetirementProfiles) .FirstOrDefaultAsync(x => x.Id == retireId); - var retires = new List(); + // var retires = new List(); if (retire == null) { var retireHistorys = await _dbContext.Set().AsQueryable() @@ -126,6 +126,7 @@ namespace BMA.EHR.Application.Repositories.Reports else { var profile_retire = await _dbContext.Set() + .Include(x => x.RetirementPeriod) .Where(x => x.RetirementPeriod == retire && (retire.TypeReport == null || retire.TypeReport == x.Remove)) .OrderBy(x => x.Order) .Select(x => new @@ -193,7 +194,7 @@ namespace BMA.EHR.Application.Repositories.Reports // retires.Add(data); // } - return new { retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = retires }; + return new { retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; } } #endregion diff --git a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs index 311386b9..6b3ca3d7 100644 --- a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs @@ -157,7 +157,6 @@ namespace BMA.EHR.Report.Service.Controllers var tblProfile = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; tblProfile.DataSource = _profileList; } - // return Success(retire); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); InstanceReportSource instanceReportSource = new InstanceReportSource() {