hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้ประ

Browse source
This commit is contained in:
Kittapath 2024-06-07 15:47:06 +07:00
parent d47df139ed
commit b7fd1b38a6
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -69,7 +69,7 @@ namespace BMA.EHR.Application.Repositories.Reports
var retire = await _dbContext.Set<RetirementPeriod>() var retire = await _dbContext.Set<RetirementPeriod>()
.Include(x => x.RetirementProfiles) .Include(x => x.RetirementProfiles)
.FirstOrDefaultAsync(x => x.Id == retireId); .FirstOrDefaultAsync(x => x.Id == retireId);
var retires = new List<dynamic>(); // var retires = new List<dynamic>();
if (retire == null) if (retire == null)
{ {
var retireHistorys = await _dbContext.Set<RetirementPeriodHistory>().AsQueryable() var retireHistorys = await _dbContext.Set<RetirementPeriodHistory>().AsQueryable()
@ -126,6 +126,7 @@ namespace BMA.EHR.Application.Repositories.Reports
else else
{ {
var profile_retire = await _dbContext.Set<RetirementProfile>() var profile_retire = await _dbContext.Set<RetirementProfile>()
.Include(x => x.RetirementPeriod)
.Where(x => x.RetirementPeriod == retire && (retire.TypeReport == null || retire.TypeReport == x.Remove)) .Where(x => x.RetirementPeriod == retire && (retire.TypeReport == null || retire.TypeReport == x.Remove))
.OrderBy(x => x.Order) .OrderBy(x => x.Order)
.Select(x => new .Select(x => new
@ -193,7 +194,7 @@ namespace BMA.EHR.Application.Repositories.Reports
// retires.Add(data); // 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 #endregion

1
BMA.EHR.Report.Service/Controllers/RetireReportController.cs
View file

@ -157,7 +157,6 @@ namespace BMA.EHR.Report.Service.Controllers
var tblProfile = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; var tblProfile = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
tblProfile.DataSource = _profileList; tblProfile.DataSource = _profileList;
} }
// return Success(retire);
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource() InstanceReportSource instanceReportSource = new InstanceReportSource()
{ {