From 94100e304e36ec73a77c7dd0dbf3116c994ad115 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 27 Mar 2025 14:56:09 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=87=E0=B8=AA=E0=B8=B7=E0=B8=AD=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B9=84=E0=B8=A1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=AA=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=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

---
 BMA.EHR.Discipline.Service/Program.cs         |  2 +-
 .../RetirementDeceasedController.cs           | 38 +++++++++----------
 BMA.EHR.Retirement.Service/Program.cs         |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/BMA.EHR.Discipline.Service/Program.cs b/BMA.EHR.Discipline.Service/Program.cs
index 8bd351b4..4ead4ce6 100644
--- a/BMA.EHR.Discipline.Service/Program.cs
+++ b/BMA.EHR.Discipline.Service/Program.cs
@@ -154,7 +154,7 @@ var app = builder.Build();
     app.UseStaticFiles();
     app.MapControllers();
     app.UseMiddleware<ErrorHandlerMiddleware>();
-    //app.UseMiddleware<RequestLoggingMiddleware>();
+    app.UseMiddleware<RequestLoggingMiddleware>();
 
     app.UseHangfireDashboard("/hangfire", new DashboardOptions()
     {
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index 3772e711..27ce95c8 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -394,25 +394,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     retirementDeceased.Document = _doc;
             }
 
-            retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
-            {
-                CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId,
-                Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix,
-                FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName,
-                LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName,
-                IsSendMail = true,
-                IsSendInbox = true,
-                IsSendNotification = true,
-                OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root,
-                PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
-                profileId = req.ProfileId,
-                CreatedFullName = FullName ?? "System Administrator",
-                CreatedUserId = UserId ?? "",
-                CreatedAt = DateTime.Now,
-                LastUpdateFullName = FullName ?? "System Administrator",
-                LastUpdateUserId = UserId ?? "",
-                LastUpdatedAt = DateTime.Now,
-            });
+            //retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
+            //{
+            //    CitizenId = retirementDeceased.citizenId == null ? "" : retirementDeceased.citizenId,
+            //    Prefix = retirementDeceased.prefix == null ? "" : retirementDeceased.prefix,
+            //    FirstName = retirementDeceased.firstName == null ? "" : retirementDeceased.firstName,
+            //    LastName = retirementDeceased.lastName == null ? "" : retirementDeceased.lastName,
+            //    IsSendMail = true,    
+            //    IsSendInbox = true,
+            //    IsSendNotification = true,
+            //    OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root,
+            //    PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
+            //    profileId = req.ProfileId,
+            //    CreatedFullName = FullName ?? "System Administrator",
+            //    CreatedUserId = UserId ?? "",
+            //    CreatedAt = DateTime.Now,
+            //    LastUpdateFullName = FullName ?? "System Administrator",
+            //    LastUpdateUserId = UserId ?? "",
+            //    LastUpdatedAt = DateTime.Now,
+            //});
 
             var pathUrl = $"{_configuration["API"]}/org/command/find-higher";
             using (var client = new HttpClient())
diff --git a/BMA.EHR.Retirement.Service/Program.cs b/BMA.EHR.Retirement.Service/Program.cs
index 138f1553..f8cf5bf8 100644
--- a/BMA.EHR.Retirement.Service/Program.cs
+++ b/BMA.EHR.Retirement.Service/Program.cs
@@ -161,7 +161,7 @@ var app = builder.Build();
     app.UseStaticFiles();
     app.MapControllers();
     app.UseMiddleware<ErrorHandlerMiddleware>();
-    //app.UseMiddleware<RequestLoggingMiddleware>();
+    app.UseMiddleware<RequestLoggingMiddleware>();
 
     app.UseHangfireDashboard("/hangfire", new DashboardOptions()
     {