diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 0a423d60..799f3558 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -3277,15 +3277,16 @@ namespace BMA.EHR.Leave.Service.Controllers
             foreach (var data in rawDataPaged)
             {
                 var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(data.KeycloakUserId, AccessToken);
-                UserDutyTime? effectiveDate = null;
-                if (profile != null)
+                if (profile == null)
                 {
-                    effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
-                    //return Error($"{data.Id} PF{data.FirstName} {data.LastName} : {GlobalMessages.DataNotFound}", StatusCodes.Status404NotFound);
+                    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
                 }
                 //var userRound = await _dutyTimeRepository.GetByIdAsync(profile.DutyTimeId ?? Guid.Empty);
+
+                var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
                 var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
                 var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
+
                 var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate);
 
                 var duty = userRound ?? getDefaultRound;
diff --git a/BMA.EHR.Leave/appsettings.json b/BMA.EHR.Leave/appsettings.json
index ee356491..e55f7ac0 100644
--- a/BMA.EHR.Leave/appsettings.json
+++ b/BMA.EHR.Leave/appsettings.json
@@ -23,15 +23,16 @@
     "ExamConnection": "Server=192.168.1.63;User ID=root;Password=12345678;Port=3306;Database=hrms_exam;Allow User Variables=True;Convert Zero Datetime=True;Pooling=True;",
     "LeaveConnection": "Server=192.168.1.63;User ID=root;Password=12345678;Port=3306;Database=hrms_leave;Allow User Variables=True;Convert Zero Datetime=True;Pooling=True;"
 
-    // "DefaultConnection": "server=172.27.17.68;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;Connection Timeout=180;",
-    // "ExamConnection": "server=172.27.17.68;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;Connection Timeout=180;",
-    // "LeaveConnection": "server=172.27.17.68;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;Connection Timeout=180;"
+    //"DefaultConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+    //"ExamConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+    //"LeaveConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
   },
   "Jwt": {
+    //"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
     "Key": "j7C9RO_p4nRtuwCH4z9Db_A_6We42tkD_p4lZtDrezc",
     "Issuer": "https://hrmsbkk-id.case-collection.com/realms/hrms"
-    // "Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
-    // "Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
+    //"Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
+    //"Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
   },
   "EPPlus": {
     "ExcelPackage": {
@@ -54,11 +55,6 @@
     "Password": "12345678",
     "Queue": "hrms-checkin-queue-dev",
     "URL": "http://192.168.1.63:9122/api/queues/%2F/"
-    // "Host": "172.27.17.68",
-    // "User": "admin",
-    // "Password": "admin123456",
-    // "Queue": "hrms-checkin-queue",
-    // "URL": "http://172.27.17.68:9122/api/queues/%2F/"
   },
   "Mail": {
     "Server": "mail.bangkok.go.th",
@@ -72,10 +68,7 @@
   "API": "https://hrmsbkk.case-collection.com/api/v1",
   "APIV2": "https://hrmsbkk.case-collection.com/api/v2",
   "VITE_URL_MGT": "https://hrmsbkk-mgt.case-collection.com",
-  // "Domain": "https://hrms-exam.bangkok.go.th",
-  // "APIPROBATION": "https://hrms.bangkok.go.th/api/v1/probation",
-  // "API": "https://hrms.bangkok.go.th/api/v1",
-  // "APIV2": "https://hrms.bangkok.go.th/api/v2",
-  // "VITE_URL_MGT": "https://hrms-mgt.bangkok.go.th",
+  //"API": "https://bma-ehr.frappet.synology.me/api/v1",
+  //"API": "https://bma-hrms.bangkok.go.th/api/v1",
   "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz"
 }