From 54358ac84583e8c6e303aca8aacd37eef1f28336 Mon Sep 17 00:00:00 2001 From: kittapath <> Date: Thu, 30 Oct 2025 22:52:22 +0700 Subject: [PATCH] sort retire --- .../Controllers/RetirementController.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index c2996ab0..50886aaa 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -487,6 +487,7 @@ namespace BMA.EHR.Retirement.Service.Controllers positionArea = x.positionArea, posNo = x.posNo, }) + .OrderBy(x => x.order) .ToListAsync(); var file_name = $"retire_tmp_{DateTime.Now.ToString("yyyyMMddTHHmmss")}"; var profile = Newtonsoft.Json.JsonConvert.SerializeObject(profile_old); @@ -603,6 +604,7 @@ namespace BMA.EHR.Retirement.Service.Controllers return Error(GlobalMessages.RetirementNotFound, 404); var profileOlds = await _context.RetirementProfiles.AsQueryable() .Where(x => x.RetirementPeriod == retireOld) + .OrderBy(x => x.Order) .ToListAsync(); if (profileOlds != null) { @@ -695,6 +697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers positionArea = x.positionArea, posNo = x.posNo, }) + .OrderBy(x => x.order) .ToListAsync(); // var profile_news = new List(); // foreach (var r in profile_new) @@ -811,6 +814,7 @@ namespace BMA.EHR.Retirement.Service.Controllers // positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name, // posNoEmployee = x.Profile.PosNoEmployee, }) + .OrderBy(x => x.order) .ToListAsync(); // var profile_news = new List(); // foreach (var r in profile_new)