diff --git a/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs b/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs
index f233921f..75ffc858 100644
--- a/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs
@@ -70,7 +70,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break;
                     case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break;
                 }
-                
+
                 var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"39-แบบ ขร1 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นสายสะพาย.trdp");
 
                 ReportPackager reportPacker = new ReportPackager();
@@ -171,7 +171,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 {
                     _Khr2List.Add(new
                     {
-                        RowNo = _Khr2List.Count+1,
+                        RowNo = _Khr2List.Count + 1,
                         DepartmentName = _data.GetType().GetProperty("DepartmentName").GetValue(_data),
                         G1Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
                         G1Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
@@ -183,14 +183,14 @@ namespace BMA.EHR.Report.Service.Controllers
                         G4Female = _data.GetType().GetProperty("G4Female").GetValue(_data),
                         G5Male = _data.GetType().GetProperty("G5Male").GetValue(_data),
                         G5Female = _data.GetType().GetProperty("G5Female").GetValue(_data),
-                        G6Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
-                        G6Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
-                        G7Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
-                        G7Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
-                        G8Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
-                        G8Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
-                        G9Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
-                        G9Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
+                        G6Male = _data.GetType().GetProperty("G6Male").GetValue(_data),
+                        G6Female = _data.GetType().GetProperty("G6Female").GetValue(_data),
+                        G7Male = _data.GetType().GetProperty("G7Male").GetValue(_data),
+                        G7Female = _data.GetType().GetProperty("G7Female").GetValue(_data),
+                        G8Male = _data.GetType().GetProperty("G8Male").GetValue(_data),
+                        G8Female = _data.GetType().GetProperty("G8Female").GetValue(_data),
+                        G9Male = _data.GetType().GetProperty("G9Male").GetValue(_data),
+                        G9Female = _data.GetType().GetProperty("G9Female").GetValue(_data),
                         Remark = _data.GetType().GetProperty("Remark").GetValue(_data),
                     });
                 }
@@ -245,7 +245,7 @@ namespace BMA.EHR.Report.Service.Controllers
                 ReportPackager reportPacker = new ReportPackager();
                 Telerik.Reporting.Report? report = null;
 
-        
+
 
                 using (var sourceStream = System.IO.File.OpenRead(rptFile))
                 {