diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index aeee3a7e..21b08c88 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -331,18 +331,25 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             if (endDate != DateTime.MinValue)
                 rawData = rawData.Where(x => x.LeaveEndDate <= endDate);
 
+            if (role == "OWNER")
+            {
+                node = null;
+            }
             if (role == "OWNER" || role == "CHILD")
             {
                 rawData = rawData
                     .Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true))))));
             }
-            else
+            else if (role == "ROOT")
             {
                 rawData = rawData
-                    //.Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId) : (node == null ? true : true))))))
-                    //.Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))));
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
             }
+            else if (role == "NORMAL")
+            {
+                rawData = rawData
+                    .Where(x => node == 0 ? x.Child1DnaId == null : (node == 1 ? x.Child2DnaId == null : (node == 2 ? x.Child3DnaId == null : (node == 3 ? x.Child4DnaId == null : true))));
+            }
 
 
             return await rawData.ToListAsync();
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index d6c38b39..613eaa9a 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1586,7 +1586,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
-            if (role == "OWNER" || role == "CHILD")
+            if (role == "NORMAL" || role == "CHILD")
             {
                 nodeId = profileAdmin?.Node == 4
                          ? profileAdmin?.Child4DnaId
@@ -1600,7 +1600,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else
+            else if (role == "ROOT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }