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

report retirement

Browse source
This commit is contained in:
moss 2025-04-01 12:08:05 +07:00
parent 6dd057516f
commit e160e1e552
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,9 +163,9 @@ namespace BMA.EHR.Application.Repositories.Reports
if (profiles.Count > 0) if (profiles.Count > 0)
{ {
mapProfiles = profiles mapProfiles = profiles
// .OrderBy(x => rootOrder.ToObject<List<string>>().IndexOf(x.root)) // .OrderBy(x => rootOrder.ToObject<List<string>>().IndexOf(x.root))
// .ThenBy(x => posTypeNameOrder.ToObject<List<string>>().IndexOf(x.posTypeName ?? "")) // .ThenBy(x => posTypeNameOrder.ToObject<List<string>>().IndexOf(x.posTypeName ?? ""))
// .ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? "")) // .ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? ""))
.Select((profile, index) => .Select((profile, index) =>
{ {
// bool isDuplicateRoot = profile.root == previousRoot; // bool isDuplicateRoot = profile.root == previousRoot;
@ -176,7 +176,7 @@ namespace BMA.EHR.Application.Repositories.Reports
// previousPosLevelName = profile.posLevelName; // previousPosLevelName = profile.posLevelName;
return new ProfileRetireJsonRequest return new ProfileRetireJsonRequest
{ {
order = $"{ (index + 1).ToString().ToThaiNumber() }. ลำดับที่ { (profile.order).ToString().ToThaiNumber() }", order = retireHistorys.TypeReport == null ? (index + 1).ToString().ToThaiNumber() : $"{(index + 1).ToString().ToThaiNumber()}. ลำดับที่ {(profile.order).ToString().ToThaiNumber()}",
fullName = $"{profile.prefix}{profile.firstName} {profile.lastName}", fullName = $"{profile.prefix}{profile.firstName} {profile.lastName}",
root = "", root = "",
child = (profile.posExecutiveName == null ? "" : profile.posExecutiveName + "\n") + child = (profile.posExecutiveName == null ? "" : profile.posExecutiveName + "\n") +
@ -305,7 +305,7 @@ namespace BMA.EHR.Application.Repositories.Reports
previousPosLevelName = profile.posLevelName; previousPosLevelName = profile.posLevelName;
return new ProfileRetireJsonRequest return new ProfileRetireJsonRequest
{ {
order = (index + 1).ToString().ToThaiNumber(), order = retire.TypeReport == null ? (index + 1).ToString().ToThaiNumber() : $"{(index + 1).ToString().ToThaiNumber()}. ลำดับที่ {(profile.order).ToString().ToThaiNumber()}",
fullName = $"{profile.prefix}{profile.firstName} {profile.lastName}", fullName = $"{profile.prefix}{profile.firstName} {profile.lastName}",
root = (isDuplicateRoot ? "" : profile.root + "\n") + root = (isDuplicateRoot ? "" : profile.root + "\n") +
(isDuplicateHospital || !hospital.ToObject<List<string>>().Contains(profile.child1) ? "" : profile.child1 + "\n") + (isDuplicateHospital || !hospital.ToObject<List<string>>().Contains(profile.child1) ? "" : profile.child1 + "\n") +