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 8c703ac..622b3f6 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
@@ -55,12 +55,16 @@
                         </div>
                     </div>
                     <div class='row'>
-                        <div class="form-group col-md-6">
+                        <div class="form-group col-md-4">
+                            <label>ผลรวมเงินเดือนปัจจุบัน คือ</label>
+                            <input disabled placeholder="0.00" class="form-control money mask_plugin" type="text" id="sum_current_salary" />
+                        </div>
+                        <div class="form-group col-md-4">
                             <label id="lab_eva_adjust_postponement_quota_limit_frame_quota" for="eva_adjust_postponement_quota_limit_frame_quota">กรอบโควต้าพิเศษร้อยละ</label>
                             <input onchange="Oneva_adjust_postponement_quota_limit_frame_quotaChange();" placeholder="0.00" class="form-control money mask_plugin" type="number" id="eva_adjust_postponement_quota_limit_frame_quota" iLabel="กรอบโควต้าพิเศษร้อยละ" iRequire="true" iGroup="eva_adjust_postponement_quota" />
                         </div>
 
-                        <div class="form-group col-md-6">
+                        <div class="form-group col-md-4">
                             <label id="lab_eva_adjust_postponement_quota_limit_quota" for="eva_adjust_postponement_quota_limit_quota">จำนวนเงินที่สามารถบริหารวงเงินโควต้าพิเศษ</label>
                             <input disabled placeholder="0.00" class="form-control money mask_plugin" type="text" id="eva_adjust_postponement_quota_limit_quota" iLabel="จำนวนเงินที่สามารถบริหารวงเงินโควต้าพิเศษ" iRequire="true" iGroup="eva_adjust_postponement_quota" />
                         </div>
@@ -87,7 +91,7 @@
             <button type="button" class="btn btn-submit" onclick="javascript:eva_adjust_postponement_quota_PutUpdate()">บันทึก</button>
         </div>
     </div>
-
+    
 </section>
 
 <br />
