From 78a47bc7357e8ecec19af1b097bfd0dcbf228b87 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 5 Jun 2025 09:52:12 +0700 Subject: [PATCH 1/2] fix issue #1568 (convert thaiNumber) --- .../Controllers/RetirementResignController.cs | 2 +- .../Controllers/RetirementResignEmployeeController.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 5844ae10..7621c9a2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -2454,7 +2454,7 @@ namespace BMA.EHR.Retirement.Service.Controllers PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - Remark = p.Reason ?? "-", + Remark = p.Reason?.ToThaiNumber() ?? "-", RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(), RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber() }).ToList(); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index bf674e77..d6cde482 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -1887,12 +1887,12 @@ namespace BMA.EHR.Retirement.Service.Controllers (p.child2Old == null ? "" : $"{p.child2Old}\n") + (p.child1Old == null ? "" : $"{p.child1Old}\n") + (p.rootOld == null ? "" : $"{p.rootOld}"), - PositionLevel = p.PositionLevelOld ?? "-", + PositionLevel = p.PositionLevelOld?.ToThaiNumber() ?? "-", PositionType = p.PositionTypeOld ?? "-", PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - Remark = p.Reason ?? "-", + Remark = p.Reason?.ToThaiNumber() ?? "-", RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(), RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber() }).ToList(); From a494020d376cc91ec179e9748ae4367949dccd39 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 5 Jun 2025 11:24:18 +0700 Subject: [PATCH 2/2] fix bug --- .../Controllers/RetirementOtherController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 7e902b87..6abfd2fb 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -844,7 +844,7 @@ namespace BMA.EHR.Retirement.Service.Controllers positionNameNew = p.position, posmasterId = p.posmasterId, posTypeNameNew = p.posTypeName, - posLeveNamelNew = p.posLevelName, + posLevelNameNew = p.posLevelName, posNoNew = p.posMasterNo?.ToString(), posNoAbbNew = p.child4ShortName != null ? $"{p.child4ShortName}" : p.child3ShortName != null ? $"{p.child3ShortName}" :