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

เพิ่มคำนำหน้าตอนคิวรี่ fullname

Browse source
This commit is contained in:
Kittapath 2023-09-19 14:25:24 +07:00
parent 9f29dd00a4
commit eda476458a
6 changed files with 118 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -291,7 +291,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = x.Profile.Id,
citizenId = x.Profile.CitizenId,
prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name,
fullName = $"{x.Profile.FirstName} {x.Profile.LastName}",
fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
organizationOrganization = x.Profile.OrganizationOrganization,
ocId = x.Profile.OcId,
position = x.Profile.Position == null ? null : x.Profile.Position.Name,
@ -449,7 +449,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = x.Profile.Id,
citizenId = x.Profile.CitizenId,
prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name,
fullName = $"{x.Profile.FirstName} {x.Profile.LastName}",
fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
organizationOrganization = x.Profile.OrganizationOrganization,
ocId = x.Profile.OcId,
position = x.Profile.Position == null ? null : x.Profile.Position.Name,
@ -537,7 +537,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = x.Profile.Id,
citizenId = x.Profile.CitizenId,
prefix = x.Profile.Prefix == null ? null : x.Profile.Prefix.Name,
fullName = $"{x.Profile.FirstName} {x.Profile.LastName}",
fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
organizationOrganization = x.Profile.OrganizationOrganization,
ocId = x.Profile.OcId,
position = x.Profile.Position == null ? null : x.Profile.Position.Name,

3
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -685,6 +685,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
.Select(p => new
{
Id = p.Id,
Fullname = $"{(p.RetirementResign.Profile.Prefix == null ? null : p.RetirementResign.Profile.Prefix.Name)}{p.RetirementResign.Profile.FirstName} {p.RetirementResign.Profile.LastName}",
ReasonWork = p.ReasonWork == null ? p.ReasonWork : Newtonsoft.Json.JsonConvert.DeserializeObject(p.ReasonWork),
ReasonWorkOther = p.ReasonWorkOther,
TimeThink = p.TimeThink,
@ -730,7 +731,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Position = p.RetirementResign.Profile.Position == null ? null : p.RetirementResign.Profile.Position.Name,
PositionLevel = p.RetirementResign.Profile.PositionLevel == null ? null : p.RetirementResign.Profile.PositionLevel.Name,
Org = p.RetirementResign.Profile.OcId == null ? null : p.RetirementResign.Profile.OcId,
Fullname = $"{p.RetirementResign.Profile.FirstName} {p.RetirementResign.Profile.LastName}",
Fullname = $"{(p.RetirementResign.Profile.Prefix == null ? null : p.RetirementResign.Profile.Prefix.Name)}{p.RetirementResign.Profile.FirstName} {p.RetirementResign.Profile.LastName}",
Prefix = p.RetirementResign.Profile.Prefix == null ? null : p.RetirementResign.Profile.Prefix.Name,
Avatar = p.RetirementResign.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.RetirementResign.Profile.Avatar.Id,
ReasonWork = p.ReasonWork == null ? p.ReasonWork : Newtonsoft.Json.JsonConvert.DeserializeObject(p.ReasonWork),