diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
index 5e247d4..8989082 100644
--- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
+++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
@@ -123,16 +123,16 @@
 
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_eva_result'>ผลการประเมิน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
-
-                <th style="display:none;"><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>ค่าตอบแทนพิเศษ ก่อนปรับเลื่อน</label></th>
-
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>ค่าตอบแทนพิเศษ ก่อนปรับเลื่อน</label></th>
+
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_middle'>ค่ากลางฐานในการคำนวณ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_promoted_percentage'>ร้อยละที่ได้เลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_total_promote'>จำนวนเงินที่ได้เลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_new_sarary'>เงินเดือนใหม่</label></th>
-                <th style="display:none;"><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>ค่าตอบแทนพิเศษ หลังปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_new_cost_living'>ค่าครองชีพใหม่</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>ค่าตอบแทนพิเศษ หลังปรับเลื่อน</label></th>
+
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_remark'>หมายเหตุ</label></th>
             </tr>
         </thead>
@@ -149,13 +149,13 @@
                 <th>รวม</th>
                 <th></th>
                 <th><p id="sum_before"></p></th>
-                <th style="display:none;"></th>
+                <th></th>
                 <th></th>
                 <th></th>
                 <th></th>
                 <th></th>
                 <th><p id="sum_after"></p></th>
-                <th style="display:none;"></th>
+                <th></th>
                 <th></th>
                 <th></th>
             </tr>
diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
index e913d2d..7bb880e 100644
--- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
+++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
@@ -141,8 +141,8 @@
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_emp_level'>ระดับ</label></th>
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
-                <th style="display:none;"><label id='h_eva_adjust_postponement_detail_quota_02_reward_old'>ค่าตอบแทนพิเศษ ก่อนปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_quota_02_reward_old'>ค่าตอบแทนพิเศษ ก่อนปรับเลื่อน</label></th>
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_total_score'>คะแนนรวม</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_eva_result'>ผลการประเมิน</label></th>
@@ -153,8 +153,8 @@
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_receive_quota'>ได้รับเงินโควต้าพิเศษ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_new_sarary_with_quota'>เงินเดือนใหม่ (รวมโควต้า)</label></th>
-                <th style="display:none;"><label id='h_eva_adjust_postponement_detail_quota_02_reward_new2'>ค่าตอบแทนพิเศษ หลังปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_new_cost_living'>ค่าครองชีพใหม่</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_quota_02_reward_new2'>ค่าตอบแทนพิเศษ หลังปรับเลื่อน</label></th>
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_remark'>หมายเหตุ</label></th>
 
diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
index dd16ce3..0eb9058 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
@@ -64,16 +64,15 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
     $("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text(data.salary_max);
     $("#eva_adjust_postponement_detail_normal_02_themax_" + i).text(data.themax);
 
-    $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).val(data.reward_old);
-    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).val(data.reward_new);
+    //if (data.new_sarary > data.themax) {
+    //    $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 0));
+    //} else {
+    //    $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 0));
+    //}
 
-    if (data.new_sarary > data.themax) {
-        $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3));
-    } else {
-        $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 3));
-    }
+    $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.reward_old, 0));
 
-    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 3));
+    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 0));
     $("#themax_" + i).val(data.themax);
     $("#min_percentage_" + i).val(data.min_percentage);
     $("#max_percentage_" + i).val(data.max_percentage);
@@ -156,16 +155,16 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
 
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_eva_result_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_sarary_' + (i + 1) + '" /></td>';
-
-            tag += '<td style="display:none;"><p id="eva_adjust_postponement_detail_normal_02_reward_old_' + (i + 1) + '" /></td>';
-
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_cost_living_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_normal_02_reward_old_' + (i + 1) + '" /></td>';
+
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_middle_' + (i + 1) + '" /></td>';
             tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
             tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_total_promote_' + (i + 1) + '" /></td>';
-            tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_new_sarary_' + (i + 1) + '" /></td>';
-            tag += '<td style="display:none;"><p id="eva_adjust_postponement_detail_normal_02_reward_new_' + (i + 1) + '" /></td>';
+            
+            tag += '<td><p id="eva_adjust_postponement_detail_normal_02_new_sarary_' + (i + 1) + '" /></td>';            
             tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_normal_02_reward_new_' + (i + 1) + '" /></td>';
             tag += '<td><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_salary_max_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_themax_' + (i + 1) + '" /></td>';
             tag += '</tr>';
 
@@ -181,13 +180,13 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '</tr>';
@@ -205,13 +204,13 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.other_money) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.other_money) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '</tr>';
diff --git a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
index 2e2d6cf..a2152e5 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
@@ -132,9 +132,9 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_position_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_level_' + (i + 1) + '" /></td>';
 
-            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_sarary_' + (i + 1) + '" /></td>';
-            tag += '<td style="display:none;"><p id="eva_adjust_postponement_detail_quota_02_reward_old_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_sarary_' + (i + 1) + '" /></td>';            
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_cost_living_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_quota_02_reward_old_' + (i + 1) + '" /></td>';
 
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_score_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_eva_result_' + (i + 1) + '" /></td>';
@@ -144,9 +144,9 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_promote_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_quota_02_new_sarary_' + (i + 1) + '" /></td>';
 
             tag += '<td><input onchange="CalculateRemainQuota(false);" class="form-control" type="number" id="eva_adjust_postponement_detail_quota_02_receive_quota_' + (i + 1) + '" /></td>';