diff --git a/appsettings.Development.json b/appsettings.Development.json
index 002ec5a..19b10be 100644
--- a/appsettings.Development.json
+++ b/appsettings.Development.json
@@ -1,9 +1,9 @@
 {
   "connectionStrings": {
-    "mainDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2;User ID=postgres;Password=ZdPr0jects;",
-    "externalDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2;User ID=postgres;Password=ZdPr0jects;"
-    //"mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;",
-    //"externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;"
+    //"mainDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2;User ID=postgres;Password=ZdPr0jects;",
+    //"externalDBConnectionString": "Server=192.168.1.34;Port=32432;Database=tb320_hr_site2;User ID=postgres;Password=ZdPr0jects;"
+    "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;",
+    "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;"
   },
   "IdentityServer": {
     "url": "",
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 f8945f1..c4f39d2 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
@@ -98,7 +98,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
 var cur_dep = "";
 
 	var successFunc = function (response) {
-console.log(response);
+//console.log(response);
         var sum_current_salary = 0;
 
 		$.each(response, function (i, data) {
@@ -185,6 +185,9 @@ if(cur_dep !== data.emp_department_name){
 		});
         
         $("#eva_adjust_postponement_quota_limit").val(sum_current_salary);
+        console.log(sum_current_salary);
+        
+        $("#sum_current_salary").maskMoney('mask', sum_current_salary);             
 
         Oneva_adjust_postponement_quota_limit_frame_quotaChange();
 
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 c69a4ff..f05970d 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
@@ -4,7 +4,6 @@ var eva_adjust_postponement_quota_API = "/api/eva_adjust_postponement_quota/";
 //================= Form Data Customizaiton =========================================
 
 function eva_adjust_postponement_quota_FeedDataToForm(data) {
-console.log(data.limit);
     $("#eva_adjust_postponement_quota_id").val(data.id);
     $("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
     $("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
@@ -135,6 +134,8 @@ function Oneva_adjust_postponement_quota_limit_frame_quotaChange() {
 
     limit_quota = limit_frame_quota * limit / 100;
     //$("#eva_adjust_postponement_quota_limit_quota").val(Math.ceil(limit_quota/10)*10);
+    //console.log(limit);
+
     $("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', Math.ceil(limit_quota/10)*10);
     CalculateRemainQuota();
 }
@@ -148,6 +149,7 @@ function CalculateRemainQuota() {
     $('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {
         var i = $(this).find("#rowCount").text();
         if (i) {
+            var current_salary = parseFloat($("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text().replace(/[,-]/g,''));
             var new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text());
             var receive_quota = parseFloat($("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val());
 
@@ -163,9 +165,8 @@ function CalculateRemainQuota() {
             } else {
                 $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0);
             }
-
-
             sum_receive_quota += receive_quota;
+
         }
     });
 
diff --git a/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js b/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
index 9c9aace..bc4b3a4 100644
--- a/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
+++ b/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
@@ -122,7 +122,7 @@ function Oneva_evaluation_achievement_process_scoreChange(){
 	});    
 
     $("#h_eva_evaluation_achievement_process_weight").text(total_achievement_weight.toFixed(2));
-    $("#h_eva_evaluation_achievement_process_score").text(total_achievement_score.toFixed(2));
+    $("#h_eva_evaluation_achievement_process_score").text(total_achievement.toFixed(2));
 
     var w1 = parseFloat($("#w1").text());
 
diff --git a/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js b/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js
index 1748cdb..89ab0e4 100644
--- a/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js
+++ b/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js
@@ -159,8 +159,8 @@ function Oneva_evaluation_achievement_process2_scoreChange(){
         //console.log(score_old);
 	});    
     $("#h_eva_evaluation_achievement_process2_weight").text(total_achievement_weight.toFixed(2));
-    $("#h_eva_evaluation_achievement_process2_score2").text(total_achievement_score.toFixed(2));
-    $("#h_eva_evaluation_achievement_process2_score").text(total_achievement_score_old.toFixed(2));
+    $("#h_eva_evaluation_achievement_process2_score2").text(total_achievement.toFixed(2));
+    $("#h_eva_evaluation_achievement_process2_score").text(total_achievement_old.toFixed(2));
 
     var w1 = parseFloat($("#w1").text());
 
diff --git a/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js b/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js
index c511b2f..1c48ba8 100644
--- a/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js
+++ b/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js
@@ -122,10 +122,11 @@ function Oneva_evaluation_behavior_process_scoreChange(){
         total_behavior += parseFloat(total);
         total_behavior_weight += parseFloat(weight);
         total_behavior_score += parseFloat(score);
+        console.log(score);
 	});   
     
     $("#h_eva_evaluation_behavior_process_weight").text(total_behavior_weight.toFixed(2));
-    $("#h_eva_evaluation_behavior_process_score").text(total_behavior_score.toFixed(2));
+    $("#h_eva_evaluation_behavior_process_score").text(total_behavior.toFixed(2));
 
     var w2 = parseFloat($("#w2").text());
 
diff --git a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js
index 720c8f2..bfaab0f 100644
--- a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js
+++ b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js
@@ -160,8 +160,8 @@ function Oneva_evaluation_behavior_process2_scoreChange(){
         total_behavior_old += parseFloat(total_old);
 	});   
     $("#h_eva_evaluation_behavior_process2_weight").text(total_behavior_weight.toFixed(2));
-    $("#h_eva_evaluation_behavior_process2_score2").text(total_behavior_score.toFixed(2));
-    $("#h_eva_evaluation_behavior_process2_score").text(total_behavior_score_old.toFixed(2));
+    $("#h_eva_evaluation_behavior_process2_score2").text(total_behavior.toFixed(2));
+    $("#h_eva_evaluation_behavior_process2_score").text(total_behavior_old.toFixed(2));
     
     var w2 = parseFloat($("#w2").text());