From 3b36da67ebe509faaf6555926b33b42c8aee9da2 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 11 Aug 2023 10:32:27 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20path=20=E0=B8=A3=E0=B8=B9=E0=B8=9B=E0=B8=82?= =?UTF-8?q?=E0=B8=AD=E0=B9=82=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementTransferController.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 3df15730..de08d28e 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -233,6 +233,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.Id, PrefixId = p.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Prefix.Id, Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name, + AvatarId = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, p.Profile.FirstName, p.Profile.LastName, ProfileId = p.Profile.Id, @@ -270,6 +271,7 @@ namespace BMA.EHR.Placement.Service.Controllers { data.Id, data.ProfileId, + AvataPath = data.AvatarId == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.AvatarId), data.PrefixId, data.Prefix, data.FirstName, From 243700bd53e90d2ccf4b99d6fafdf6455fd62966 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 11 Aug 2023 12:08:48 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4user=E0=B8=96=E0=B8=B6=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RetirementDeceasedController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index 0fc79d8d..4591019c 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -215,6 +215,9 @@ namespace BMA.EHR.Retirement.Service.Controllers .FirstOrDefaultAsync(x => x.Id == req.ProfileId); if (profile == null) return Error(GlobalMessages.DataNotFound, 404); + profile.LeaveDate = DateTime.Now; + profile.IsLeave = true; + profile.LeaveReason = "DEATH"; var retirementDeceased = new RetirementDeceased {