From 3582a6d78327b70aa2ddb4f43fb75f673ac025c5 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Mon, 7 Aug 2023 13:18:08 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20type=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0?=
 =?UTF-8?q?=E0=B8=97=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=B2=E0=B8=A8?=
 =?UTF-8?q?=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs | 8 ++++----
 .../Controllers/RetirementController.cs                   | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs b/BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs
index 21fb8e24..df806171 100644
--- a/BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs
+++ b/BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs
@@ -35,11 +35,11 @@ namespace BMA.EHR.Domain.Models.Organizations
         [Column(Order = 9), Comment("ParentId")]
         public OrganizationEntity? Parent { get; set; }
 
-        // [Column(Order = 10), Comment("OrganizationAgencyId")]
-        // public OrganizationAgency? OrganizationAgency { get; set; }
+        [Column(Order = 10), Comment("OrganizationAgencyId")]
+        public OrganizationAgency? OrganizationAgency { get; set; }
 
-        // [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
-        // public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
+        [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
+        public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
 
         [Column(Order = 12), Comment("OrganizationOrder")]
         public int? OrganizationOrder { get; set; }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
index 75558e09..89970736 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
@@ -164,6 +164,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         Year = x.Year,
                                         Round = x.Round,
                                         Total = x.Total,
+                                        TypeReport = x.TypeReport,
                                         Json = true,
                                     })
                                     .ToListAsync();
@@ -182,6 +183,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                         Year = retire.Year,
                         Round = retire.Round,
                         Total = retire.RetirementProfiles.Count(),
+                        TypeReport = retire.TypeReport,
                         Json = false,
                     });
                 }