no message
This commit is contained in:
parent
4cf3f15fb8
commit
78ebcd3a4e
1 changed files with 10 additions and 0 deletions
|
|
@ -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)))))
|
.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
|
.Select(x => new
|
||||||
{
|
{
|
||||||
|
Id = x.Id,
|
||||||
PersonalId = x.Id,
|
PersonalId = x.Id,
|
||||||
Avatar = x.ProfileImg == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.ProfileImg.Id,
|
Avatar = x.ProfileImg == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.ProfileImg.Id,
|
||||||
FullName = $"{x.Prefix}{x.Firstname} {x.Lastname}",
|
FullName = $"{x.Prefix}{x.Firstname} {x.Lastname}",
|
||||||
|
Prefix = x.Prefix,
|
||||||
|
Firstname = x.Firstname,
|
||||||
|
Lastname = x.Lastname,
|
||||||
IdCard = x.CitizenId,
|
IdCard = x.CitizenId,
|
||||||
|
CitizenId = x.CitizenId,
|
||||||
ExamNumber = x.ExamNumber,
|
ExamNumber = x.ExamNumber,
|
||||||
posmasterId = x.posmasterId,
|
posmasterId = x.posmasterId,
|
||||||
root = x.root,
|
root = x.root,
|
||||||
|
|
@ -327,10 +332,15 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
{
|
{
|
||||||
var _data = new
|
var _data = new
|
||||||
{
|
{
|
||||||
|
p.Id,
|
||||||
p.PersonalId,
|
p.PersonalId,
|
||||||
Avatar = p.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(p.Avatar),
|
Avatar = p.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(p.Avatar),
|
||||||
p.FullName,
|
p.FullName,
|
||||||
|
p.Prefix,
|
||||||
|
p.Firstname,
|
||||||
|
p.Lastname,
|
||||||
p.IdCard,
|
p.IdCard,
|
||||||
|
p.CitizenId,
|
||||||
p.ExamNumber,
|
p.ExamNumber,
|
||||||
p.posmasterId,
|
p.posmasterId,
|
||||||
p.root,
|
p.root,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue