diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs
index 6e68b77..c5f9599 100644
--- a/ApiControllers/rep_eva_xControllers.cs
+++ b/ApiControllers/rep_eva_xControllers.cs
@@ -275,6 +275,11 @@ namespace TodoAPI2.Controllers
             {
                 string url = $"{mainurl}{reportsite}/rep_eva_x{k}.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
 
+                if(p1.chief_fullname == p1.supervisor2_fullname && k == 3)
+                {
+                    url = $"{mainurl}{reportsite}/rep_eva_x{k}A.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
+                }
+
                 var data = httpclient.DownloadData(url);
 
                 PdfReader reader = new PdfReader(data);
diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
index 108f11c..0ee13f4 100644
--- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
+++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
@@ -134,8 +134,7 @@ namespace TodoAPI2.Models
                     total_salary = m_eva_limit_frame_group.total_salary,
                     total_salary_limit = m_eva_limit_frame_group.total_salary_limit,
                     total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded,
-                    remark = m_eva_limit_frame_group.remark+@"
-"+ m_eva_limit_frame_group.remark2,
+                    remark = !string.IsNullOrEmpty(m_eva_limit_frame_group.remark2) ? m_eva_limit_frame_group.remark2 : m_eva_limit_frame_group.remark,
                     remark2 = m_eva_limit_frame_group.remark2,
 
                     frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date,