diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 682cfc0..2b8c96d 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -2920,6 +2920,12 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.sixPercentAmount = totalProfile * 0.06;
               _salaryOrg.spentAmount = totalAmount;
               _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
+              
+              //เพิ่มคำนวน 15%
+              _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.currentAmount = salaryOrgSnap1.currentAmount;
               _salaryOrg.total = salaryOrgSnap1.total;
@@ -2927,6 +2933,12 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.spentAmount = salaryOrgSnap1.spentAmount;
               _salaryOrg.useAmount = salaryOrgSnap1.useAmount;
               _salaryOrg.remainingAmount = salaryOrgSnap1.remainingAmount;
+
+               //เพิ่มคำนวน 15%
+              _salaryOrg.fifteenPercent = salaryOrgSnap1.fifteenPercent;
+              _salaryOrg.fifteenPoint = salaryOrgSnap1.fifteenPoint;
+              _salaryOrg.quantityUsed = salaryOrgSnap1.quantityUsed;
+              _salaryOrg.remainQuota = salaryOrgSnap1.remainQuota;
             }
           } else {
             const totalProfile = Extension.sumObjectValues(_salaryOrg.salaryProfiles, "amount");
@@ -2936,6 +2948,12 @@ export class SalaryPeriodController extends Controller {
             _salaryOrg.sixPercentAmount = totalProfile * 0.06;
             _salaryOrg.spentAmount = totalAmount;
             _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
+            
+            //เพิ่มคำนวน 15%
+            _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);
           }
 
           _salaryOrg.createdUserId = request.user.sub;
@@ -2985,6 +3003,13 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.sixPercentAmount = totalProfile * 0.06;
               _salaryOrg.spentAmount = totalAmount;
               _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
+
+              //เพิ่มคำนวน 15%
+              _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.currentAmount = salaryOrgSnap1.currentAmount;
               _salaryOrg.total = salaryOrgSnap1.total;
@@ -2992,6 +3017,13 @@ export class SalaryPeriodController extends Controller {
               _salaryOrg.spentAmount = salaryOrgSnap1.spentAmount;
               _salaryOrg.useAmount = salaryOrgSnap1.useAmount;
               _salaryOrg.remainingAmount = salaryOrgSnap1.remainingAmount;
+
+              //เพิ่มคำนวน 15%
+              _salaryOrg.fifteenPercent = salaryOrgSnap1.fifteenPercent;
+              _salaryOrg.fifteenPoint = salaryOrgSnap1.fifteenPoint;
+              _salaryOrg.quantityUsed = salaryOrgSnap1.quantityUsed;
+              _salaryOrg.remainQuota = salaryOrgSnap1.remainQuota;
+
             }
           } else {
             const totalProfile = Extension.sumObjectValues(_salaryOrg.salaryProfiles, "amount");
@@ -3000,6 +3032,13 @@ export class SalaryPeriodController extends Controller {
             _salaryOrg.sixPercentAmount = totalProfile * 0.06;
             _salaryOrg.spentAmount = totalAmount;
             _salaryOrg.remainingAmount = totalProfile * 0.06 - totalAmount;
+
+            //เพิ่มคำนวน 15%
+            _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);
+
           }
 
           _salaryOrg.createdUserId = request.user.sub;
@@ -3073,18 +3112,21 @@ export class SalaryPeriodController extends Controller {
               _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);
+              console.log("fifteenAPR: case 1");            
             } else {
               _salaryOrg.total = salaryOrgSnap1.total;
               _salaryOrg.fifteenPercent = salaryOrgSnap1.fifteenPercent;
               _salaryOrg.fifteenPoint = salaryOrgSnap1.fifteenPoint;
               _salaryOrg.quantityUsed = salaryOrgSnap1.quantityUsed;
               _salaryOrg.remainQuota = salaryOrgSnap1.remainQuota;
+              console.log("fifteenAPR: case 2");
             }
           } else {
             _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);
+            console.log("fifteenAPR: case 3");
           }
 
           _salaryOrg.createdUserId = request.user.sub;