diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index 3e2eee08..3772e711 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -403,7 +403,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 IsSendMail = true,
                 IsSendInbox = true,
                 IsSendNotification = true,
-                OrganizationName = retirementDeceased.OrganizationName,
+                OrganizationName = retirementDeceased.root == null ? "" : retirementDeceased.root,
                 PositionName = retirementDeceased.position == null ? "" : retirementDeceased.position,
                 profileId = req.ProfileId,
                 CreatedFullName = FullName ?? "System Administrator",
@@ -434,19 +434,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     {
                         if (higher.profileId != null)
                         {
-                            var payload_attach = new List<PayloadAttachment>();
-                            payload_attach.Add(new PayloadAttachment
-                            {
-                                name = "หนังสือเวียนถึงแก่กรรม",
-                                url = $"{_configuration["APIV2"]}/report/deceased/copy/36/{retirementDeceased.Id}"
-                            });
+                            //var payload_attach = new List<PayloadAttachment>();
+                            //payload_attach.Add(new PayloadAttachment
+                            //{
+                            //    name = "หนังสือเวียนถึงแก่กรรม",
+                            //    url = $"{_configuration["APIV2"]}/report/deceased/copy/36/{retirementDeceased.Id}"
+                            //});
 
-                            var payload = new CommandPayload()
-                            {
-                                attachments = payload_attach
-                            };
+                            //var payload = new CommandPayload()
+                            //{
+                            //    attachments = payload_attach
+                            //};
 
-                            var payload_str = JsonConvert.SerializeObject(payload);
+                            //var payload_str = JsonConvert.SerializeObject(payload);
                             await _repositoryNoti.PushNotificationAsync(
                                 Guid.Parse(higher.profileId),
                                 $"หนังสือเวียนถึงแก่กรรมของ {higher.prefix}{higher.firstName} {higher.lastName}",