diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
index c4f3fe8c..68857412 100644
--- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
@@ -94,6 +94,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                     {
                         Name = string.IsNullOrEmpty(probation_assign.result.profile.name) ? "-" : probation_assign.result.profile.name,
                         Position = string.IsNullOrEmpty(probation_assign.result.profile.Position) ? "-" : probation_assign.result.profile.Position,
+                        PositionLevel = string.IsNullOrEmpty(probation_assign.result.profile.PositionLevelName) ? "-" : probation_assign.result.profile.PositionLevelName,
                         Department = string.IsNullOrEmpty(probation_assign.result.profile.Department) ? "-" : probation_assign.result.profile.Department,
                         OrganizationOrganization = string.IsNullOrEmpty(probation_assign.result.profile.OrganizationOrganization) ? "-" : probation_assign.result.profile.OrganizationOrganization,
                         Oc = string.IsNullOrEmpty(probation_assign.result.profile.Oc) ? "-" : probation_assign.result.profile.Oc,
@@ -147,25 +148,11 @@ namespace BMA.EHR.Application.Repositories.Reports
                     var training_seminar = evaluate_record.result.evaluate.training_seminar == "1" ? "🗹 ดำเนินการแล้ว   ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว   🗹 ยังไม่ได้ดำเนินการ";
                     var other_training = evaluate_record.result.evaluate.other_training == "1" ? "🗹 ดำเนินการแล้ว   ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว   🗹 ยังไม่ได้ดำเนินการ";
 
-                    var expects = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0
-                        ? new
-                        {
-                            col1 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col1 == "/" ? "✓" : string.Empty,
-                            col2 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col2 == "/" ? "✓" : string.Empty,
-                            col3 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col3 == "/" ? "✓" : string.Empty,
-                            col4 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col4 == "/" ? "✓" : string.Empty,
-                            col5 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col5 == "/" ? "✓" : string.Empty,
-                        }
+                    var expects = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.evaluate_expect_level
+                        ? evaluate_record.result.evaluate.achievements.evaluate_expect_level
                         : null;
-                    var outputs = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0
-                        ? new
-                        {
-                            col1 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col1 == "/" ? "✓" : string.Empty,
-                            col2 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col2 == "/" ? "✓" : string.Empty,
-                            col3 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col3 == "/" ? "✓" : string.Empty,
-                            col4 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col4 == "/" ? "✓" : string.Empty,
-                            col5 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col5 == "/" ? "✓" : string.Empty,
-                        }
+                    var outputs = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.evaluate_output_level
+                        ? evaluate_record.result.evaluate.achievements.evaluate_output_level
                         : null;
                     var knows = evaluate_record.result.evaluate != null
                         ? new
@@ -365,6 +352,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         DirectorDated = string.IsNullOrEmpty(evaluate_record.result.evaluate.sign_dated.ToString()) ? "-" : evaluate_record.result.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(),
                         Name = string.IsNullOrEmpty(evaluate_record.result.experimentee.name) ? string.Empty : evaluate_record.result.experimentee.name,
                         Position = string.IsNullOrEmpty(evaluate_record.result.experimentee.Position) ? string.Empty : evaluate_record.result.experimentee.Position,
+                        PositionLevel = string.IsNullOrEmpty(evaluate_record.result.experimentee.PositionLevelName) ? "-" : evaluate_record.result.experimentee.PositionLevelName,
                         Department = string.IsNullOrEmpty(evaluate_record.result.experimentee.Department) ? string.Empty : evaluate_record.result.experimentee.Department,
                         Organization = string.IsNullOrEmpty(evaluate_record.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_record.result.experimentee.OrganizationOrganization,
                         Oc = string.IsNullOrEmpty(evaluate_record.result.experimentee.Oc) ? string.Empty : evaluate_record.result.experimentee.Oc,
@@ -592,6 +580,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_finish.ToString()) ? "-" : evaluate_assign.result.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(),
                         Name = string.IsNullOrEmpty(evaluate_assign.result.experimentee.name) ? string.Empty : evaluate_assign.result.experimentee.name,
                         Position = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Position) ? string.Empty : evaluate_assign.result.experimentee.Position,
+                        PositionLevel = string.IsNullOrEmpty(evaluate_assign.result.experimentee.PositionLevelName) ? "-" : evaluate_assign.result.experimentee.PositionLevelName,
                         Department = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Department) ? string.Empty : evaluate_assign.result.experimentee.Department,
                         Organization = string.IsNullOrEmpty(evaluate_assign.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.result.experimentee.OrganizationOrganization,
                         Oc = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Oc) ? string.Empty : evaluate_assign.result.experimentee.Oc,
