diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index b9faa3ec..4a8cf792 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -438,7 +438,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name,
                                        NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
                                        NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
-                                       NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber()
                                    })
                                   .ToList();
@@ -618,7 +618,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name,
                                        PositionType = pf.PositionType == null ? "" : pf.PositionType.Name,
                                        PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(),
-                                       Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       //Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        ActiveDate = "",
                                        ReceiveOrganizationName = r.Command!.ReceiveOrganizationName
                                    })
@@ -748,7 +749,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
                                        ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Remark = p.Reason ?? ""
                                    })
                                    .ToList();
@@ -797,7 +799,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.PositionLevelOld,
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
-                                       Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Fault = r.Command.Fault,
                                        GuiltyBasis = r.Command.GuiltyBasis,
                                        ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
@@ -850,7 +853,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.PositionLevelOld,
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
-                                       Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Fault = r.Command.Fault,
                                        GuiltyBasis = r.Command.GuiltyBasis,
                                        ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
@@ -902,7 +906,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.PositionLevelOld,
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
-                                       Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Fault = r.Command.Fault,
                                        GuiltyBasis = r.Command.GuiltyBasis,
                                        ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),