diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index 570a0c30..e6b5cfcd 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
@@ -817,6 +817,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   amount = r.amount,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
+                                  isGovernment = false,
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -913,6 +914,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   amount = r.amount,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
+                                  isGovernment = false,
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -1067,6 +1069,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   amount = r.amount,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
+                                  isGovernment = false
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -1179,6 +1182,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                   amount = r.amount,
                                   positionSalaryAmount = r.positionSalaryAmount,
                                   mouthSalaryAmount = r.mouthSalaryAmount,
+                                  isGovernment = false
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index 070e62f6..459aee65 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -1712,7 +1712,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                           positionType = p.posTypeName == null ? string.Empty : p.posTypeName,
                                           positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
                                           refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
-                                          templateDoc = r.templateDoc
+                                          templateDoc = r.templateDoc,
+                                          isGovernment = true
                                       },
                                       bodyPosition = new
                                       {
@@ -1978,7 +1979,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                           positionType = p.posTypeName == null ? string.Empty : p.posTypeName,
                                           positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
                                           refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
-                                          templateDoc = r.templateDoc
+                                          templateDoc = r.templateDoc,
+                                          isGovernment = true
                                       },
                                       bodyPosition = new
                                       {
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index 53900634..263d33ab 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -759,6 +759,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   isLeave = false,
                                   leaveReason = _null,
                                   dateLeave = _null,
+                                  isGovernment = true,
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
@@ -911,6 +912,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   isLeave = false,
                                   leaveReason = _null,
                                   dateLeave = _null,
+                                  isGovernment = true
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index eea78c11..c442f029 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -547,6 +547,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   isLeave = true,
                                   leaveReason = "ให้ออกจากราชการ",
                                   dateLeave = r.commandAffectDate,
+                                  isGovernment = false
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index eb9850bd..e3c603ae 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -1882,6 +1882,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                   isLeave = true,
                                   leaveReason = "ลาออกจากราชการ",
                                   dateLeave = r.commandAffectDate,
+                                  isGovernment = false
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];