diff --git a/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs b/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs
index 864f1ad..9840ab6 100644
--- a/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs
+++ b/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs
@@ -163,15 +163,15 @@ namespace TodoAPI2.Models
             {
                 //existingEntity.create_evaluation_detail_id = model.create_evaluation_detail_id;
                 //existingEntity.behavior = model.behavior;
-                //existingEntity.weight = model.weight;
+                existingEntity.weight = model.weight;
                 //existingEntity.score = model.score;
                 existingEntity.score2 = model.score2;
                 existingEntity.sumary2 = model.sumary2;
-                //existingEntity.target_score1 = model.target_score1;
-                //existingEntity.target_score2 = model.target_score2;
-                //existingEntity.target_score3 = model.target_score3;
-                //existingEntity.target_score4 = model.target_score4;
-                //existingEntity.target_score5 = model.target_score5;
+                existingEntity.target_score1 = model.target_score1;
+                existingEntity.target_score2 = model.target_score2;
+                existingEntity.target_score3 = model.target_score3;
+                existingEntity.target_score4 = model.target_score4;
+                existingEntity.target_score5 = model.target_score5;
 
 
                 var updated = _repository.Update(id, existingEntity);
@@ -201,15 +201,15 @@ namespace TodoAPI2.Models
 
                         //existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id;
                         //existingEntity.behavior = i.behavior;
-                        //existingEntity.weight = i.weight;
+                        existingEntity.weight = i.weight;
                         //existingEntity.score = i.score;
                         existingEntity.score2 = i.score2;
                         existingEntity.sumary2 = i.sumary2;
-                        //existingEntity.target_score1 = i.target_score1;
-                        //existingEntity.target_score2 = i.target_score2;
-                        //existingEntity.target_score3 = i.target_score3;
-                        //existingEntity.target_score4 = i.target_score4;
-                        //existingEntity.target_score5 = i.target_score5;
+                        existingEntity.target_score1 = i.target_score1;
+                        existingEntity.target_score2 = i.target_score2;
+                        existingEntity.target_score3 = i.target_score3;
+                        existingEntity.target_score4 = i.target_score4;
+                        existingEntity.target_score5 = i.target_score5;
 
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
diff --git a/Models/rep_eva01/rep_eva01SearchModel.cs b/Models/rep_eva01/rep_eva01SearchModel.cs
index d9c5c14..a5c1156 100644
--- a/Models/rep_eva01/rep_eva01SearchModel.cs
+++ b/Models/rep_eva01/rep_eva01SearchModel.cs
@@ -14,7 +14,7 @@ namespace TodoAPI2.Models
     public class rep_eva01SearchModel
     {
 
-        public int? org_id { get; set; }
+        public string org_id { get; set; }
 
         public int? round_id { get; set; }
 
diff --git a/ViewControllers/homeViewController.cs b/ViewControllers/homeViewController.cs
index 0d1ada5..dd76e1d 100644
--- a/ViewControllers/homeViewController.cs
+++ b/ViewControllers/homeViewController.cs
@@ -29,6 +29,17 @@ namespace TodoAPI2.Controllers
             emp = inemp;
         }
 
+        public IActionResult logout()
+        {
+            Response.Cookies.Delete("emp_name");
+            Response.Cookies.Delete("user_id");
+            Response.Cookies.Delete("emp_id");
+
+            string mainsite = Configuration["SiteInformation:mainsite"];
+
+            return Redirect(mainsite + "/logout");
+        }
+
         public IActionResult index()
         {
             MyHelper.get_login(HttpContext, emp, Response);
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
index 453c518..cf6b779 100644
--- a/Views/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -83,13 +83,6 @@
                             <span class="allfontsize" data-fontsize="3" style="font-size:26px; width:20px; height:30px; display:flex; align-items:center; justify-content:center; font-weight:bold;">A</span>
                         </div>
 
-                        <div style="display: flex; cursor: pointer; position: relative;" id="toggle-chat-list">
-                            <a href="@Environment.GetEnvironmentVariable("SiteInformation_chatsite")" style="color: unset; display: flex">
-                                <i class="fa fa-comments" style="font-size: 18px;"></i>
-                                <div id="chat-noti" class="badge badge-danger" style="display: none;"></div>
-                            </a>
-                        </div>
-
                         <div data-toggle="dropdown" style="display: flex; cursor: pointer; align-items: center;">
                             <span class="username" style="font-size:19px; line-height:23px; font-weight:bold;" id="username">no user</span>
                             <b class="caret"></b>
diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
index 3019154..f058e3b 100644
--- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
+++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
@@ -31,28 +31,28 @@
                                 <input disabled class="form-control" type="number" id="eva_evaluation_behavior_weight" iLabel="น้ำหนัก" iRequire="true" iGroup="eva_evaluation_behavior" />
                             </div>
                         </div>
-                        <div class='row'>
+                        <div class='row' style="display:none;">
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_behavior_target_score1" for="eva_evaluation_behavior_target_score1">คะแนนตามค่าระดับเป้าหมาย1</label>
-                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score1" iLabel="คะแนนตามค่าระดับเป้าหมาย1" iRequire="true" iGroup="eva_evaluation_behavior" />
+                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score1" iLabel="คะแนนตามค่าระดับเป้าหมาย1" iRequire="false" iGroup="eva_evaluation_behavior" />
                             </div>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_behavior_target_score2" for="eva_evaluation_behavior_target_score2">คะแนนตามค่าระดับเป้าหมาย2</label>
-                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score2" iLabel="คะแนนตามค่าระดับเป้าหมาย2" iRequire="true" iGroup="eva_evaluation_behavior" />
+                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score2" iLabel="คะแนนตามค่าระดับเป้าหมาย2" iRequire="false" iGroup="eva_evaluation_behavior" />
                             </div>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_behavior_target_score3" for="eva_evaluation_behavior_target_score3">คะแนนตามค่าระดับเป้าหมาย3</label>
-                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score3" iLabel="คะแนนตามค่าระดับเป้าหมาย3" iRequire="true" iGroup="eva_evaluation_behavior" />
+                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score3" iLabel="คะแนนตามค่าระดับเป้าหมาย3" iRequire="false" iGroup="eva_evaluation_behavior" />
                             </div>
                         </div>
-                        <div class='row'>
+                        <div class='row' style="display:none;">
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_behavior_target_score4" for="eva_evaluation_behavior_target_score4">คะแนนตามค่าระดับเป้าหมาย4</label>
-                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score4" iLabel="คะแนนตามค่าระดับเป้าหมาย4" iRequire="true" iGroup="eva_evaluation_behavior" />
+                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score4" iLabel="คะแนนตามค่าระดับเป้าหมาย4" iRequire="false" iGroup="eva_evaluation_behavior" />
                             </div>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_behavior_target_score5" for="eva_evaluation_behavior_target_score5">คะแนนตามค่าระดับเป้าหมาย5</label>
-                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score5" iLabel="คะแนนตามค่าระดับเป้าหมาย5" iRequire="true" iGroup="eva_evaluation_behavior" />
+                                <input class="form-control" type="text" id="eva_evaluation_behavior_target_score5" iLabel="คะแนนตามค่าระดับเป้าหมาย5" iRequire="false" iGroup="eva_evaluation_behavior" />
                             </div>
                         </div>
                     </div>
@@ -108,28 +108,28 @@
                         <div class='row'>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_achievement_target_score1" for="eva_evaluation_achievement_target_score1">คะแนนตามค่าระดับเป้าหมาย1</label>
-                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score1" iLabel="คะแนนตามค่าระดับเป้าหมาย1" iRequire="true" iGroup="eva_evaluation_achievement" />
+                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score1" iLabel="คะแนนตามค่าระดับเป้าหมาย1" iRequire="false" iGroup="eva_evaluation_achievement" />
                             </div>
 
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_achievement_target_score2" for="eva_evaluation_achievement_target_score2">คะแนนตามค่าระดับเป้าหมาย2</label>
-                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score2" iLabel="คะแนนตามค่าระดับเป้าหมาย2" iRequire="true" iGroup="eva_evaluation_achievement" />
+                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score2" iLabel="คะแนนตามค่าระดับเป้าหมาย2" iRequire="false" iGroup="eva_evaluation_achievement" />
                             </div>
 
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_achievement_target_score3" for="eva_evaluation_achievement_target_score3">คะแนนตามค่าระดับเป้าหมาย3</label>
-                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score3" iLabel="คะแนนตามค่าระดับเป้าหมาย3" iRequire="true" iGroup="eva_evaluation_achievement" />
+                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score3" iLabel="คะแนนตามค่าระดับเป้าหมาย3" iRequire="false" iGroup="eva_evaluation_achievement" />
                             </div>
                         </div>
                         <div class='row'>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_achievement_target_score4" for="eva_evaluation_achievement_target_score4">คะแนนตามค่าระดับเป้าหมาย4</label>
-                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score4" iLabel="คะแนนตามค่าระดับเป้าหมาย4" iRequire="true" iGroup="eva_evaluation_achievement" />
+                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score4" iLabel="คะแนนตามค่าระดับเป้าหมาย4" iRequire="false" iGroup="eva_evaluation_achievement" />
                             </div>
 
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_evaluation_achievement_target_score5" for="eva_evaluation_achievement_target_score5">คะแนนตามค่าระดับเป้าหมาย5</label>
-                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score5" iLabel="คะแนนตามค่าระดับเป้าหมาย5" iRequire="true" iGroup="eva_evaluation_achievement" />
+                                <input class="form-control" type="text" id="eva_evaluation_achievement_target_score5" iLabel="คะแนนตามค่าระดับเป้าหมาย5" iRequire="false" iGroup="eva_evaluation_achievement" />
                             </div>
                         </div>
                     </div>
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
index 8e685e0..01dedd9 100644
--- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
+++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
@@ -297,7 +297,6 @@
     <div class="row">
         <div class="form-group col-md-12">
             <button id="btn02" type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_behavior_process2_Save(getUrlParameter('id'))">บันทึก</button>
-
         </div>
     </div>
 
diff --git a/Views/rep_eva01View/rep_eva01_report.cshtml b/Views/rep_eva01View/rep_eva01_report.cshtml
index d0e947b..aa8de2a 100644
--- a/Views/rep_eva01View/rep_eva01_report.cshtml
+++ b/Views/rep_eva01View/rep_eva01_report.cshtml
@@ -26,9 +26,9 @@
             <div class="col-md-12">
                 <div class="row">
 
-                    <div class="form-group col-md-3">
+                    <div class="form-group col-md-6">
                         <label id='lab_s_rep_eva01_org_id' for='s_rep_eva01_org_id'>หน่วยงาน</label>
-                        <select class="form-control" id="s_rep_eva01_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="s_rep_eva01" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
+                        <select multiple="multiple" class="form-control" id="s_rep_eva01_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="s_rep_eva01" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
                     </div>
 
                     <div class="form-group col-md-3">
diff --git a/Views/rep_position_salaryView/rep_position_salary_report.cshtml b/Views/rep_position_salaryView/rep_position_salary_report.cshtml
index 56a0904..2b34e52 100644
--- a/Views/rep_position_salaryView/rep_position_salary_report.cshtml
+++ b/Views/rep_position_salaryView/rep_position_salary_report.cshtml
@@ -28,17 +28,17 @@
 
                     <div class="form-group col-md-3">
                         <label id='lab_s_rep_position_salary_employee_id' for='s_rep_position_salary_employee_id'>ชื่อ - สกุล</label>
-                        <select class="form-control" id="s_rep_position_salary_employee_id" iLabel="ชื่อ - สกุล" iRequire="true" iGroup="s_rep_position_salary" title='ชื่อ - สกุล' placeholder='ชื่อ - สกุล'></select>
+                        <select class="form-control" id="s_rep_position_salary_employee_id" iLabel="ชื่อ - สกุล" iRequire="false" iGroup="s_rep_position_salary" title='ชื่อ - สกุล' placeholder='ชื่อ - สกุล'></select>
                     </div>
 
                         <div class="form-group col-md-3">
                             <label id='lab_s_rep_position_salary_position_id' for='s_rep_position_salary_position_id'>ตำแหน่ง</label>
-                            <select class="form-control" id="s_rep_position_salary_position_id" iLabel="ตำแหน่ง" iRequire="true" iGroup="s_rep_position_salary" title='ตำแหน่ง' placeholder='ตำแหน่ง'></select>
+                            <select class="form-control" id="s_rep_position_salary_position_id" iLabel="ตำแหน่ง" iRequire="false" iGroup="s_rep_position_salary" title='ตำแหน่ง' placeholder='ตำแหน่ง'></select>
                         </div>
 
                         <div class="form-group col-md-3">
                             <label id='lab_s_rep_position_salary_org_id' for='s_rep_position_salary_org_id'>หน่วยงาน</label>
-                            <select class="form-control" id="s_rep_position_salary_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="s_rep_position_salary" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
+                            <select class="form-control" id="s_rep_position_salary_org_id" iLabel="หน่วยงาน" iRequire="false" iGroup="s_rep_position_salary" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
                         </div>
                 
 				</div>
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 1ce41f7..f323928 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
@@ -76,11 +76,11 @@ function eva_evaluation_behavior_process_Get(a, blankItem) {
 
  tag += '<td><p id="eva_evaluation_behavior_process_behavior_' + (i + 1)+'" /></td>';
  tag += '<td><p id="eva_evaluation_behavior_process_weight_' + (i + 1)+'" /></td>';
- tag += '<td><p id="eva_evaluation_behavior_process_target_score1_' + (i + 1)+'">จำเป็นต้องพัฒนาอย่างยิ่ง</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process_target_score2_' + (i + 1)+'">ต้องพัฒนา</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process_target_score3_' + (i + 1)+'">พอใช้</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process_target_score4_' + (i + 1)+'">ดี</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process_target_score5_' + (i + 1)+'">ดีเยี่ยม</p></td>';
+ tag += '<td><p id="eva_evaluation_behavior_process_target_score1_' + (i + 1)+'"></p></td>';
+ tag += '<td><p id="eva_evaluation_behavior_process_target_score2_' + (i + 1)+'"></p></td>';
+ tag += '<td><p id="eva_evaluation_behavior_process_target_score3_' + (i + 1)+'"></p></td>';
+ tag += '<td><p id="eva_evaluation_behavior_process_target_score4_' + (i + 1)+'"></p></td>';
+ tag += '<td><p id="eva_evaluation_behavior_process_target_score5_' + (i + 1)+'"></p></td>';
 tag += '<td><input min="0" max="5" step=".01" onchange="Oneva_evaluation_behavior_process_scoreChange()" class="form-control" type="number" id="eva_evaluation_behavior_process_score_' + (i + 1)+'" /></td>';
  tag += '<td><p id="eva_evaluation_behavior_process_sumary_' + (i + 1)+'" /></td>';
 
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 14abfb2..de50a6a 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
@@ -3,15 +3,15 @@
 $("#eva_evaluation_behavior_process2_id_" + i).val("");
 $("#eva_evaluation_behavior_process2_create_evaluation_detail_id_" + i).val("");
 $("#eva_evaluation_behavior_process2_behavior_" + i).text("");
-$("#eva_evaluation_behavior_process2_weight_" + i).text("");
+$("#eva_evaluation_behavior_process2_weight_" + i).val("");
 $("#eva_evaluation_behavior_process2_score_" + i).text("");
 $("#eva_evaluation_behavior_process2_score2_" + i).val("");
 $("#eva_evaluation_behavior_process2_sumary2_" + i).text("");
-$("#eva_evaluation_behavior_process2_target_score1_" + i).text("");
-$("#eva_evaluation_behavior_process2_target_score2_" + i).text("");
-$("#eva_evaluation_behavior_process2_target_score3_" + i).text("");
-$("#eva_evaluation_behavior_process2_target_score4_" + i).text("");
-$("#eva_evaluation_behavior_process2_target_score5_" + i).text("");
+$("#eva_evaluation_behavior_process2_target_score1_" + i).val("");
+$("#eva_evaluation_behavior_process2_target_score2_" + i).val("");
+$("#eva_evaluation_behavior_process2_target_score3_" + i).val("");
+$("#eva_evaluation_behavior_process2_target_score4_" + i).val("");
+$("#eva_evaluation_behavior_process2_target_score5_" + i).val("");
 
 }
 
@@ -19,15 +19,15 @@ function eva_evaluation_behavior_process2_FeedDataToForm(data, i, blankItem) {
 $("#eva_evaluation_behavior_process2_id_" + i).val(data.id);
 $("#eva_evaluation_behavior_process2_create_evaluation_detail_id_" + i).val(data.create_evaluation_detail_id);
 $("#eva_evaluation_behavior_process2_behavior_" + i).text(data.behavior);
-$("#eva_evaluation_behavior_process2_weight_" + i).text(data.weight);
+$("#eva_evaluation_behavior_process2_weight_" + i).val(data.weight);
 $("#eva_evaluation_behavior_process2_score_" + i).text(data.score);
 $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2);
 $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary2);
-//$("#eva_evaluation_behavior_process2_target_score1_" + i).text(data.target_score1);
-//$("#eva_evaluation_behavior_process2_target_score2_" + i).text(data.target_score2);
-//$("#eva_evaluation_behavior_process2_target_score3_" + i).text(data.target_score3);
-//$("#eva_evaluation_behavior_process2_target_score4_" + i).text(data.target_score4);
-//$("#eva_evaluation_behavior_process2_target_score5_" + i).text(data.target_score5);
+$("#eva_evaluation_behavior_process2_target_score1_" + i).val(data.target_score1);
+$("#eva_evaluation_behavior_process2_target_score2_" + i).val(data.target_score2);
+$("#eva_evaluation_behavior_process2_target_score3_" + i).val(data.target_score3);
+$("#eva_evaluation_behavior_process2_target_score4_" + i).val(data.target_score4);
+$("#eva_evaluation_behavior_process2_target_score5_" + i).val(data.target_score5);
 
 }
 
