diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
index cbe34be6..bc2c4d60 100644
--- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
@@ -198,27 +198,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                                 G9Female = g.Sum(x => x.Gendor == "หญิง" ? 1 : 0),
                             }).ToList();
 
-            return new
-            {
-                G1Male = insignia.Sum(x => x.G1Male),
-                G1Female = insignia.Sum(x => x.G1Female),
-                G2Male = insignia.Sum(x => x.G2Male),
-                G2Female = insignia.Sum(x => x.G2Female),
-                G3Male = insignia.Sum(x => x.G3Male),
-                G3Female = insignia.Sum(x => x.G3Female),
-                G4Male = insignia.Sum(x => x.G4Male),
-                G4Female = insignia.Sum(x => x.G4Female),
-                G5Male = insignia.Sum(x => x.G5Male),
-                G5Female = insignia.Sum(x => x.G5Female),
-                G6Male = insignia.Sum(x => x.G6Male),
-                G6Female = insignia.Sum(x => x.G6Female),
-                G7Male = insignia.Sum(x => x.G7Male),
-                G7Female = insignia.Sum(x => x.G7Female),
-                G8Male = insignia.Sum(x => x.G8Male),
-                G8Female = insignia.Sum(x => x.G8Female),
-                G9Male = insignia.Sum(x => x.G9Male),
-                G9Female = insignia.Sum(x => x.G9Female),
-            };
+            return insignia;
         }
 
         public async Task<dynamic> GetKhr2TotalReport(Guid id)
@@ -268,7 +248,27 @@ namespace BMA.EHR.Application.Repositories.Reports
                                 G9Female = g.Sum(x => x.Gendor == "หญิง" ? 1 : 0),
                             }).ToList();
 
-            return insignia;
+            return new
+            {
+                G1Male = insignia.Sum(x => x.G1Male),
+                G1Female = insignia.Sum(x => x.G1Female),
+                G2Male = insignia.Sum(x => x.G2Male),
+                G2Female = insignia.Sum(x => x.G2Female),
+                G3Male = insignia.Sum(x => x.G3Male),
+                G3Female = insignia.Sum(x => x.G3Female),
+                G4Male = insignia.Sum(x => x.G4Male),
+                G4Female = insignia.Sum(x => x.G4Female),
+                G5Male = insignia.Sum(x => x.G5Male),
+                G5Female = insignia.Sum(x => x.G5Female),
+                G6Male = insignia.Sum(x => x.G6Male),
+                G6Female = insignia.Sum(x => x.G6Female),
+                G7Male = insignia.Sum(x => x.G7Male),
+                G7Female = insignia.Sum(x => x.G7Female),
+                G8Male = insignia.Sum(x => x.G8Male),
+                G8Female = insignia.Sum(x => x.G8Female),
+                G9Male = insignia.Sum(x => x.G9Male),
+                G9Female = insignia.Sum(x => x.G9Female),
+            };
         }
 
         public async Task<dynamic> GetKhr3Report(Guid id)