hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้ api พ้นราชการ

Browse source
This commit is contained in:
Kittapath 2024-05-21 19:41:55 +07:00
parent 2a3a151f34
commit 63b02dcc4c
19 changed files with 54771 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

19
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -342,11 +342,10 @@ namespace BMA.EHR.Application.Repositories.Reports
.Select(p => new
{
p.Id,
Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
PrefixId = p.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Prefix.Id,
p.Profile.FirstName,
p.Profile.LastName,
ProfileId = p.Profile.Id,
p.prefix,
p.firstName,
p.lastName,
p.profileId,
p.Location,
p.SendDate,
p.ActiveDate,
@ -378,12 +377,12 @@ namespace BMA.EHR.Application.Repositories.Reports
var _data = new
{
data.Id,
data.ProfileId,
data.Prefix,
data.FirstName,
data.LastName,
data.profileId,
data.prefix,
data.firstName,
data.lastName,
data.Location,
FullName = $"{data.Prefix}{data.FirstName} {data.LastName}",
FullName = $"{data.prefix}{data.firstName} {data.lastName}",
SendDate = string.IsNullOrEmpty(data.SendDate.ToString()) ? string.Empty : DateTime.Parse(data.SendDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
ActiveDate = string.IsNullOrEmpty(data.ActiveDate.ToString()) ? string.Empty : DateTime.Parse(data.ActiveDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
data.Reason,