diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index e039e9f..ea6fcfb 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -246,8 +246,7 @@ export class SalaryPeriodController extends Controller {
     if (salaryProfile.type == "NONE") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
-      salaryProfile.positionSalaryAmount =
-        salaryProfile.amount == null ? 0 : salaryProfile.amount;
+      salaryProfile.positionSalaryAmount = salaryProfile.amount == null ? 0 : salaryProfile.amount;
     } else if (salaryProfile.type == "PENDING") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
@@ -263,11 +262,9 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial; 
+          : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryHalf == null
-          ? 0
-          : salaryRanks.salaryHalf; 
+        salaryRanks == null || salaryRanks.salaryHalf == null ? 0 : salaryRanks.salaryHalf;
     } else if (salaryProfile.type == "FULL") {
       salaryProfile.amountSpecial =
         salaryRanks == null || salaryRanks.salaryFullSpecial == null
@@ -281,9 +278,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryFull - salaryProfile.amount + salaryRanks.salaryFullSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryFull == null
-          ? 0
-          : salaryRanks.salaryFull;
+        salaryRanks == null || salaryRanks.salaryFull == null ? 0 : salaryRanks.salaryFull;
     } else if (salaryProfile.type == "FULLHAFT") {
       salaryProfile.amountSpecial =
         salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null
@@ -297,9 +292,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryFullHalf - salaryProfile.amount + salaryRanks.salaryFullHalfSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryFullHalf == null
-          ? 0
-          : salaryRanks.salaryFullHalf;
+        salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 : salaryRanks.salaryFullHalf;
     } else {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ประเภทการเลื่อนขึ้นเงินเดือนไม่ถูกต้อง");
     }
@@ -485,8 +478,7 @@ export class SalaryPeriodController extends Controller {
     if (body.type == "NONE") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
-      salaryProfile.positionSalaryAmount =
-        salaryProfile.amount == null ? 0 : salaryProfile.amount;
+      salaryProfile.positionSalaryAmount = salaryProfile.amount == null ? 0 : salaryProfile.amount;
     } else if (body.type == "PENDING") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
@@ -504,9 +496,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryHalf == null
-          ? 0
-          : salaryRanks.salaryHalf;
+        salaryRanks == null || salaryRanks.salaryHalf == null ? 0 : salaryRanks.salaryHalf;
     } else if (body.type == "FULL") {
       salaryProfile.amountSpecial =
         salaryRanks == null || salaryRanks.salaryFullSpecial == null
@@ -520,9 +510,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryFull - salaryProfile.amount + salaryRanks.salaryFullSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryFull == null
-          ? 0
-          : salaryRanks.salaryFull;
+        salaryRanks == null || salaryRanks.salaryFull == null ? 0 : salaryRanks.salaryFull;
     } else if (body.type == "FULLHAFT") {
       salaryProfile.amountSpecial =
         salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null
@@ -536,9 +524,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryFullHalf - salaryProfile.amount + salaryRanks.salaryFullHalfSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryFullHalf == null
-          ? 0
-          : salaryRanks.salaryFullHalf;
+        salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 : salaryRanks.salaryFullHalf;
     } else {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ประเภทการเลื่อนขึ้นเงินเดือนไม่ถูกต้อง");
     }
@@ -744,8 +730,7 @@ export class SalaryPeriodController extends Controller {
     if (salaryProfile.type == "NONE") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
-      salaryProfile.positionSalaryAmount =
-        salaryProfile.amount == null ? 0 : salaryProfile.amount;
+      salaryProfile.positionSalaryAmount = salaryProfile.amount == null ? 0 : salaryProfile.amount;
     } else if (salaryProfile.type == "PENDING") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
