diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index bf18879a..d64917a8 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -326,8 +326,9 @@ namespace BMA.EHR.Placement.Service.Controllers p.posLevelOldId, 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 }), + Docs = p.Avatar ?? null, }) .FirstOrDefaultAsync(); if (data == null) @@ -343,6 +344,16 @@ namespace BMA.EHR.Placement.Service.Controllers // }; // placementReceiveDocs.Add(_doc); //} + var _Docs = new List(); + if (data.Docs != null) + { + var _doc = new + { + FileName = data.Docs?.FileName, + PathName = await _documentService.ImagesPath(data.Docs?.Id) + }; + _Docs.Add(_doc); + } var _data = new { data.Id, @@ -427,9 +438,9 @@ namespace BMA.EHR.Placement.Service.Controllers data.posLevelOldId, 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 = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar) + Docs = _Docs, }; return Success(_data);