diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 1337a9e..16663b1 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1066,7 +1066,7 @@ export class ReportController extends Controller {
       where: {
         salaryPeriodId: salaryPeriodId,
         rootId: rootId,
-        snapshot: "SNAP2",
+        snapshot: "SNAP1",
         group: "GROUP1",
       },
     });
@@ -1074,7 +1074,7 @@ export class ReportController extends Controller {
       where: {
         salaryPeriodId: salaryPeriodId,
         rootId: rootId,
-        snapshot: "SNAP2",
+        snapshot: "SNAP1",
         group: "GROUP2",
       },
     });
@@ -1117,7 +1117,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1125,7 +1125,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1133,7 +1133,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1141,7 +1141,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1177,7 +1177,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1185,7 +1185,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1193,7 +1193,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1201,7 +1201,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1375,7 +1375,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriod_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1383,7 +1383,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriod_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1433,7 +1433,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1441,7 +1441,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1449,7 +1449,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1457,7 +1457,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease1_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1493,7 +1493,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1501,7 +1501,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_APR?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1509,7 +1509,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP1",
         },
       });
@@ -1517,7 +1517,7 @@ export class ReportController extends Controller {
         where: {
           salaryPeriodId: salaryPeriodIncrease2_OCT?.id,
           rootId: rootId,
-          snapshot: "SNAP2",
+          snapshot: "SNAP1",
           group: "GROUP2",
         },
       });
@@ -1866,7 +1866,7 @@ export class ReportController extends Controller {
           salaryPeriodId: salaryPeriodId,
         },
         type: In(["HAFT", "FULL", "FULLHAFT"]),
-        // isRetired: true, //กรองเฉพาะคนที่เกษียณ
+        isRetired: true, //กรองเฉพาะคนที่เกษียณ
       },
       order: {
         salaryOrg: {