diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts
index 50f164b..aadf96c 100644
--- a/src/controllers/SalaryPeriodEmployeeController.ts
+++ b/src/controllers/SalaryPeriodEmployeeController.ts
@@ -474,7 +474,15 @@ export class SalaryPeriodEmployeeController extends Controller {
         order: { step: "DESC" },
       });
       //เงินเดือนเกินตาราง
-      if (salaryRankMax != null && step > salaryRankMax.step) {
+      if (
+        salaryRankMax != null &&
+        step > salaryRankMax.step &&
+        (salaryFormula == null ||
+          (salaryFormula != null &&
+            salaryProfile.amount != null &&
+            salaryFormula.salaryMax != null &&
+            salaryFormula.salaryMax > salaryProfile.amount))
+      ) {
         group = group + 1;
         //เงินเดือนในกลุ่มต่อไป
         let salaryRankAmount = await this.salaryRankRepository.findOne({
@@ -892,7 +900,15 @@ export class SalaryPeriodEmployeeController extends Controller {
         order: { step: "DESC" },
       });
       //เงินเดือนเกินตาราง
-      if (salaryRankMax != null && step > salaryRankMax.step) {
+      if (
+        salaryRankMax != null &&
+        step > salaryRankMax.step &&
+        (salaryFormula == null ||
+          (salaryFormula != null &&
+            salaryProfile.amount != null &&
+            salaryFormula.salaryMax != null &&
+            salaryFormula.salaryMax > salaryProfile.amount))
+      ) {
         group = group + 1;
         //เงินเดือนในกลุ่มต่อไป
         let salaryRankAmount = await this.salaryRankRepository.findOne({
@@ -1415,7 +1431,15 @@ export class SalaryPeriodEmployeeController extends Controller {
         order: { step: "DESC" },
       });
       //เงินเดือนเกินตาราง
-      if (salaryRankMax != null && step > salaryRankMax.step) {
+      if (
+        salaryRankMax != null &&
+        step > salaryRankMax.step &&
+        (salaryFormula == null ||
+          (salaryFormula != null &&
+            salaryProfile.amount != null &&
+            salaryFormula.salaryMax != null &&
+            salaryFormula.salaryMax > salaryProfile.amount))
+      ) {
         group = group + 1;
         //เงินเดือนในกลุ่มต่อไป
         let salaryRankAmount = await this.salaryRankRepository.findOne({