Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2023-08-28 11:03:06 +07:00
commit ec8880752e

View file

@ -526,6 +526,31 @@ namespace BMA.EHR.Insignia.Service.Controllers
ReturnReason = p.ReturnReason,
LastUpdatedAt = p.LastUpdatedAt,
CreatedAt = p.CreatedAt,
InsigniaNoteProfileId = p.InsigniaNoteProfile.Id,
Prefix = p.InsigniaNoteProfile.Profile.Prefix == null ? null : p.InsigniaNoteProfile.Profile.Prefix.Name,
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}",
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,
p.InsigniaNoteProfile.DateReceive,
p.InsigniaNoteProfile.OrganizationOrganizationSend,
p.InsigniaNoteProfile.OrganizationOrganizationReceive,
InsigniaNoteProfileStatus = p.InsigniaNoteProfile.Status,
p.InsigniaNoteProfile.Issue,
p.InsigniaNoteProfile.Date,
p.InsigniaNoteProfile.VolumeNo,
p.InsigniaNoteProfile.Section,
p.InsigniaNoteProfile.Page,
p.InsigniaNoteProfile.No,
p.InsigniaNoteProfile.DatePayment,
p.InsigniaNoteProfile.TypePayment,
p.InsigniaNoteProfile.Address,
p.InsigniaNoteProfile.Number,
p.InsigniaNoteProfile.Salary,
})
.ToListAsync();
return Success(data);