From b1afd725037f2d802951812dcaea223af91889ce Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 12 Sep 2023 23:17:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B8=B1=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B9=80=E0=B8=A7=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=20set=20noti=20=E0=B8=97=E0=B8=B8=E0=B8=81=E0=B8=AD=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlacementAppointmentController.cs         | 64 +++++++++----------
 .../RetirementDeceasedController.cs           |  6 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
index 5161b5f9..0b6860f4 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@@ -414,44 +414,44 @@ namespace BMA.EHR.Placement.Service.Controllers
                 uppdated.Prefix = save;
             }
 
-            if (req.RelationshipId != null)
-            {
-                var save = await _context.Relationships.FindAsync(req.RelationshipId);
-                if (save == null)
-                    return Error(GlobalMessages.RelationshipNotFound, 404);
-                uppdated.Relationship = save;
-            }
+            // if (req.RelationshipId != null)
+            // {
+            //     var save = await _context.Relationships.FindAsync(req.RelationshipId);
+            //     if (save == null)
+            //         return Error(GlobalMessages.RelationshipNotFound, 404);
+            //     uppdated.Relationship = save;
+            // }
 
-            if (req.ReligionId != null)
-            {
-                var save = await _context.Religions.FindAsync(req.ReligionId);
-                if (save == null)
-                    return Error(GlobalMessages.ReligionNotFound, 404);
-                uppdated.Religion = save;
-            }
+            // if (req.ReligionId != null)
+            // {
+            //     var save = await _context.Religions.FindAsync(req.ReligionId);
+            //     if (save == null)
+            //         return Error(GlobalMessages.ReligionNotFound, 404);
+            //     uppdated.Religion = save;
+            // }
 
-            if (req.BloodGroupId != null)
-            {
-                var save = await _context.BloodGroups.FindAsync(req.BloodGroupId);
-                if (save == null)
-                    return Error(GlobalMessages.BloodGroupNotFound, 404);
-                uppdated.BloodGroup = save;
-            }
+            // if (req.BloodGroupId != null)
+            // {
+            //     var save = await _context.BloodGroups.FindAsync(req.BloodGroupId);
+            //     if (save == null)
+            //         return Error(GlobalMessages.BloodGroupNotFound, 404);
+            //     uppdated.BloodGroup = save;
+            // }
 
-            if (req.GenderId != null)
-            {
-                var save = await _context.Genders.FindAsync(req.GenderId);
-                if (save == null)
-                    return Error(GlobalMessages.GenderNotFound, 404);
-                uppdated.Gender = save;
-            }
+            // if (req.GenderId != null)
+            // {
+            //     var save = await _context.Genders.FindAsync(req.GenderId);
+            //     if (save == null)
+            //         return Error(GlobalMessages.GenderNotFound, 404);
+            //     uppdated.Gender = save;
+            // }
             uppdated.CitizenId = req.CitizenId;
             uppdated.Firstname = req.Firstname;
             uppdated.Lastname = req.Lastname;
-            uppdated.DateOfBirth = req.DateOfBirth;
-            uppdated.Nationality = req.Nationality;
-            uppdated.Race = req.Race;
-            uppdated.TelephoneNumber = req.TelephoneNumber;
+            // uppdated.DateOfBirth = req.DateOfBirth;
+            // uppdated.Nationality = req.Nationality;
+            // uppdated.Race = req.Race;
+            // uppdated.TelephoneNumber = req.TelephoneNumber;
             uppdated.EducationOld = req.EducationOld;
             uppdated.Reason = req.Reason;
             uppdated.OrganizationPositionOld = req.OrganizationPositionOld;
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index 36d21792..cf2daa77 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -314,9 +314,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                         Prefix = orgPos!.Profile!.Prefix!.Name,
                         FirstName = orgPos!.Profile!.FirstName!,
                         LastName = orgPos!.Profile!.LastName!,
-                        // IsSendMail = req.IsSendMail,
-                        // IsSendInbox = req.IsSendInbox,
-                        // IsSendNotification = req.IsSendNotification,
+                        IsSendMail = true,
+                        IsSendInbox = true,
+                        IsSendNotification = true,
                         OrganizationName = orgPos!.OrganizationPosition!.Organization!.OrganizationOrganization!.Name,
                         PositionName = orgPos!.OrganizationPosition!.PositionMaster!.PositionPath!.Name,
                         ReceiveUser = profile,