diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index b67be682..3748a8a6 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -800,7 +800,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.PositionLevelOld,
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
-                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = p.AmountOld == null ? "" : p.AmountOld.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.ToThaiNumber(),
                                        GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
@@ -854,7 +854,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.PositionLevelOld,
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
-                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = p.AmountOld == null ? "" : p.AmountOld.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.ToThaiNumber(),
                                        GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
@@ -907,7 +907,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.PositionLevelOld,
                                        PositionType = p.PositionTypeOld,
                                        PositionNumber = p.PositionNumberOld.ToThaiNumber(),
-                                       Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
+                                       Salary = p.AmountOld == null ? "" : p.AmountOld.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.ToThaiNumber(),
                                        GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),