diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 40212297..64c46744 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -764,6 +764,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
             var govAge = (profile?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+            var thisYear = DateTime.Now.Year;
 
             if (profile == null)
             {
@@ -828,7 +829,17 @@ namespace BMA.EHR.Leave.Service.Controllers
                     isLeave = (totalDay - (sumWorkDay + sumWeekend) + sumApproveLeave) <= 15;
                     break;
                 case "LV-005":
-                    isLeave = (totalDay - (sumWorkDay + sumWeekend) + sumApproveLeave) <= 10;
+                    // fix issue : ระบบลา (ขรก.) >> ลาพักผ่อน (กรณีรับราชการไม่ถึง 6 เดือน) #838
+                    var leavePrevYear = (await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear)).Where(x => x.LeaveTypeCode == "LV-005").FirstOrDefault();
+                    var leavePrevYearRemain = 10 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
+
+                    if (govAge >= 180)
+                        if (govAge >= 3650) // ถ้าอายุราชการเกิน 10 ปี ได้บวกเพิ่มอีก 10 วัน
+                            isLeave = (totalDay - (sumWorkDay + sumWeekend) + sumApproveLeave) <= (20 + leavePrevYearRemain);
+                        else
+                            isLeave = (totalDay - (sumWorkDay + sumWeekend) + sumApproveLeave) <= (10 + leavePrevYearRemain);
+                    else
+                        isLeave = false;
                     break;
                 case "LV-006":
                     isLeave = totalDay <= 120;