@@ -763,9 +748,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryHalf == null
-          ? 0
-          : salaryRanks.salaryHalf;
+        salaryRanks == null || salaryRanks.salaryHalf == null ? 0 : salaryRanks.salaryHalf;
     } else if (salaryProfile.type == "FULL") {
       salaryProfile.amountSpecial =
         salaryRanks == null || salaryRanks.salaryFullSpecial == null
@@ -779,9 +762,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryFull - salaryProfile.amount + salaryRanks.salaryFullSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryFull == null
-          ? 0
-          : salaryRanks.salaryFull;
+        salaryRanks == null || salaryRanks.salaryFull == null ? 0 : salaryRanks.salaryFull;
     } else if (salaryProfile.type == "FULLHAFT") {
       salaryProfile.amountSpecial =
         salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null
@@ -795,9 +776,7 @@ export class SalaryPeriodController extends Controller {
           ? 0
           : salaryRanks.salaryFullHalf - salaryProfile.amount + salaryRanks.salaryFullHalfSpecial;
       salaryProfile.positionSalaryAmount =
-        salaryRanks == null || salaryRanks.salaryFullHalf == null
-          ? 0
-          : salaryRanks.salaryFullHalf;
+        salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 : salaryRanks.salaryFullHalf;
     } else {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
@@ -1195,6 +1174,7 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.currentAmount = totalProfile;
               _salaryOrg.sixPercentAmount = totalProfile * 0.06;
               _salaryOrg.spentAmount = totalAmount;
+              _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
             } else {
               _salaryOrg.currentAmount = salaryOrgSnap1.currentAmount;
               _salaryOrg.sixPercentAmount = salaryOrgSnap1.sixPercentAmount;
@@ -1207,6 +1187,7 @@ export class SalaryPeriodController extends Controller {
             _salaryOrg.currentAmount = totalProfile;
             _salaryOrg.sixPercentAmount = totalProfile * 0.06;
             _salaryOrg.spentAmount = totalAmount;
+            _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
           }
 
           await this.salaryOrgRepository.save(_salaryOrg);
@@ -1228,6 +1209,7 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.total = _salaryOrg.salaryProfiles.length;
               _salaryOrg.fifteenPercent = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
               _salaryOrg.fifteenPoint = (_salaryOrg.salaryProfiles.length * 15) % 100;
+              _salaryOrg.remainQuota = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
             } else {
               _salaryOrg.total = salaryOrgSnap1.total;
               _salaryOrg.fifteenPercent = salaryOrgSnap1.fifteenPercent;
@@ -1239,6 +1221,7 @@ export class SalaryPeriodController extends Controller {
             _salaryOrg.total = _salaryOrg.salaryProfiles.length;
             _salaryOrg.fifteenPercent = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
             _salaryOrg.fifteenPoint = (_salaryOrg.salaryProfiles.length * 15) % 100;
+            _salaryOrg.remainQuota = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
           }
 
           await this.salaryOrgRepository.save(_salaryOrg);
@@ -1471,6 +1454,7 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.currentAmount = totalProfile;
               _salaryOrg.sixPercentAmount = totalProfile * 0.06;
               _salaryOrg.spentAmount = totalAmount;
+              _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
             } else {
               _salaryOrg.currentAmount = salaryOrgSnap1.currentAmount;
               _salaryOrg.sixPercentAmount = salaryOrgSnap1.sixPercentAmount;
@@ -1483,6 +1467,7 @@ export class SalaryPeriodController extends Controller {
             _salaryOrg.currentAmount = totalProfile;
             _salaryOrg.sixPercentAmount = totalProfile * 0.06;
             _salaryOrg.spentAmount = totalAmount;
+            _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
           }
 
           await this.salaryOrgRepository.save(_salaryOrg);
@@ -1504,6 +1489,7 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.total = _salaryOrg.salaryProfiles.length;
               _salaryOrg.fifteenPercent = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
               _salaryOrg.fifteenPoint = (_salaryOrg.salaryProfiles.length * 15) % 100;
+              _salaryOrg.remainQuota = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
             } else {
               _salaryOrg.total = salaryOrgSnap1.total;
               _salaryOrg.fifteenPercent = salaryOrgSnap1.fifteenPercent;
@@ -1515,6 +1501,7 @@ export class SalaryPeriodController extends Controller {
             _salaryOrg.total = _salaryOrg.salaryProfiles.length;
             _salaryOrg.fifteenPercent = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
             _salaryOrg.fifteenPoint = (_salaryOrg.salaryProfiles.length * 15) % 100;
+            _salaryOrg.remainQuota = Math.floor((_salaryOrg.salaryProfiles.length * 15) / 100);
           }
 
           await this.salaryOrgRepository.save(_salaryOrg);