@@ -822,6 +811,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_finish.ToString()) ? "-" : evaluate_assign.result.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(),
                         Name = string.IsNullOrEmpty(evaluate_assign.result.experimentee.name) ? string.Empty : evaluate_assign.result.experimentee.name,
                         Position = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Position) ? string.Empty : evaluate_assign.result.experimentee.Position,
+                        PositionLevel = string.IsNullOrEmpty(evaluate_assign.result.experimentee.PositionLevelName) ? "-" : evaluate_assign.result.experimentee.PositionLevelName,
                         Department = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Department) ? string.Empty : evaluate_assign.result.experimentee.Department,
                         Organization = string.IsNullOrEmpty(evaluate_assign.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.result.experimentee.OrganizationOrganization,
                         Oc = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Oc) ? string.Empty : evaluate_assign.result.experimentee.Oc,
@@ -933,6 +923,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_start.ToString()) ? "-" : evaluate_assign.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(),
                         EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_start.ToString()) ? "-" : evaluate_assign.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(),
                         Position = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Position) ? string.Empty : evaluate_assign.result.experimentee.Position,
+                        PositionLevel = string.IsNullOrEmpty(evaluate_assign.result.experimentee.PositionLevelName) ? "-" : evaluate_assign.result.experimentee.PositionLevelName,
                         Department = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Department) ? string.Empty : evaluate_assign.result.experimentee.Department,
                         Organization = string.IsNullOrEmpty(evaluate_assign.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.result.experimentee.OrganizationOrganization,
                         Oc = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Oc) ? string.Empty : evaluate_assign.result.experimentee.Oc,
diff --git a/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs
index a1dc9e7f..08ce18dd 100644
--- a/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs
+++ b/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs
@@ -26,6 +26,8 @@ namespace BMA.EHR.Application.Responses
             public string Position { get; set; } = string.Empty;
             public string Department { get; set; } = string.Empty;
             public string Oc { get; set; } = string.Empty;
+            public string PositionLevelName { get; set; } = string.Empty;
+
         }
 
         public class Commander
diff --git a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs
index 33ffa03e..7866aef5 100644
--- a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs
+++ b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs
@@ -26,6 +26,7 @@ namespace BMA.EHR.Application.Responses
             public string PositionLineId { get; set; } = string.Empty;
             public string OrganizationOrganization { get; set; } = string.Empty;
             public string Position { get; set; } = string.Empty;
+            public string PositionLevelName { get; set; } = string.Empty;
             public string Department { get; set; } = string.Empty;
             public string Oc { get; set; } = string.Empty;
         }
diff --git a/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs
index 023a75c2..e0a8d017 100644
--- a/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs
+++ b/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs
@@ -26,6 +26,7 @@ namespace BMA.EHR.Application.Responses
             public string Department { get; set; }
             public string OrganizationOrganization { get; set; }
             public string Oc { get; set; }
+            public string PositionLevelName { get; set; }
         }
 
         public class Director
@@ -89,7 +90,7 @@ namespace BMA.EHR.Application.Responses
             public string role { get; set; }
             public DateTime createdAt { get; set; }
             public DateTime updatedAt { get; set; }
-            public List<Achievement> achievements { get; set; }
+            public Achievement achievements { get; set; }
         }
 
         public class Achievement
@@ -102,6 +103,7 @@ namespace BMA.EHR.Application.Responses
 
         public class EvaluateExpectLevel
         {
+            public string? title { get; set; }
             public string col1 { get; set; }
             public string col2 { get; set; }
             public string col3 { get; set; }
@@ -111,6 +113,7 @@ namespace BMA.EHR.Application.Responses
 
         public class EvaluateOutputLevel
         {
+            public string? title { get; set; }
             public string col1 { get; set; }
             public string col2 { get; set; }
             public string col3 { get; set; }
diff --git a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
index b3343c77..5db0ce18 100644
--- a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
+++ b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
@@ -64,6 +64,7 @@ namespace BMA.EHR.Application.Responses
             public string PositionLevelId { get; set; }
             public string PositionLineId { get; set; }
             public string Position { get; set; }
+            public string PositionLevelName { get; set; }
             public string Department { get; set; }
             public string OrganizationOrganization { get; set; }
             public string Oc { get; set; }
diff --git a/BMA.EHR.Application/Responses/ProbationAssignResponse.cs b/BMA.EHR.Application/Responses/ProbationAssignResponse.cs
index 88314d87..a96a9204 100644
--- a/BMA.EHR.Application/Responses/ProbationAssignResponse.cs
+++ b/BMA.EHR.Application/Responses/ProbationAssignResponse.cs
@@ -28,6 +28,7 @@
             public string Position { get; set; } = string.Empty;
             public string Department { get; set; } = string.Empty;
             public string Oc { get; set; } = string.Empty;
+            public string PositionLevelName { get; set; } = string.Empty;
         }
 
         public class Assign