From eb9fce3a0a008381132ac17cbe17045389782b46 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 8 Aug 2023 17:39:46 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A7=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B9=81=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=96=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=87=E0=B9=81=E0=B8=81=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A1=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A7=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/RetirementDeceasedController.cs             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index c0d2e24e..f24b8ef4 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -67,6 +67,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
                             p.Profile.FirstName,
                             p.Profile.LastName,
+                            Position = p.Profile.Position == null ? null : p.Profile.Position.Name,
                             PositionType = p.Profile.PositionType == null ? null : p.Profile.PositionType.Name,
                             p.Profile.PositionLine,
                             // PositionLine = p.Profile.PositionLine == null ? null : p.Profile.PositionLine.Name,
@@ -94,6 +95,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     data.Prefix,
                     data.FirstName,
                     data.LastName,
+                    data.Position,
                     data.PositionExecutive,
                     data.PositionType,
                     data.PositionLine,
@@ -135,6 +137,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             PrefixId = p.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Prefix.Id,
                             p.Profile.FirstName,
                             p.Profile.LastName,
+                            Position = p.Profile.Position == null ? null : p.Profile.Position.Name,
+                            PositionId = p.Profile.Position == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Position.Id,
                             PositionType = p.Profile.PositionType == null ? null : p.Profile.PositionType.Name,
                             PositionTypeId = p.Profile.PositionType == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.PositionType.Id,
                             p.Profile.PositionLine,
@@ -167,11 +171,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 data.PrefixId,
                 data.FirstName,
                 data.LastName,
+                data.Position,
                 data.PositionExecutive,
                 data.PositionType,
                 data.PositionLine,
                 data.PositionLevel,
                 data.Organization,
+                data.PositionId,
                 data.PositionExecutiveId,
                 data.PositionTypeId,
                 data.PositionLineId,