diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 13fe465a..d4cd4377 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -3047,6 +3047,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   commandCode = r.commandCode,
                                   commandName = r.commandName,
                                   remark = r.remark,
+                                  resignId = p.RetirementResign.Id,
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -3075,26 +3076,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     }
                 }
             }
-            else
-            {
-                var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
-                using (var client = new HttpClient())
-                {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                    var _res = await client.PostAsJsonAsync(apiUrlOrg, new
-                    {
-                        commandId = resultData.Select(x => x.commandId).ToList(),
-                    });
-                    var _result = await _res.Content.ReadAsStringAsync();
-                    if (_res.IsSuccessStatusCode)
-                    {
-                        data.ForEach(profile => profile.Status = "DONE");
-                        data.ForEach(profile => profile.RetirementResign.Status = "CANCEL");
-                        await _context.SaveChangesAsync();
-                    }
-                }
-            }
+            //else
+            //{
+            //    var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
+            //    using (var client = new HttpClient())
+            //    {
+            //        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+            //        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+            //        var _res = await client.PostAsJsonAsync(apiUrlOrg, new
+            //        {
+            //            commandId = resultData.Select(x => x.commandId).ToList(),
+            //        });
+            //        var _result = await _res.Content.ReadAsStringAsync();
+            //        if (_res.IsSuccessStatusCode)
+            //        {
+            //            data.ForEach(profile => profile.Status = "DONE");
+            //            data.ForEach(profile => profile.RetirementResign.Status = "CANCEL");
+            //            await _context.SaveChangesAsync();
+            //        }
+            //    }
+            //}
             return Success();
         }
 
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 68ed109b..6c46d608 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -2542,6 +2542,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   commandCode = r.commandCode,
                                   commandName = r.commandName,
                                   remark = r.remark,
+                                  resignId = p.RetirementResignEmployee.Id
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -2571,26 +2572,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     }
                 }
             }
-            else
-            {
-                var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
-                using (var client = new HttpClient())
-                {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                    var _res = await client.PostAsJsonAsync(apiUrlOrg, new
-                    {
-                        commandId = resultData.Select(x => x.commandId).ToList(),
-                    });
-                    var _result = await _res.Content.ReadAsStringAsync();
-                    if (_res.IsSuccessStatusCode)
-                    {
-                        data.ForEach(profile => profile.Status = "DONE");
-                        data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL");
-                        await _context.SaveChangesAsync();
-                    }
-                }
-            }
+            //else
+            //{
+            //    var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
+            //    using (var client = new HttpClient())
+            //    {
+            //        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+            //        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+            //        var _res = await client.PostAsJsonAsync(apiUrlOrg, new
+            //        {
+            //            commandId = resultData.Select(x => x.commandId).ToList(),
+            //        });
+            //        var _result = await _res.Content.ReadAsStringAsync();
+            //        if (_res.IsSuccessStatusCode)
+            //        {
+            //            data.ForEach(profile => profile.Status = "DONE");
+            //            data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL");
+            //            await _context.SaveChangesAsync();
+            //        }
+            //    }
+            //}
             return Success();
         }