diff --git a/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
index cf4a4dc8..be4e0636 100644
--- a/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
@@ -113,21 +113,13 @@ namespace BMA.EHR.Application.Repositories.Reports
 
                             OccupationPositionType = p.OccupationPositionType == "other" ? "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร" : (p.OccupationPositionType == "temp" ? "ลูกจ้างชั่วคราว" : (p.OccupationPositionType == "prem" ? "ลูกจ้างประจำ" : "-")),
                             OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition,
-                            OccupationSalary = p.OccupationSalary == null ? "-" : p.OccupationSalary.Value.ToString("N0"),
+                            OccupationSalary = p.OccupationSalary == null ? "-" : (p.OccupationSalary.Value % 1 == 0 ? p.OccupationSalary.Value.ToString("N0") : p.OccupationSalary.Value.ToString("N2")),
                             OccupationGroup = p.OccupationGroup == null ? "-" : p.OccupationGroup,
                             OccupationPile = p.OccupationPile == null ? "-" : p.OccupationPile,
                             OccupationOrg = p.OccupationOrg == null ? "-" : p.OccupationOrg,
                             OccupationTelephone = p.OccupationTelephone == null ? "-" : p.OccupationTelephone,
 
                             CareersTotal = sb.ToString(),
-                            // Careers = p.Careers.Select(y => new
-                            // {
-                            //     Position = y.Position,
-                            //     Type = y.Type,
-                            //     DurationStart = y.DurationStart.ToThaiShortDate2(),
-                            //     DurationEnd = y.DurationEnd.ToThaiShortDate2(),
-                            //     RangeDate = y.RangeDate,
-                            // }).ToList(),
 
                             RegistAddress = p.RegistAddress == null ? "-" : p.RegistAddress,
                             RegistProvinceName = p.RegistProvinceName == null ? "-" : p.RegistProvinceName,
@@ -176,10 +168,10 @@ namespace BMA.EHR.Application.Repositories.Reports
                 {
                     Position = item.Position,
                     Type = item.Type,
-                    DurationStart = item.DurationStart.ToThaiNumber(),
-                    DurationEnd = item.DurationEnd.ToThaiNumber(),
-                    RangeDate = item.RangeDate.ToThaiNumber(),
-                    Index = retVal.ToString().ToThaiNumber(),
+                    DurationStart = item.DurationStart,
+                    DurationEnd = item.DurationEnd,
+                    RangeDate = item.RangeDate,
+                    Index = retVal.ToString(),
                 };
                 data.Add(_data);
                 retVal++;