diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index e61d1a10..777bef02 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -730,7 +730,14 @@ namespace BMA.EHR.Retirement.Service.Controllers OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(), - NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\n" + (p.rootOld == null ? "" : p.rootOld), + //NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\n" + (p.rootOld == null ? "" : p.rootOld), + NewOc = (p.position == null ? "" : $"{p.position}\n") + + (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") + + (p.child4 == null ? "" : $"{p.child4}\n") + + (p.child3 == null ? "" : $"{p.child3}\n") + + (p.child2 == null ? "" : $"{p.child2}\n") + + (p.child1 == null ? "" : $"{p.child1}\n") + + (p.root == null ? "" : $"{p.root}"), NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),