From 123501378bc8eeaa0869e18d67b0cc3dd44fb6de Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 12 Mar 2025 10:17:43 +0700 Subject: [PATCH] fix --- BMA.EHR.Application/Repositories/UserProfileRepository.cs | 3 +++ BMA.EHR.Leave/Controllers/LeaveReportController.cs | 3 +-- BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Application/Repositories/UserProfileRepository.cs b/BMA.EHR.Application/Repositories/UserProfileRepository.cs index f4e3fad3..8bd12d91 100644 --- a/BMA.EHR.Application/Repositories/UserProfileRepository.cs +++ b/BMA.EHR.Application/Repositories/UserProfileRepository.cs @@ -378,6 +378,7 @@ namespace BMA.EHR.Application.Repositories node = node, nodeId = nodeId, isAll = isAll, + revisionId = revisionId, }; var profiles = new List(); @@ -410,6 +411,7 @@ namespace BMA.EHR.Application.Repositories nodeId = nodeId, isAll = isAll, isRetirement = isRetirement, + revisionId = revisionId, }; var profiles = new List(); @@ -441,6 +443,7 @@ namespace BMA.EHR.Application.Repositories node = node, nodeId = nodeId, isAll = isAll, + revisionId = revisionId, }; var profiles = new List(); diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index d434c520..21f92c57 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -935,8 +935,7 @@ namespace BMA.EHR.Leave.Service.Controllers organizationName = profile?.FirstOrDefault()?.Oc ?? "", headerText = type.Trim().ToUpper() == "OFFICER" ? "ข้าราชการสามัญ" : "ลูกจ้างประจำ", leaveTitleType = leaveTitleType, - employees = employees, - profile = profile + employees = employees, } }; diff --git a/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs b/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs index 2216f9bc..c071f100 100644 --- a/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs +++ b/BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs @@ -9,6 +9,6 @@ namespace BMA.EHR.Leave.Service.DTOs.Reports public string nodeId { get; set; } public bool? isRetirement { get; set; } = false; - public string? revisionId { get; set; } + public string? revisionId { get; set; } = string.Empty; } } \ No newline at end of file