From fe4a174bf7a1950f91e050a3879e16150bf2527e Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang
 <153157069+AdisakKanthawilang@users.noreply.github.com>
Date: Wed, 8 Oct 2025 17:23:10 +0700
Subject: [PATCH] fix sort api/v1/leave/search (#1852)

---
 BMA.EHR.Leave/Controllers/LeaveController.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 27d00e35..8ef2c54d 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -26,6 +26,7 @@ using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using Swashbuckle.AspNetCore.Annotations;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
@@ -1862,21 +1863,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     case "CITIZENID":
                         if (req.descending == true)
-                            profile = profile.OrderByDescending(x => x.CitizenId).ToList();
+                            resultSet = resultSet.OrderByDescending(x => x.CitizenId).ToList();
                         else
-                            profile = profile.OrderBy(x => x.CitizenId).ToList();
+                            resultSet = resultSet.OrderBy(x => x.CitizenId).ToList();
                         break;
                     case "FULLNAME":
                         if (req.descending == true)
-                            profile = profile.OrderByDescending(x => x.Prefix)
-                                .ThenByDescending(x => x.FirstName)
-                                .ThenByDescending(x => x.LastName)
-                                .ToList();
+                            resultSet = resultSet.OrderByDescending(x => x.FullName).ToList();
                         else
-                            profile = profile.OrderBy(x => x.Prefix)
-                                .ThenBy(x => x.FirstName)
-                                .ThenBy(x => x.LastName)
-                                .ToList();
+                            resultSet = resultSet.OrderBy(x => x.FullName).ToList();
                         break;
                     case "STARTTIMEMORNING":
                         if (req.descending == true)