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:
Harid Promsri (Bright) 2023-10-05 13:42:01 +07:00
parent 5cf4a7ae2e
commit f43ca70142
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
View file

@ -747,10 +747,10 @@ namespace BMA.EHR.Application.Repositories.Reports
{
RowNo = 1,
DepartmentName = _organizationCommonRepository.GetOrganizationNameFullPath(g.Key.OcId, false, false),
G1Male = g.Sum(x => x.Gendor == "ชาย" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0),
G1Female = g.Sum(x => x.Gendor == "หญิง" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0),
G2Male = g.Sum(x => x.Gendor == "ชาย" ? 1 : 0),
G2Female = g.Sum(x => x.Gendor == "หญิง" ? 1 : 0),
G1Male = g.Sum(x => x.Gendor == "ชาย" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0).ToString().ToThaiNumber(),
G1Female = g.Sum(x => x.Gendor == "หญิง" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0).ToString().ToThaiNumber(),
G2Male = g.Sum(x => x.Gendor == "ชาย" ? 1 : 0).ToString().ToThaiNumber(),
G2Female = g.Sum(x => x.Gendor == "หญิง" ? 1 : 0).ToString().ToThaiNumber(),
Remark = "",
}).ToList();
@ -793,10 +793,10 @@ namespace BMA.EHR.Application.Repositories.Reports
return new
{
G1Male = insignia.Sum(x => x.G1Male),
G1Female = insignia.Sum(x => x.G1Female),
G2Male = insignia.Sum(x => x.G2Male),
G2Female = insignia.Sum(x => x.G2Female),
G1Male = insignia.Sum(x => x.G1Male).ToString().ToThaiNumber(),
G1Female = insignia.Sum(x => x.G1Female).ToString().ToThaiNumber(),
G2Male = insignia.Sum(x => x.G2Male).ToString().ToThaiNumber(),
G2Female = insignia.Sum(x => x.G2Female).ToString().ToThaiNumber(),
Remark = "",
};
}

BIN
BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp
View file

Binary file not shown.