@@ -36,21 +36,30 @@ function eva_evaluation_behavior_process2_GetFromForm(obj, i) {
 eva_evaluation_behavior_process2Object.id = obj.find("#eva_evaluation_behavior_process2_id_" + i).val();
 eva_evaluation_behavior_process2Object.create_evaluation_detail_id = obj.find("#eva_evaluation_behavior_process2_create_evaluation_detail_id_" + i).val();
 eva_evaluation_behavior_process2Object.behavior = obj.find("#eva_evaluation_behavior_process2_behavior_" + i).text();
-eva_evaluation_behavior_process2Object.weight = obj.find("#eva_evaluation_behavior_process2_weight_" + i).text();
+eva_evaluation_behavior_process2Object.weight = obj.find("#eva_evaluation_behavior_process2_weight_" + i).val();
 eva_evaluation_behavior_process2Object.score = obj.find("#eva_evaluation_behavior_process2_score_" + i).text();
 eva_evaluation_behavior_process2Object.score2 = obj.find("#eva_evaluation_behavior_process2_score2_" + i).val();
 eva_evaluation_behavior_process2Object.sumary2 = obj.find("#eva_evaluation_behavior_process2_sumary2_" + i).text();
-eva_evaluation_behavior_process2Object.target_score1 = obj.find("#eva_evaluation_behavior_process2_target_score1_" + i).text();
-eva_evaluation_behavior_process2Object.target_score2 = obj.find("#eva_evaluation_behavior_process2_target_score2_" + i).text();
-eva_evaluation_behavior_process2Object.target_score3 = obj.find("#eva_evaluation_behavior_process2_target_score3_" + i).text();
-eva_evaluation_behavior_process2Object.target_score4 = obj.find("#eva_evaluation_behavior_process2_target_score4_" + i).text();
-eva_evaluation_behavior_process2Object.target_score5 = obj.find("#eva_evaluation_behavior_process2_target_score5_" + i).text();
+eva_evaluation_behavior_process2Object.target_score1 = obj.find("#eva_evaluation_behavior_process2_target_score1_" + i).val();
+eva_evaluation_behavior_process2Object.target_score2 = obj.find("#eva_evaluation_behavior_process2_target_score2_" + i).val();
+eva_evaluation_behavior_process2Object.target_score3 = obj.find("#eva_evaluation_behavior_process2_target_score3_" + i).val();
+eva_evaluation_behavior_process2Object.target_score4 = obj.find("#eva_evaluation_behavior_process2_target_score4_" + i).val();
+eva_evaluation_behavior_process2Object.target_score5 = obj.find("#eva_evaluation_behavior_process2_target_score5_" + i).val();
 
     eva_evaluation_behavior_process2Object.active_mode = obj.find("#isActive_" + i + "_eva_evaluation_behavior_process2").val();
+
+console.log(eva_evaluation_behavior_process2Object);
+
     return eva_evaluation_behavior_process2Object;
 }
 
 function eva_evaluation_behavior_process2_Save(id) {
+
+    if(parseInt($("#h_eva_evaluation_behavior_process2_weight").text())>100){
+        alert('กรุณาระบุค่าน้ำหนัก ไม่เกิน 100');
+        return false;
+    }   
+
 	//Insert eva_evaluation_behavior_process2 List
 	var eva_evaluation_behavior_process2 = [];
     $('#eva_evaluation_behavior_process2Body tr').each(function () {
@@ -78,12 +87,12 @@ function eva_evaluation_behavior_process2_Get(a, blankItem) {
             tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_evaluation_behavior_process2" value="1" /><input class="form-control" type="hidden" id="eva_evaluation_behavior_process2_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_evaluation_behavior_process2_create_evaluation_detail_id_' + (i + 1)+'" /></td>';
  
  tag += '<td><p id="eva_evaluation_behavior_process2_behavior_' + (i + 1)+'" /></td>';
- tag += '<td><p id="eva_evaluation_behavior_process2_weight_' + (i + 1)+'" /></td>';
- tag += '<td><p id="eva_evaluation_behavior_process2_target_score1_' + (i + 1)+'">จำเป็นต้องพัฒนาอย่างยิ่ง</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process2_target_score2_' + (i + 1)+'">ต้องพัฒนา</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process2_target_score3_' + (i + 1)+'">พอใช้</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process2_target_score4_' + (i + 1)+'">ดี</p></td>';
- tag += '<td><p id="eva_evaluation_behavior_process2_target_score5_' + (i + 1)+'">ดีเยี่ยม</p></td>';
+ tag += '<td><input class="form-control" type="number" onchange="Oneva_evaluation_behavior_process2_scoreChange()" id="eva_evaluation_behavior_process2_weight_' + (i + 1)+'" /></td>';
+ tag += '<td><input type="text" class="form-control" id="eva_evaluation_behavior_process2_target_score1_' + (i + 1)+'" /></td>';
+ tag += '<td><input type="text" class="form-control" id="eva_evaluation_behavior_process2_target_score2_' + (i + 1)+'" /></td>';
+ tag += '<td><input type="text" class="form-control" id="eva_evaluation_behavior_process2_target_score3_' + (i + 1)+'" /></td>';
+ tag += '<td><input type="text" class="form-control" id="eva_evaluation_behavior_process2_target_score4_' + (i + 1)+'" /></td>';
+ tag += '<td><input type="text" class="form-control" id="eva_evaluation_behavior_process2_target_score5_' + (i + 1)+'" /></td>';
  tag += '<td><p id="eva_evaluation_behavior_process2_score_' + (i + 1)+'" /></td>';
 tag += '<td><input min="0" max="5" step=".01" onchange="Oneva_evaluation_behavior_process2_scoreChange()" class="form-control" type="number" id="eva_evaluation_behavior_process2_score2_' + (i + 1)+'" /></td>';
  tag += '<td><p id="eva_evaluation_behavior_process2_sumary2_' + (i + 1)+'" /></td>';
@@ -121,7 +130,7 @@ function Oneva_evaluation_behavior_process2_scoreChange(){
         var i = $(this).find("#rowCount").text();
 		var score = $("#eva_evaluation_behavior_process2_score2_" + i).val();
         var score_old = $("#eva_evaluation_behavior_process2_score_" + i).text();
-        var weight = $("#eva_evaluation_behavior_process2_weight_" + i).text();
+        var weight = $("#eva_evaluation_behavior_process2_weight_" + i).val();
         var total = (score * weight / 100).toFixed(2);
         $("#eva_evaluation_behavior_process2_sumary2_" + i).text(total);
         total_behavior += parseFloat(total);
diff --git a/wwwroot/js/rep_eva01/rep_eva01_report.js b/wwwroot/js/rep_eva01/rep_eva01_report.js
index d1e509d..cd6a0aa 100644
--- a/wwwroot/js/rep_eva01/rep_eva01_report.js
+++ b/wwwroot/js/rep_eva01/rep_eva01_report.js
@@ -1,10 +1,19 @@
 var rep_eva01_API = "/api/rep_eva01/";
 
+function array_to_string_comma(a){
+    var x = "";
+    $.each(a, function( index, value ) {
+      if(x !== "") x+=",";
+        x+=value;
+    });
+    return x;
+}
+
 //================= Search Customizaiton =========================================
 
 function rep_eva01_GetSearchParameter(fileType) {
     var rep_eva01SearchObject = new Object();
-rep_eva01SearchObject.org_id = $("#s_rep_eva01_org_id").val();
+rep_eva01SearchObject.org_id = array_to_string_comma($("#s_rep_eva01_org_id").val());
 rep_eva01SearchObject.round_id = $("#s_rep_eva01_round_id").val();
 
 
@@ -48,6 +57,8 @@ function rep_eva01_DoSearch(fileType) {
 
     var report_url = apisite + "/api/rep_eva01/rep_eva01_report?" + p;
 
+console.log(report_url);
+
     if (fileType === "pdf") {        
         $("#report_result").attr("src", report_url);
         $("#report_result").show();