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

2
BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs
View file

@ -555,7 +555,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
Position = p.InsigniaNoteProfile.Profile.Position == null ? null : p.InsigniaNoteProfile.Profile.Position.Name,
p.InsigniaNoteProfile.Profile.CitizenId,
p.InsigniaNoteProfile.Profile.ProfileType,
FullName = $"{p.InsigniaNoteProfile.Profile.FirstName} {p.InsigniaNoteProfile.Profile.LastName}",
FullName = $"{(p.InsigniaNoteProfile.Profile.Prefix == null ? null : p.InsigniaNoteProfile.Profile.Prefix.Name)}{p.InsigniaNoteProfile.Profile.FirstName} {p.InsigniaNoteProfile.Profile.LastName}",
RequestInsignia = p.InsigniaNoteProfile.RequestInsignia == null ? null : p.InsigniaNoteProfile.RequestInsignia.Name,
RequestInsigniaId = p.InsigniaNoteProfile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.InsigniaNoteProfile.RequestInsignia.Id,
RequestInsigniaShortName = p.InsigniaNoteProfile.RequestInsignia == null ? null : p.InsigniaNoteProfile.RequestInsignia.ShortName,

8
BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs
View file

@ -1241,7 +1241,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
ProfileType = x.Profile.ProfileType,
OcId = x.Profile.OcId,
CitizenId = x.Profile.CitizenId,
FullName = $"{x.Profile.FirstName} {x.Profile.LastName}",
FullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
RequestInsignia = x.RequestInsignia.Name,
RequestInsigniaId = x.RequestInsignia.Id,
RequestInsigniaShortName = x.RequestInsignia.ShortName,
@ -1320,7 +1320,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
ProfileType = x.Profile.ProfileType,
OcId = x.Profile.OcId,
CitizenId = x.Profile.CitizenId,
FullName = $"{x.Profile.FirstName} {x.Profile.LastName}",
FullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
RequestInsignia = x.RequestInsignia.Name,
RequestInsigniaId = x.RequestInsignia.Id,
RequestInsigniaShortName = x.RequestInsignia.ShortName,
@ -1858,7 +1858,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
Position = profile.Profile.Position == null ? null : profile.Profile.Position.Name,
profile.Profile.CitizenId,
profile.Profile.ProfileType,
FullName = $"{profile.Profile.FirstName} {profile.Profile.LastName}",
FullName = $"{profile.Profile.Prefix?.Name}{profile.Profile.FirstName} {profile.Profile.LastName}",
RequestInsignia = profile.RequestInsignia == null ? null : profile.RequestInsignia.Name,
RequestInsigniaId = profile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : profile.RequestInsignia.Id,
RequestInsigniaShortName = profile.RequestInsignia == null ? null : profile.RequestInsignia.ShortName,
@ -1956,7 +1956,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
Position = profile.Profile.Position == null ? null : profile.Profile.Position.Name,
profile.Profile.CitizenId,
profile.Profile.ProfileType,
FullName = $"{profile.Profile.FirstName} {profile.Profile.LastName}",
FullName = $"{profile.Profile.Prefix?.Name}{profile.Profile.FirstName} {profile.Profile.LastName}",
RequestInsignia = profile.RequestInsignia == null ? null : profile.RequestInsignia.Name,
RequestInsigniaId = profile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : profile.RequestInsignia.Id,
RequestInsigniaShortName = profile.RequestInsignia == null ? null : profile.RequestInsignia.ShortName,