diff --git a/BMA.EHR.Application/Repositories/UserProfileRepository.cs b/BMA.EHR.Application/Repositories/UserProfileRepository.cs
index b3148ec5..cf73fcc9 100644
--- a/BMA.EHR.Application/Repositories/UserProfileRepository.cs
+++ b/BMA.EHR.Application/Repositories/UserProfileRepository.cs
@@ -243,7 +243,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficer(string? accessToken, string? node, string? nodeId)
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficer(string? accessToken, int? node, string? nodeId, bool isAll)
         {
             try
             {
@@ -253,6 +253,7 @@ namespace BMA.EHR.Application.Repositories
                 {
                     node = node,
                     nodeId = nodeId,
+                    isAll = isAll,
                 };
 
                 var profiles = new List<SearchProfileDto>();
@@ -273,7 +274,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllEmployee(string? accessToken, string? node, string? nodeId)
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllEmployee(string? accessToken, int? node, string? nodeId, bool isAll)
         {
             try
             {
@@ -283,6 +284,7 @@ namespace BMA.EHR.Application.Repositories
                 {
                     node = node,
                     nodeId = nodeId,
+                    isAll = isAll,
                 };
 
                 var profiles = new List<SearchProfileDto>();
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 281bd911..f14649f2 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -757,11 +757,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var profile = new List<GetProfileByKeycloakIdRootDto>();
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
                 }
                 // get leave day
                 var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByTypeAndRange(req.StartDate, req.EndDate);
@@ -950,11 +950,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var profile = new List<GetProfileByKeycloakIdRootDto>();
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
                 }
                 var date = req.StartDate.Date;
 
@@ -1273,6 +1273,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 }
+                Console.WriteLine(jsonData["result"]);
                 var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type);
                 var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}";
                 var result = new
@@ -1281,8 +1282,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     reportName = "LeaveHalfYear-Officer",
                     data = new
                     {
-                        leaveDateStart = $"ณ วันที่ {req.StartDate.Date.ToThaiShortDate().ToThaiNumber()}{enddate}",
-                        leaveDateEnd = req.EndDate.Date.ToThaiShortDate().ToThaiNumber(),
+                        dateTimeStamp = $"ณ วันที่ {req.StartDate.Date.ToThaiShortDate().ToThaiNumber()}{enddate}",
                         employees = leaveDays
                     }
                 };
diff --git a/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs b/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs
index 0cc08245..0b1f900e 100644
--- a/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs
+++ b/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs
@@ -5,7 +5,7 @@ namespace BMA.EHR.Leave.Service.DTOs.Reports
         public DateTime StartDate { get; set; } = DateTime.MinValue;
         public DateTime EndDate { get; set; } = DateTime.MinValue;
         public string? Type { get; set; } = string.Empty;
-        public string? node { get; set; } = string.Empty;
+        public int? node { get; set; }
         public string? nodeId { get; set; } = string.Empty;
     }
 }
\ No newline at end of file