diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index dca86be2..7f170ec0 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -553,6 +553,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
             if (retirementDeceased == null)
                 return Error(GlobalMessages.RetirementDeceasedNotFound, 404);
 
+            bool checkDup = req.Persons.Any(x => retirementDeceased.RetirementDeceasedNotis.Any(y => y.profileId == x.ProfileId));
+            if (checkDup)
+                return Error("ไม่สามารถเพิ่มรายชื่อส่งหนังสือเวียนซ้ำได้", 404);
+
             foreach (var item in req.Persons)
             {
                 // var profile = await _context.Profiles.AsQueryable()
@@ -574,8 +578,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     LastUpdateUserId = UserId ?? "",
                     LastUpdatedAt = DateTime.Now,
                 };
-                if (retirementDeceased.profileType.Trim().ToUpper() == "OFFICER")
-                {
+                //if (retirementDeceased.profileType.Trim().ToUpper() == "OFFICER")
+                //{
                     var apiUrl = $"{_configuration["API"]}/org/profile/profileid/position/{item.ProfileId}";
                     using (var client = new HttpClient())
                     {
@@ -602,36 +606,36 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                                                 (org.result.root == null ? "" : org.result.root);
                         retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti);
                     }
-                }
-                else
-                {
-                    var apiUrl = $"{_configuration["API"]}/org/profile-employee/profileid/position/{item.ProfileId}";
-                    using (var client = new HttpClient())
-                    {
-                        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                        var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
-                        var _res = await client.SendAsync(_req);
-                        var _result = await _res.Content.ReadAsStringAsync();
+                //}
+                //else
+                //{
+                //    var apiUrl = $"{_configuration["API"]}/org/profile-employee/profileid/position/{item.ProfileId}";
+                //    using (var client = new HttpClient())
+                //    {
+                //        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                //        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                //        var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
+                //        var _res = await client.SendAsync(_req);
+                //        var _result = await _res.Content.ReadAsStringAsync();
 
-                        var org = JsonConvert.DeserializeObject<Requests.OrgRequest>(_result);
+                //        var org = JsonConvert.DeserializeObject<Requests.OrgRequest>(_result);
 
-                        if (org == null || org.result == null)
-                            continue;
+                //        if (org == null || org.result == null)
+                //            continue;
 
-                        retirementDeceasedNoti.Prefix = org.result.prefix == null ? "" : org.result.prefix;
-                        retirementDeceasedNoti.FirstName = org.result.firstName == null ? "" : org.result.firstName;
-                        retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName;
-                        retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId;
-                        retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position;
-                        retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
-                                                                (org.result.child3 == null ? "" : org.result.child3 + "\n") +
-                                                                (org.result.child2 == null ? "" : org.result.child2 + "\n") +
-                                                                (org.result.child1 == null ? "" : org.result.child1 + "\n") +
-                                                                (org.result.root == null ? "" : org.result.root);
-                        retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti);
-                    }
-                }
+                //        retirementDeceasedNoti.Prefix = org.result.prefix == null ? "" : org.result.prefix;
+                //        retirementDeceasedNoti.FirstName = org.result.firstName == null ? "" : org.result.firstName;
+                //        retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName;
+                //        retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId;
+                //        retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position;
+                //        retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
+                //                                                (org.result.child3 == null ? "" : org.result.child3 + "\n") +
+                //                                                (org.result.child2 == null ? "" : org.result.child2 + "\n") +
+                //                                                (org.result.child1 == null ? "" : org.result.child1 + "\n") +
+                //                                                (org.result.root == null ? "" : org.result.root);
+                //        retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti);
+                //    }
+                //}
 
                 await _context.SaveChangesAsync();
             }