This commit is contained in:
parent
c657398e72
commit
94446fe6fd
1 changed files with 14 additions and 13 deletions
|
|
@ -326,23 +326,23 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
p.posLevelOldId,
|
p.posLevelOldId,
|
||||||
p.posLevelNameOld,
|
p.posLevelNameOld,
|
||||||
|
|
||||||
// Avatar = p.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Avatar.Id,
|
Avatar = p.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Avatar.Id,
|
||||||
PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
//PlacementReceiveDocs = p.PlacementReceiveDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||||
})
|
})
|
||||||
.FirstOrDefaultAsync();
|
.FirstOrDefaultAsync();
|
||||||
if (data == null)
|
if (data == null)
|
||||||
return Error(GlobalMessages.DataNotFound, 404);
|
return Error(GlobalMessages.DataNotFound, 404);
|
||||||
|
|
||||||
var placementReceiveDocs = new List<dynamic>();
|
//var placementReceiveDocs = new List<dynamic>();
|
||||||
foreach (var doc in data.PlacementReceiveDocs)
|
//foreach (var doc in data.PlacementReceiveDocs)
|
||||||
{
|
//{
|
||||||
var _doc = new
|
// var _doc = new
|
||||||
{
|
// {
|
||||||
doc.FileName,
|
// doc.FileName,
|
||||||
PathName = await _documentService.ImagesPath(doc.Id)
|
// PathName = await _documentService.ImagesPath(doc.Id)
|
||||||
};
|
// };
|
||||||
placementReceiveDocs.Add(_doc);
|
// placementReceiveDocs.Add(_doc);
|
||||||
}
|
//}
|
||||||
var _data = new
|
var _data = new
|
||||||
{
|
{
|
||||||
data.Id,
|
data.Id,
|
||||||
|
|
@ -428,7 +428,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
data.posLevelNameOld,
|
data.posLevelNameOld,
|
||||||
|
|
||||||
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
// Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar),
|
||||||
Docs = placementReceiveDocs,
|
//Docs = placementReceiveDocs,
|
||||||
|
Docs = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar)
|
||||||
};
|
};
|
||||||
|
|
||||||
return Success(_data);
|
return Success(_data);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue