diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs
index bf36423..ad5b0f7 100644
--- a/Controllers/RecruitController.cs
+++ b/Controllers/RecruitController.cs
@@ -626,6 +626,7 @@ namespace BMA.EHR.Recruit.Service.Controllers
                                 .ThenInclude(x => x.Scores)
                                 .OrderByDescending(x => x.Year)
                                 .ThenByDescending(x => x.Order)
+                                .ThenByDescending(x => x.LastUpdatedAt)
                                 .Select(x => new
                                 {
                                     x.Id,
@@ -1047,6 +1048,9 @@ namespace BMA.EHR.Recruit.Service.Controllers
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "System Administrator",
+                    LastUpdatedAt = DateTime.Now,
+                    LastUpdateUserId = UserId ?? "",
+                    LastUpdateFullName = FullName ?? "System Administrator",
                 });
 
                 //await _context.RecruitImports.AddAsync(imported);
diff --git a/Services/RecruitService.cs b/Services/RecruitService.cs
index 07266aa..ec16ef0 100644
--- a/Services/RecruitService.cs
+++ b/Services/RecruitService.cs
@@ -397,7 +397,7 @@ namespace BMA.EHR.Recruit.Service.Services
             if (string.IsNullOrWhiteSpace(Date))
                 return DateTime.MinValue;
 
-            // กรณีอยู่ในรูปแบบ string double
+            // จะเข้าเฉพาะกรณีที่ string เป็นตัวเลข เช่น "35635", "44561.5"
             if (double.TryParse(Date, out double oaDate))
             {
                 try