From 5731ac6f3dff9d10b5fea510243fb6fa9bc5f6a4 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 11 Jul 2024 15:12:38 +0700 Subject: [PATCH] fix: Optimize Leave API --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index d2681381..ef1d9f25 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1109,7 +1109,7 @@ namespace BMA.EHR.Leave.Service.Controllers Id = item.Id, LeaveTypeId = item.Type.Id, LeaveTypeName = item.Type.Name, - FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", + FullName = $"{item.Prefix}{item.FirstName} {item.LastName}", DateSendLeave = item.CreatedAt.Date, Status = item.LeaveStatus, CitizenId = profile.CitizenId ?? "", @@ -1267,7 +1267,7 @@ namespace BMA.EHR.Leave.Service.Controllers { Id = rawData.Id, LeaveTypeName = rawData.Type.Name, - FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", + FullName = $"{rawData.Prefix}{rawData.FirstName} {rawData.LastName}", Status = rawData.LeaveCancelStatus ?? "", LeaveStartDate = rawData.LeaveStartDate, LeaveEndDate = rawData.LeaveEndDate, @@ -1490,7 +1490,7 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveTypeName = rawData.Type.Name, LeaveTypeId = rawData.Type.Id, - FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", + FullName = $"{rawData.Prefix}{rawData.FirstName} {rawData.LastName}", DateSendLeave = rawData.CreatedAt, Status = rawData.LeaveStatus, LeaveStartDate = rawData.LeaveStartDate,