diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index ecedd689..3767bb5a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -280,10 +280,15 @@ namespace BMA.EHR.Placement.Service.Controllers .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))) .Select(x => new { + Id = x.Id, PersonalId = x.Id, Avatar = x.ProfileImg == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.ProfileImg.Id, FullName = $"{x.Prefix}{x.Firstname} {x.Lastname}", + Prefix = x.Prefix, + Firstname = x.Firstname, + Lastname = x.Lastname, IdCard = x.CitizenId, + CitizenId = x.CitizenId, ExamNumber = x.ExamNumber, posmasterId = x.posmasterId, root = x.root, @@ -327,10 +332,15 @@ namespace BMA.EHR.Placement.Service.Controllers { var _data = new { + p.Id, p.PersonalId, Avatar = p.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(p.Avatar), p.FullName, + p.Prefix, + p.Firstname, + p.Lastname, p.IdCard, + p.CitizenId, p.ExamNumber, p.posmasterId, p.root,