diff --git a/.vs/BMA.EHR.Recruit.Service/v17/.suo b/.vs/BMA.EHR.Recruit.Service/v17/.suo
index 5e514ea..83d7e31 100644
Binary files a/.vs/BMA.EHR.Recruit.Service/v17/.suo and b/.vs/BMA.EHR.Recruit.Service/v17/.suo differ
diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs
index a081207..65933b2 100644
--- a/Controllers/RecruitController.cs
+++ b/Controllers/RecruitController.cs
@@ -1846,13 +1846,13 @@ namespace BMA.EHR.Recruit.Service.Controllers
                                     .FirstOrDefaultAsync(x => x.Id == id);
 
             if (data == null)
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status500InternalServerError);
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
 
             if (data_pass == null)
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status500InternalServerError);
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
 
             if (data_pass!.ScoreImport == null)
-                return Error(GlobalMessages.InvalidExamScore, StatusCodes.Status500InternalServerError);
+                return Error(GlobalMessages.InvalidExamScore, StatusCodes.Status404NotFound);
 
             var header = $"{data.Name} ครั้งที่ {data.Order}/{data.Year.ToThaiYear()}";
 
@@ -1953,13 +1953,13 @@ namespace BMA.EHR.Recruit.Service.Controllers
                                     .FirstOrDefaultAsync(x => x.Id == id);
 
             if (data == null)
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status500InternalServerError);
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
 
             if (data_pass == null)
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status500InternalServerError);
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
 
             if (data_pass!.ScoreImport == null)
-                return Error(GlobalMessages.InvalidExamScore, StatusCodes.Status500InternalServerError);
+                return Error(GlobalMessages.InvalidExamScore, StatusCodes.Status404NotFound);
 
             var header = $"{data.Name} ครั้งที่ {data.Order}/{data.Year.ToThaiYear()}";
 
diff --git a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
index 66382c6..e6c0637 100644
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
@@ -15,11 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d7bfacb34ef93e51cfa16ab565056a2fc541c6e2")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+54661ffbcbab112899e31b0397a986a02a1a7b98")]
->>>>>>> working
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b31a2a4a5a8faf1c7d9c5c2fe61f55ffb44e756")]
 [assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
index 2ecfb58..558ae49 100644
--- a/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
+++ b/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-a61618443a29215c1780096c70a4c1cfa90e1df3e1f003527b38ce0ccd7b73fc
-=======
-d0b8ae708cff3fbb17ec6ef788cd76ed1d601b65c1136482d745d4fd3aa82acc
->>>>>>> working
+c472f9714a12fb2cc28eca56ab89fa64d8125d56e8a735170568a60b84b746f2