Fix รับโอน รูปภาพไม่แสดง issue #1168
Some checks failed
release-dev / release-dev (push) Failing after 11s
Some checks failed
release-dev / release-dev (push) Failing after 11s
This commit is contained in:
parent
94446fe6fd
commit
18be7bee37
1 changed files with 14 additions and 3 deletions
|
|
@ -326,8 +326,9 @@ 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 }),
|
||||||
|
Docs = p.Avatar ?? null,
|
||||||
})
|
})
|
||||||
.FirstOrDefaultAsync();
|
.FirstOrDefaultAsync();
|
||||||
if (data == null)
|
if (data == null)
|
||||||
|
|
@ -343,6 +344,16 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
// };
|
// };
|
||||||
// placementReceiveDocs.Add(_doc);
|
// placementReceiveDocs.Add(_doc);
|
||||||
//}
|
//}
|
||||||
|
var _Docs = new List<dynamic>();
|
||||||
|
if (data.Docs != null)
|
||||||
|
{
|
||||||
|
var _doc = new
|
||||||
|
{
|
||||||
|
FileName = data.Docs?.FileName,
|
||||||
|
PathName = await _documentService.ImagesPath(data.Docs?.Id)
|
||||||
|
};
|
||||||
|
_Docs.Add(_doc);
|
||||||
|
}
|
||||||
var _data = new
|
var _data = new
|
||||||
{
|
{
|
||||||
data.Id,
|
data.Id,
|
||||||
|
|
@ -427,9 +438,9 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
data.posLevelOldId,
|
data.posLevelOldId,
|
||||||
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)
|
Docs = _Docs,
|
||||||
};
|
};
|
||||||
|
|
||||||
return Success(_data);
|
return Success(_data);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue