diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
index f98ab71..475a73e 100644
--- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
+++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
@@ -143,9 +143,9 @@ namespace TodoAPI2.Models
                     role_code = getRoleCode(emp_id,
                     m_eva_create_evaluation_detail_agreement.chief,
                     m_eva_create_evaluation_detail_agreement.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id,
+                    m_eva_create_evaluation_detail_agreement.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_agreement.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_agreement.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_agreement.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_agreement.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_agreement.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
                     m_eva_create_evaluation_detail_agreement.employee_id,
                     m_eva_create_evaluation_detail_agreement.status_self_a,
                     m_eva_create_evaluation_detail_agreement.status_chief_a
@@ -326,9 +326,9 @@ namespace TodoAPI2.Models
                     role_code = getRoleCode(emp_id,
                     m_eva_create_evaluation_detail_agreement.chief,
                     m_eva_create_evaluation_detail_agreement.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id,
+                    m_eva_create_evaluation_detail_agreement.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_agreement.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_agreement.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_agreement.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_agreement.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_agreement.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
                     m_eva_create_evaluation_detail_agreement.employee_id,
                     m_eva_create_evaluation_detail_agreement.status_self_a,
                     m_eva_create_evaluation_detail_agreement.status_chief_a),
@@ -336,9 +336,9 @@ namespace TodoAPI2.Models
                     role_desc = getRoleName(emp_id,
                     m_eva_create_evaluation_detail_agreement.chief,
                     m_eva_create_evaluation_detail_agreement.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id,
+                    m_eva_create_evaluation_detail_agreement.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_agreement.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_agreement.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_agreement.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_agreement.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_agreement.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
                     m_eva_create_evaluation_detail_agreement.employee_id,
                     m_eva_create_evaluation_detail_agreement.status_self_a,
                     m_eva_create_evaluation_detail_agreement.status_chief_a),
diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
index d5faef1..6a3a797 100644
--- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
+++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
@@ -164,15 +164,17 @@ namespace TodoAPI2.Models
 
                     role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief,
                     m_eva_create_evaluation_detail_process.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id, path),
+                    m_eva_create_evaluation_detail_process.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_process.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_process.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_process.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
+                    path),
 
                     role_desc = getRoleName(emp_id, m_eva_create_evaluation_detail_process.chief,
                     m_eva_create_evaluation_detail_process.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id, path),
+                    m_eva_create_evaluation_detail_process.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_process.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_process.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_process.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
+                    path),
 
                     remark_hrm_work_record = fk_external_employee.remark_hrm_work_record
                     + GetWorkTimeText(fk_external_employee.packing_date, end_date),
@@ -274,9 +276,9 @@ namespace TodoAPI2.Models
                 && emp_id.HasValue
                 && (
                 (m_eva_create_evaluation_detail_process.chief.HasValue && emp_id == m_eva_create_evaluation_detail_process.chief)
-                || (fk_eva_create_evaluationResult10.employee_id.HasValue && emp_id == fk_eva_create_evaluationResult10.employee_id)
-                || (fk_eva_create_evaluationResult10.supervisor1_id.HasValue && emp_id == fk_eva_create_evaluationResult10.supervisor1_id)
-                || (fk_eva_create_evaluationResult10.supervisor2_id.HasValue && emp_id == fk_eva_create_evaluationResult10.supervisor2_id)
+                || (((m_eva_create_evaluation_detail_process.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_process.eva_employee_id : fk_eva_create_evaluationResult10.employee_id)).HasValue && emp_id == (m_eva_create_evaluation_detail_process.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_process.eva_employee_id : fk_eva_create_evaluationResult10.employee_id))
+                || ((m_eva_create_evaluation_detail_process.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id).HasValue && emp_id == (m_eva_create_evaluation_detail_process.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id))
+                || ((m_eva_create_evaluation_detail_process.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id).HasValue && emp_id == (m_eva_create_evaluation_detail_process.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id))
                 )
                 && (!model.employee_id.HasValue || m_eva_create_evaluation_detail_process.employee_id == model.employee_id)
 
@@ -316,17 +318,18 @@ namespace TodoAPI2.Models
 
                     role_code = getRoleCodeSearch(emp_id, m_eva_create_evaluation_detail_process.chief,
                     m_eva_create_evaluation_detail_process.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id,
+                    m_eva_create_evaluation_detail_process.eva_employee_id.HasValue? m_eva_create_evaluation_detail_process.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_process.supervisor1_id.HasValue? m_eva_create_evaluation_detail_process.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_process.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
                     m_eva_create_evaluation_detail_process.status_chief
                     ),
 
                     role_desc = getRoleName(emp_id, m_eva_create_evaluation_detail_process.chief,
                     m_eva_create_evaluation_detail_process.chief,
-                    fk_eva_create_evaluationResult10.employee_id,
-                    fk_eva_create_evaluationResult10.supervisor1_id,
-                    fk_eva_create_evaluationResult10.supervisor2_id, path),
+                    m_eva_create_evaluation_detail_process.eva_employee_id.HasValue ? m_eva_create_evaluation_detail_process.eva_employee_id : fk_eva_create_evaluationResult10.employee_id,
+                    m_eva_create_evaluation_detail_process.supervisor1_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor1_id : fk_eva_create_evaluationResult10.supervisor1_id,
+                    m_eva_create_evaluation_detail_process.supervisor2_id.HasValue ? m_eva_create_evaluation_detail_process.supervisor2_id : fk_eva_create_evaluationResult10.supervisor2_id,
+                    path),
 
                     status_self_click_date = m_eva_create_evaluation_detail_process.status_self_click_date,
                     status_chief_click_date = m_eva_create_evaluation_detail_process.status_chief_click_date,
diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs
index 5219c26..69e88b2 100644
--- a/Models/external_employee/external_employeeService.cs
+++ b/Models/external_employee/external_employeeService.cs
@@ -262,7 +262,7 @@ left join public.mpp_position_numbers as mpn on he.position_no = mpn.id
 left join public.org_position_datas as opd on opd.position_id = mpn.position_id
 left join public.hrm_title_masters as htm on htm.id = he.prefix_card_name
 left join public.users as u on u.employee_id = he.employee_id
-where he.workingstatus = 'สถานะปฏิบัติงาน' and he.deleted_at is null and mpn.deleted_at is null 
+where he.deleted_at is null and mpn.deleted_at is null 
 and opd.deleted_at is null --and htm.deleted_at is null
 and u.id=@user_id;
 ";
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
index 82a40d3..e44a197 100644
--- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
+++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
@@ -142,7 +142,7 @@
 
     <div class="row">
         <div class="form-group col-md-12">
-            <button type="button" class="btn btn-danger" onclick="javascript:window_open_from_root('@MyHelper.GetConfig(Configuration, "SiteInformation:mainsite")');"><i class="fa fa-repeat"></i> กลับ</button>
+            <button type="button" class="btn btn-danger" onclick="javascript:window_close();"><i class="fa fa-repeat"></i> กลับ</button>
         </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 f5d4d09..f6c724b 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
@@ -141,7 +141,7 @@
 
     <div class="row">
         <div class="form-group col-md-12">
-            <button type="button" class="btn btn-danger" onclick="javascript:window_open_from_root('@MyHelper.GetConfig(Configuration, "SiteInformation:mainsite")');"><i class="fa fa-repeat"></i> กลับ</button>
+            <button type="button" class="btn btn-danger" onclick="javascript:window_close();"><i class="fa fa-repeat"></i> กลับ</button>
         </div>
     </div>