From e5f73f42ef611baa6ff241c247cafd66ed2eb4d8 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 27 Sep 2023 11:39:10 +0700 Subject: [PATCH] =?UTF-8?q?Salary=20=E0=B9=84=E0=B8=A5=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Commands/CommandReportRepository.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(),