diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index 36e37419..decdd8e4 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -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 = "", }; } diff --git a/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp b/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp index dd9302cd..57a8f780 100644 Binary files a/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp and b/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp differ