diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 282dc18..8698b96 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -8828,6 +8828,7 @@ export class ReportController extends Controller {
               commandNo: v.commandNo,
               commandYear: v.commandYear,
               commandId: v.commandId,
+              salaryLevel: salary.salaryLevel && salary.salaryLevelNew ? salary.salaryLevelNew : salary.salaryLevel,
             })
             .then(async () => {
               const before = null;
diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 83b9ae6..4bc4090 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -1570,11 +1570,18 @@ export class SalaryPeriodController extends Controller {
             type: body.type == null ? "" : `${body.type.toUpperCase()}`,
           })
             .andWhere(
-              body.isRetire != null
-                ? body.isRetire == "1"
-                  ? `profile.isRetired = true`
-                  : `profile.isRetired = false`
-                : "1=1",
+              // body.isRetire != null
+              //   ? body.isRetire == "1"
+              //     ? `profile.isRetired = true`
+              //     : `profile.isRetired = false`
+              //   : "1=1",
+              body.isRetire == null
+              ? `profile.isRetired = false`
+              : body.isRetire == "1"
+              ? `profile.isRetired = true`
+              : body.isRetire == "0"
+              ? `profile.isRetired = false`
+              : "1=1",
             )
             .andWhere({
               salaryOrgId: salaryOrg.id,