fix: Optimize Leave API

This commit is contained in:
Suphonchai Phoonsawat 2024-07-11 15:12:38 +07:00
parent 96a2c8d94f
commit 5731ac6f3d

View file

@ -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,