-            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_' + (i + 1) + '" /></td>';
-            tag += '<td style="display:none;"><p id="eva_adjust_postponement_detail_quota_02_reward_new2_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_' + (i + 1) + '" /></td>';            
             tag += '<td><input class="form-control" disabled type="number"  id="eva_adjust_postponement_detail_quota_02_new_cost_living_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_quota_02_reward_new2_' + (i + 1) + '" /></td>';
             tag += '<td><p id="eva_adjust_postponement_detail_quota_02_remark_' + (i + 1) + '" /></td>';
 
 
@@ -160,7 +160,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
                 tag += '<td>เงินประจำตำแหน่ง</td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
@@ -169,7 +169,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '</tr>';
@@ -183,7 +183,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
                 tag += '<td>ค่าตอบแทนรายเดือน</td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.other_money) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
@@ -192,7 +192,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.other_money) + '</td>';
-                tag += '<td style="display:none;"></td>';
+                tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '</tr>';
diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
index d36ab18..671368d 100644
--- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
+++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
@@ -184,18 +184,17 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
             //if (new_salary > themax) {
             //    alert("เงินเดือนเกินกรอบวงเงินขั้นสูงของพนักงานคือ " + formatNumber(themax) + " บาท แต่สามารถหยอดได้ถึง " + formatNumber(salary_max) + " บาท กรุณาหยอดร้อยละที่ได้เลื่อนอีกครั้งค่ะ");
             //} 
-            if (new_salary > salary_max) {
-                alert("เงินเดือนใหม่ที่ได้รับ เกินกรอบวงเงินสูงสุด(1 ขั้น) ของพนักงาน คือ " + formatNumber(salary_max) + " บาท");
-                percentage = 0.000;
-                $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("0.000");
-                new_added = Math.ceil(((percentage * middle) / 100) / 10) * 10;
-                new_salary = parseFloat(old_salary + new_added);
-            }
+            //if (new_salary > salary_max) {
+            //    alert("เงินเดือนใหม่ที่ได้รับ เกินกรอบวงเงินสูงสุด(1 ขั้น) ของพนักงาน คือ " + formatNumber(salary_max) + " บาท");
+            //    percentage = 0.000;
+            //    $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("0.000");
+            //    new_added = Math.ceil(((percentage * middle) / 100) / 10) * 10;
+            //    new_salary = parseFloat(old_salary + new_added);
+            //}
 
             var format_new_added = coreFormatPrice(new_added, 3);
 
-            $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added);
-            $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
+            
 
             //if (m) {
             //    if (new_salary < 13285) {
@@ -215,12 +214,30 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
                 }
             }
 
-            if (new_salary > $("#themax_" + i).val()) {
-                $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3));
-            } else {
-                $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3));
+            //if (new_salary > $("#themax_" + i).val()) {
+            //    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3));
+            //} else {
+            //    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3));
+            //}
+
+            var emp_position = $("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text();
+            var emp_level = $("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text();
+
+            if (emp_position === "พนักงานทั่วไป") {
+                if (emp_level === "ชำนาญการ" && new_salary > 49480) {
+                    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - 49480, 0));
+                }
+                else if (new_salary > 25020){
+                    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - 25020, 0));
+                }
+
+                var reward_new = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text().replace(/[,-]/g, ''));
+                new_salary = new_salary - reward_new;
             }
 
+            $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added);
+            $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
+
             sum_postpone += new_added;
             sum_before += old_salary;
             sum_after += new_salary;
diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
index 4739a98..5af3c8f 100644
--- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
+++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
@@ -157,6 +157,21 @@ function CalculateRemainQuota(m) {
             if (receive_quota < 0) receive_quota = 0;
             $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(receive_quota);
 
+            var emp_position = $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text();
+            var emp_level = $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text();
+
+            if (emp_position === "พนักงานทั่วไป") {
+                if (emp_level === "ชำนาญการ" && new_sarary > 49480) {
+                    $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary - 49480, 0));
+                }
+                else if (new_sarary > 25020) {
+                    $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary - 25020, 0));
+                }
+
+                var reward_new2 = parseFloat($(this).find("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text().replace(/[,-]/g, ''));
+                new_sarary = new_sarary - reward_new2;
+            }
+
             var new_sarary_with_quota = new_sarary + receive_quota;
             $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota));
 
@@ -178,11 +193,13 @@ function CalculateRemainQuota(m) {
                 }
             }
 
-            if (new_sarary_with_quota > $("#themax_" + i).val()) {
-                $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3));
-            } else {
-                $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3));
-            }
+            //if (new_sarary_with_quota > $("#themax_" + i).val()) {
+            //    $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3));
+            //} else {
+            //    $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3));
+            //}
+
+            
 
             sum_receive_quota += receive_quota;