From 18be7bee3756751acd4d5e341bc3152400a92107 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 2 Jul 2025 15:17:51 +0700 Subject: [PATCH] =?UTF-8?q?Fix=20=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82?= =?UTF-8?q?=E0=B8=AD=E0=B8=99=20=E0=B8=A3=E0=B8=B9=E0=B8=9B=E0=B8=A0?= =?UTF-8?q?=E0=B8=B2=E0=B8=9E=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=81=E0=B8=AA?= =?UTF-8?q?=E0=B8=94=E0=B8=87=20issue=20#1168?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementReceiveController.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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);