diff --git a/EXCEL/eva_create_evaluation_detail.xlsx b/EXCEL/eva_create_evaluation_detail.xlsx
index 89fec57..c144bbf 100644
Binary files a/EXCEL/eva_create_evaluation_detail.xlsx and b/EXCEL/eva_create_evaluation_detail.xlsx differ
diff --git a/EXCEL/eva_evaluation_group.xlsx b/EXCEL/eva_evaluation_group.xlsx
index 2a96985..0d3ec2b 100644
Binary files a/EXCEL/eva_evaluation_group.xlsx and b/EXCEL/eva_evaluation_group.xlsx differ
diff --git a/EXCEL/eva_limit_frame_employee.xlsx b/EXCEL/eva_limit_frame_employee.xlsx
index a90b6a9..97ee7f3 100644
Binary files a/EXCEL/eva_limit_frame_employee.xlsx and b/EXCEL/eva_limit_frame_employee.xlsx differ
diff --git a/Migrations/25640309093443_UpdateEvaGroup01.Designer.cs b/Migrations/25640309093443_UpdateEvaGroup01.Designer.cs
new file mode 100644
index 0000000..71355dc
--- /dev/null
+++ b/Migrations/25640309093443_UpdateEvaGroup01.Designer.cs
@@ -0,0 +1,926 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using TTSW.EF;
+
+namespace tb320eva.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("25640309093443_UpdateEvaGroup01")]
+    partial class UpdateEvaGroup01
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<DateTime?>("imported_date");
+
+                    b.Property<string>("imported_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit");
+
+                    b.Property<decimal?>("limit_frame");
+
+                    b.Property<decimal?>("limit_frame_quota");
+
+                    b.Property<decimal?>("limit_quota");
+
+                    b.Property<int?>("managed_by");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("theDate");
+
+                    b.Property<int?>("theRound");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_adjust_postponement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
+                    b.Property<string>("position_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("total_promote");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("adjust_postponement_id");
+
+                    b.HasIndex("adjust_postponement_quota_id");
+
+                    b.ToTable("eva_adjust_postponement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<decimal?>("score1");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_create_evaluation");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("Final_summary_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("Final_summary_supervisor");
+
+                    b.Property<decimal?>("Final_summary_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_supervisor2A");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<decimal?>("achievement_supervisor1A");
+
+                    b.Property<decimal?>("achievement_supervisor2A");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<decimal?>("competency_supervisor1A");
+
+                    b.Property<decimal?>("competency_supervisor2A");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor1A")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor2A")
+                        .HasMaxLength(255);
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<decimal?>("score_supervisor1A");
+
+                    b.Property<decimal?>("score_supervisor2A");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    b.Property<DateTime?>("status_self_click_date");
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor1A_click_date");
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor2A_click_date");
+
+                    b.Property<DateTime?>("status_supervisor_click_date");
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<int?>("supervisor1A");
+
+                    b.Property<DateTime?>("supervisor1A_date");
+
+                    b.Property<string>("supervisor1A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor2");
+
+                    b.Property<int?>("supervisor2A");
+
+                    b.Property<DateTime?>("supervisor2A_date");
+
+                    b.Property<string>("supervisor2A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor2_date");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_summary_chief");
+
+                    b.Property<decimal?>("total_summary_competency_chief");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("total_summary_supervisor");
+
+                    b.Property<decimal?>("total_summary_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_supervisor2A");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(3000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("thefile")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_achievement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("thegroup")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_evaluation_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.ToTable("eva_evaluation_group_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_operating_agreement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("develop")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("development_method")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("period_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_idp_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_level_score");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_group_guid");
+
+                    b.ToTable("eva_limit_frame_employee");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_plan_guid");
+
+                    b.HasIndex("group_guid");
+
+                    b.ToTable("eva_limit_frame_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("theTime");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_performance_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("list_no");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<string>("step")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_performance_plan_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_promoted_percentage");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("temporary_min");
+
+                    b.Property<decimal?>("themax");
+
+                    b.Property<decimal?>("themin");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_salary_cylinder");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_quota_id")
+                        .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_plan_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("plan_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Migrations/25640309093443_UpdateEvaGroup01.cs b/Migrations/25640309093443_UpdateEvaGroup01.cs
new file mode 100644
index 0000000..49f2783
--- /dev/null
+++ b/Migrations/25640309093443_UpdateEvaGroup01.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class UpdateEvaGroup01 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "main_dept_id",
+                table: "eva_evaluation_group",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "percentage",
+                table: "eva_evaluation_group",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "main_dept_id",
+                table: "eva_evaluation_group");
+
+            migrationBuilder.DropColumn(
+                name: "percentage",
+                table: "eva_evaluation_group");
+        }
+    }
+}
diff --git a/Migrations/25640309111615_UpdateEmployeeLimitFrame.Designer.cs b/Migrations/25640309111615_UpdateEmployeeLimitFrame.Designer.cs
new file mode 100644
index 0000000..fde0d2d
--- /dev/null
+++ b/Migrations/25640309111615_UpdateEmployeeLimitFrame.Designer.cs
@@ -0,0 +1,928 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using TTSW.EF;
+
+namespace tb320eva.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("25640309111615_UpdateEmployeeLimitFrame")]
+    partial class UpdateEmployeeLimitFrame
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<DateTime?>("imported_date");
+
+                    b.Property<string>("imported_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit");
+
+                    b.Property<decimal?>("limit_frame");
+
+                    b.Property<decimal?>("limit_frame_quota");
+
+                    b.Property<decimal?>("limit_quota");
+
+                    b.Property<int?>("managed_by");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("theDate");
+
+                    b.Property<int?>("theRound");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_adjust_postponement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
+                    b.Property<string>("position_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("total_promote");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("adjust_postponement_id");
+
+                    b.HasIndex("adjust_postponement_quota_id");
+
+                    b.ToTable("eva_adjust_postponement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<decimal?>("score1");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_create_evaluation");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("Final_summary_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("Final_summary_supervisor");
+
+                    b.Property<decimal?>("Final_summary_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_supervisor2A");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<decimal?>("achievement_supervisor1A");
+
+                    b.Property<decimal?>("achievement_supervisor2A");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<decimal?>("competency_supervisor1A");
+
+                    b.Property<decimal?>("competency_supervisor2A");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor1A")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor2A")
+                        .HasMaxLength(255);
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<decimal?>("score_supervisor1A");
+
+                    b.Property<decimal?>("score_supervisor2A");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    b.Property<DateTime?>("status_self_click_date");
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor1A_click_date");
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor2A_click_date");
+
+                    b.Property<DateTime?>("status_supervisor_click_date");
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<int?>("supervisor1A");
+
+                    b.Property<DateTime?>("supervisor1A_date");
+
+                    b.Property<string>("supervisor1A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor2");
+
+                    b.Property<int?>("supervisor2A");
+
+                    b.Property<DateTime?>("supervisor2A_date");
+
+                    b.Property<string>("supervisor2A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor2_date");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_summary_chief");
+
+                    b.Property<decimal?>("total_summary_competency_chief");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("total_summary_supervisor");
+
+                    b.Property<decimal?>("total_summary_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_supervisor2A");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(3000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("thefile")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_achievement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("thegroup")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_evaluation_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.ToTable("eva_evaluation_group_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_operating_agreement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("develop")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("development_method")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("period_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_idp_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_level_score");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_group_guid");
+
+                    b.ToTable("eva_limit_frame_employee");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_plan_guid");
+
+                    b.HasIndex("group_guid");
+
+                    b.ToTable("eva_limit_frame_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("theTime");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_performance_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("list_no");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<string>("step")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_performance_plan_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_promoted_percentage");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("temporary_min");
+
+                    b.Property<decimal?>("themax");
+
+                    b.Property<decimal?>("themin");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_salary_cylinder");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_quota_id")
+                        .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_plan_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("plan_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Migrations/25640309111615_UpdateEmployeeLimitFrame.cs b/Migrations/25640309111615_UpdateEmployeeLimitFrame.cs
new file mode 100644
index 0000000..2bfdc56
--- /dev/null
+++ b/Migrations/25640309111615_UpdateEmployeeLimitFrame.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class UpdateEmployeeLimitFrame : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "help_org_id",
+                table: "eva_limit_frame_employee",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "help_org_id",
+                table: "eva_limit_frame_employee");
+        }
+    }
+}
diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs
index 01450ef..de873ac 100644
--- a/Migrations/DataContextModelSnapshot.cs
+++ b/Migrations/DataContextModelSnapshot.cs
@@ -467,6 +467,10 @@ namespace tb320eva.Migrations
 
                     b.Property<bool>("isActive");
 
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
                     b.Property<string>("thegroup")
                         .HasMaxLength(255);
 
@@ -597,6 +601,8 @@ namespace tb320eva.Migrations
 
                     b.Property<Guid?>("frame_group_guid");
 
+                    b.Property<int?>("help_org_id");
+
                     b.Property<bool>("isActive");
 
                     b.Property<string>("level_text")
diff --git a/Models/eva_evaluation_group/eva_evaluation_groupEntity.cs b/Models/eva_evaluation_group/eva_evaluation_groupEntity.cs
index d6ca0c7..a088fec 100644
--- a/Models/eva_evaluation_group/eva_evaluation_groupEntity.cs
+++ b/Models/eva_evaluation_group/eva_evaluation_groupEntity.cs
@@ -21,6 +21,8 @@ namespace TodoAPI2.Models
         [MaxLength(255)]
         public string thegroup { get; set; }
 
+        public int? main_dept_id { get; set; }
 
+        public decimal? percentage { get; set; }
     }
 }
diff --git a/Models/eva_evaluation_group/eva_evaluation_groupInputModel.cs b/Models/eva_evaluation_group/eva_evaluation_groupInputModel.cs
index ccb43ca..ec60b4f 100644
--- a/Models/eva_evaluation_group/eva_evaluation_groupInputModel.cs
+++ b/Models/eva_evaluation_group/eva_evaluation_groupInputModel.cs
@@ -20,6 +20,10 @@ namespace TodoAPI2.Models
 
         public string thegroup { get; set; }
 
+        public int? main_dept_id { get; set; }
+
+        public decimal? percentage { get; set; }
+
         public string active_mode { get; set; }
     }
 }
diff --git a/Models/eva_evaluation_group/eva_evaluation_groupService.cs b/Models/eva_evaluation_group/eva_evaluation_groupService.cs
index ba8df02..cbf7fb2 100644
--- a/Models/eva_evaluation_group/eva_evaluation_groupService.cs
+++ b/Models/eva_evaluation_group/eva_evaluation_groupService.cs
@@ -20,14 +20,16 @@ namespace TodoAPI2.Models
     public class eva_evaluation_groupService : Ieva_evaluation_groupService
     {
         private IBaseRepository<eva_evaluation_groupEntity, Guid> _repository;
-		private IMyDatabase db;
-		private Iexternal_linkageService ext;
+        private IMyDatabase db;
+        private Iexternal_linkageService ext;
+        private Iexternal_employeeService emp;
 
-        public eva_evaluation_groupService(IBaseRepository<eva_evaluation_groupEntity, Guid> repository, IMyDatabase mydb, Iexternal_linkageService inext)
+        public eva_evaluation_groupService(IBaseRepository<eva_evaluation_groupEntity, Guid> repository, IMyDatabase mydb, Iexternal_linkageService inext, Iexternal_employeeService inemp)
         {
             _repository = repository;
-			db = mydb;
-			ext = inext;
+            db = mydb;
+            ext = inext;
+            emp = inemp;
         }
 
         #region Private Functions
@@ -47,7 +49,7 @@ namespace TodoAPI2.Models
         {
             return Mapper.Map<List<eva_evaluation_groupViewModel>>(entities);
         }
-       
+
         private List<eva_evaluation_groupEntity> GetListWithoutBase64Fields(IQueryable<eva_evaluation_groupEntity> listQuery)
         {
             return listQuery.Select(c => new eva_evaluation_groupEntity()
@@ -65,6 +67,21 @@ namespace TodoAPI2.Models
         #region Public Functions
         #region Query Functions
 
+        private List<external_linkageViewModel> getMainDept()
+        {
+            var a = emp.GetDeptMapping().Where(x => !x.id2.HasValue);
+            var data = new List<external_linkageViewModel>();
+            foreach(var i in a)
+            {
+                var n = new external_linkageViewModel();
+                n.external_id = i.id;
+                n.external_name = i.department_name;
+                n.external_code = i.department_code;
+                data.Add(n);
+            }
+            return data;
+        }
+
         public eva_evaluation_groupViewModel Get(Guid id)
         {
             var entity = _repository.Get(id);
@@ -75,6 +92,7 @@ namespace TodoAPI2.Models
         {
             var entity = _repository.Get(id);
             var i = Mapper.Map<eva_evaluation_groupWithSelectionViewModel>(entity);
+            i.item_main_dept_id = getMainDept();
 
 
             return i;
@@ -82,23 +100,38 @@ namespace TodoAPI2.Models
         public eva_evaluation_groupWithSelectionViewModel GetBlankItem()
         {
             var i = new eva_evaluation_groupWithSelectionViewModel();
+            i.item_main_dept_id = getMainDept();
 
 
             return i;
         }
 
+        public List<eva_evaluation_groupViewModel> GetListBycode(string code)
+        {
+            var model = new eva_evaluation_groupSearchModel();
+            model.code = code;
+            return GetListBySearch(model);
+        }
+
         public List<eva_evaluation_groupViewModel> GetListALLeva_evaluation_group()
         {
             var data = (
                 from m_eva_evaluation_group in _repository.Context.eva_evaluation_group
 
-                orderby m_eva_evaluation_group.created descending
+                join fk_external_linkage3 in getMainDept() on m_eva_evaluation_group.main_dept_id equals fk_external_linkage3.id
+                into external_linkageResult3
+                from fk_external_linkageResult3 in external_linkageResult3.DefaultIfEmpty()
+
+                orderby m_eva_evaluation_group.code
                 select new eva_evaluation_groupViewModel()
                 {
                     id = m_eva_evaluation_group.id,
                     code = m_eva_evaluation_group.code,
                     thegroup = m_eva_evaluation_group.thegroup,
+                    main_dept_id = m_eva_evaluation_group.main_dept_id,
+                    percentage = m_eva_evaluation_group.percentage,
 
+                    main_dept_id_external_linkage_external_name = fk_external_linkageResult3.external_name,
 
                     isActive = m_eva_evaluation_group.isActive,
                     Created = m_eva_evaluation_group.created,
@@ -109,48 +142,30 @@ namespace TodoAPI2.Models
             return data;
         }
 
-        public List<eva_evaluation_groupViewModel> GetListBycode(string code)
+
+        public List<eva_evaluation_groupViewModel> GetListBySearch(eva_evaluation_groupSearchModel model)
         {
             var data = (
                 from m_eva_evaluation_group in _repository.Context.eva_evaluation_group
 
+                join fk_external_linkage3 in getMainDept() on m_eva_evaluation_group.main_dept_id equals fk_external_linkage3.id
+                into external_linkageResult3
+                from fk_external_linkageResult3 in external_linkageResult3.DefaultIfEmpty()
 
-				where m_eva_evaluation_group.code == code || string.IsNullOrEmpty(code)
-
-                orderby m_eva_evaluation_group.created descending
-                select new eva_evaluation_groupViewModel()
-                {
-                    id = m_eva_evaluation_group.id,
-                    code = m_eva_evaluation_group.code,
-                    thegroup = m_eva_evaluation_group.thegroup,
-
-
-                    isActive = m_eva_evaluation_group.isActive,
-                    Created = m_eva_evaluation_group.created,
-                    Updated = m_eva_evaluation_group.updated
-                }
-            ).ToList();
-
-            return data;
-        }
-
-		public List<eva_evaluation_groupViewModel> GetListBySearch(eva_evaluation_groupSearchModel model)
-        {
-            var data = (
-                from m_eva_evaluation_group in _repository.Context.eva_evaluation_group
-
-
-				where 1==1
+                where 1 == 1
                 && (m_eva_evaluation_group.code == model.code || string.IsNullOrEmpty(model.code))
 
 
-                orderby m_eva_evaluation_group.created descending
+                orderby m_eva_evaluation_group.code
                 select new eva_evaluation_groupViewModel()
                 {
                     id = m_eva_evaluation_group.id,
                     code = m_eva_evaluation_group.code,
                     thegroup = m_eva_evaluation_group.thegroup,
+                    main_dept_id = m_eva_evaluation_group.main_dept_id,
+                    percentage = m_eva_evaluation_group.percentage,
 
+                    main_dept_id_external_linkage_external_name = fk_external_linkageResult3.external_name,
 
                     isActive = m_eva_evaluation_group.isActive,
                     Created = m_eva_evaluation_group.created,
@@ -172,7 +187,7 @@ namespace TodoAPI2.Models
 
 
             var inserted = _repository.Insert(entity);
- 
+
             return Get(inserted.id);
         }
 
@@ -183,26 +198,29 @@ namespace TodoAPI2.Models
             {
                 existingEntity.code = model.code;
                 existingEntity.thegroup = model.thegroup;
-
+                existingEntity.main_dept_id = model.main_dept_id;
+                existingEntity.percentage = model.percentage;
 
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
             }
             else
-            throw new NotificationException("No data to update");
+                throw new NotificationException("No data to update");
         }
 
-		public string UpdateMultiple(List<eva_evaluation_groupInputModel> model)
+        public string UpdateMultiple(List<eva_evaluation_groupInputModel> model)
         {
-            foreach(var i in model)
+            foreach (var i in model)
             {
                 if (i.active_mode == "1" && i.id.HasValue) // update
-                {                    
+                {
                     var existingEntity = _repository.Get(i.id.Value);
                     if (existingEntity != null)
                     {
-                existingEntity.code = i.code;
-                existingEntity.thegroup = i.thegroup;
+                        existingEntity.code = i.code;
+                        existingEntity.thegroup = i.thegroup;
+                        existingEntity.main_dept_id = i.main_dept_id;
+                        existingEntity.percentage = i.percentage;
 
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
@@ -215,15 +233,15 @@ namespace TodoAPI2.Models
                     _repository.InsertWithoutCommit(entity);
                 }
                 else if (i.active_mode == "0" && i.id.HasValue) // remove
-                {                    
+                {
                     _repository.DeleteWithoutCommit(i.id.Value);
                 }
                 else if (i.active_mode == "0" && !i.id.HasValue)
                 {
                     // nothing to do
-                }                
+                }
             }
-			_repository.Context.SaveChanges();
+            _repository.Context.SaveChanges();
 
             return model.Count().ToString();
         }
diff --git a/Models/eva_evaluation_group/eva_evaluation_groupViewModel.cs b/Models/eva_evaluation_group/eva_evaluation_groupViewModel.cs
index 24cb1e6..f2afb41 100644
--- a/Models/eva_evaluation_group/eva_evaluation_groupViewModel.cs
+++ b/Models/eva_evaluation_group/eva_evaluation_groupViewModel.cs
@@ -18,6 +18,10 @@ namespace TodoAPI2.Models
 
         public string thegroup { get; set; }
 
+        public int? main_dept_id { get; set; }
 
+        public decimal? percentage { get; set; }
+
+        public string main_dept_id_external_linkage_external_name { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_evaluation_group/eva_evaluation_groupWithSelectionViewModel.cs b/Models/eva_evaluation_group/eva_evaluation_groupWithSelectionViewModel.cs
index a40b64d..d321742 100644
--- a/Models/eva_evaluation_group/eva_evaluation_groupWithSelectionViewModel.cs
+++ b/Models/eva_evaluation_group/eva_evaluation_groupWithSelectionViewModel.cs
@@ -7,6 +7,6 @@ namespace TodoAPI2.Models
 {
     public class eva_evaluation_groupWithSelectionViewModel: eva_evaluation_groupViewModel
     {
-
+        public List<external_linkageViewModel> item_main_dept_id { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs
index 7269b1e..ed4cab6 100644
--- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs
+++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs
@@ -40,8 +40,10 @@ namespace TodoAPI2.Models
 
         public int? order_of_data { get; set; }
 
+        public int? help_org_id { get; set; }
 
-		public void SetAutoField(DataContext context)
+
+        public void SetAutoField(DataContext context)
         {
             
         }
diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs
index 8dd7819..9a2f453 100644
--- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs
+++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs
@@ -36,6 +36,7 @@ namespace TodoAPI2.Models
 
         public int? order_of_data { get; set; }
 
+        public int? help_org_id { get; set; }
         public string active_mode { get; set; }
     }
 }
diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs
index 699decb..6118a25 100644
--- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs
+++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs
@@ -79,18 +79,27 @@ namespace TodoAPI2.Models
         {
             var entity = _repository.Get(id);
             var i = Mapper.Map<eva_limit_frame_employeeWithSelectionViewModel>(entity);
+            i.item_frame_group_guid = (from x in _repository.Context.eva_limit_frame_group 
+                                       join j in _repository.Context.eva_evaluation_group 
+                                       on x.group_guid equals j.id
+                                       where (from q in _repository.Context.eva_limit_frame_group where q.id == entity.frame_group_guid select q.frame_plan_guid).Contains(x.frame_plan_guid)
+                                       select new external_linkageViewModel { id_guid=x.id,external_name=j.thegroup }).ToList();
             i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList();
             i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
-
+            i.item_help_org_id = (from x in ext.GetDepartmentData() select x).ToList();
 
             return i;
         }
         public eva_limit_frame_employeeWithSelectionViewModel GetBlankItem()
         {
             var i = new eva_limit_frame_employeeWithSelectionViewModel();
+            i.item_frame_group_guid = (from x in _repository.Context.eva_limit_frame_group
+                                       join j in _repository.Context.eva_evaluation_group
+                                       on x.group_guid equals j.id
+                                       select new external_linkageViewModel { id_guid = x.id, external_name = j.thegroup }).ToList();
             i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList();
             i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
-
+            i.item_help_org_id = (from x in ext.GetDepartmentData() select x).ToList();
 
             return i;
         }
@@ -119,6 +128,9 @@ namespace TodoAPI2.Models
                 into external_linkageResult3
                 from fk_external_linkageResult3 in external_linkageResult3.DefaultIfEmpty()
 
+                join fk_external_linkage11 in ext.GetDepartmentData() on m_eva_limit_frame_employee.help_org_id equals fk_external_linkage11.id
+                into external_linkageResult11
+                from fk_external_linkageResult11 in external_linkageResult11.DefaultIfEmpty()
 
                 where
                 1 == 1
@@ -140,10 +152,12 @@ namespace TodoAPI2.Models
                     monthly_remuneration = m_eva_limit_frame_employee.monthly_remuneration,
                     cost_of_living = m_eva_limit_frame_employee.cost_of_living,
                     order_of_data = m_eva_limit_frame_employee.order_of_data,
+                    help_org_id = m_eva_limit_frame_employee.help_org_id,
 
                     frame_group_guid_eva_limit_frame_group_group_guid = fk_eva_limit_frame_groupResult1.group_guid,
                     employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
                     org_id_external_linkage_external_name = fk_external_linkageResult3.external_name,
+                    help_org_id_external_linkage_external_name = fk_external_linkageResult11.external_name,
 
                     isActive = m_eva_limit_frame_employee.isActive,
                     Created = m_eva_limit_frame_employee.created,
@@ -197,6 +211,7 @@ namespace TodoAPI2.Models
                 existingEntity.monthly_remuneration = model.monthly_remuneration;
                 existingEntity.cost_of_living = model.cost_of_living;
                 existingEntity.order_of_data = model.order_of_data;
+                existingEntity.help_org_id = model.help_org_id;
 
                 existingEntity.SetAutoField(_repository.Context);
 
@@ -236,6 +251,7 @@ namespace TodoAPI2.Models
                         existingEntity.monthly_remuneration = i.monthly_remuneration;
                         existingEntity.cost_of_living = i.cost_of_living;
                         existingEntity.order_of_data = i.order_of_data;
+                        existingEntity.help_org_id = i.help_org_id;
 
                         existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs
index 1f34dbe..b3c59eb 100644
--- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs
+++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs
@@ -34,9 +34,11 @@ namespace TodoAPI2.Models
 
         public int? order_of_data { get; set; }
 
+        public int? help_org_id { get; set; }
+
         public Guid? frame_group_guid_eva_limit_frame_group_group_guid { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }
         public string org_id_external_linkage_external_name { get; set; }
-
+        public string help_org_id_external_linkage_external_name { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs
index 6ee46b2..e2d7dcb 100644
--- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs
+++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs
@@ -7,8 +7,10 @@ namespace TodoAPI2.Models
 {
     public class eva_limit_frame_employeeWithSelectionViewModel: eva_limit_frame_employeeViewModel
     {
+        public List<external_linkageViewModel> item_frame_group_guid { get; set; }
         public List<external_employeeViewModel> item_employee_id { get; set; }
         public List<external_linkageViewModel> item_org_id { get; set; }
-
+        public List<external_linkageViewModel> item_help_org_id { get; set; }
     }
-}
\ No newline at end of file
+}
+
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 b9aa21e..d0f4ed7 100644
--- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
+++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
@@ -117,7 +117,7 @@ namespace TodoAPI2.Models
                 && (!model.group_guid.HasValue || m_eva_limit_frame_group.group_guid == model.group_guid)
 
 
-                orderby m_eva_limit_frame_group.created descending
+                orderby fk_eva_evaluation_groupResult2.code 
                 select new eva_limit_frame_groupViewModel()
                 {
                     id = m_eva_limit_frame_group.id,
diff --git a/Models/external_employee/Iexternal_employeeService.cs b/Models/external_employee/Iexternal_employeeService.cs
index 0202303..139d651 100644
--- a/Models/external_employee/Iexternal_employeeService.cs
+++ b/Models/external_employee/Iexternal_employeeService.cs
@@ -20,8 +20,8 @@ namespace TodoAPI2.Models
         List<external_employeeViewModel> GetAllEmployee();
         List<external_menu> GetAllMenu();
         List<external_menu> GetMenuByUser(int? userid);
-
         List<external_user> GetAllUser();
+        List<dept_mappingViewModel> GetDeptMapping();
     }
 }
 
diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs
index 3531e6f..67cd193 100644
--- a/Models/external_employee/external_employeeService.cs
+++ b/Models/external_employee/external_employeeService.cs
@@ -735,6 +735,53 @@ select id,name from users
 
             return i;
         }
+
+        public List<dept_mappingViewModel> GetDeptMapping()
+        {
+            var sql = string.Format(@"
+select orgdata.id,orgdata2.id as id2,
+case when orgdata2.department_name is not null then 
+concat(orgdata2.department_name,' - ',orgdata.department_name)
+else orgdata.department_name end as full_dep,
+orgdata.department_name,
+orgdata.department_code,detail.parent_department_id,
+case 
+when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000
+when detail.parent_department_id is not null and detail.parent_department_id>0
+then orgdata2.department_code::int*1000+orgdata.department_code::int
+else orgdata.department_code::int*100000 end as sort_order,org_type_depart.department_degree_id
+from public.{0}DepartmentData{0} orgdata
+left join org_organization_chart_details detail on orgdata.id = detail.department_id
+left join public.{0}DepartmentData{0} orgdata2 on orgdata2.id = detail.parent_department_id
+left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id
+left join public.org_type_department_colors as org_depart_color
+on org_type_depart.department_degree_id = org_depart_color.id
+where orgdata.department_name is not null  and orgdata.deleted_at is null
+order by case 
+when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000
+when detail.parent_department_id is not null and detail.parent_department_id>0
+then orgdata2.department_code::int*1000+orgdata.department_code::int
+else orgdata.department_code::int*100000 end
+", '"'.ToString());
+            var para = db.GetParameterListNpgsql();
+            DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
+            var result = new List<dept_mappingViewModel>();
+            foreach (DataRow dr in dt.Rows)
+            {
+                var i = new dept_mappingViewModel();
+                if(dr["id"] != DBNull.Value) i.id = Convert.ToInt32(dr["id"]);
+                if (dr["id2"] != DBNull.Value) i.id2 = Convert.ToInt32(dr["id2"]);
+                if (dr["full_dep"] != DBNull.Value) i.full_dep= dr["full_dep"].ToString();
+                if (dr["department_name"] != DBNull.Value) i.department_name = dr["department_name"].ToString();
+                if (dr["department_code"] != DBNull.Value) i.department_code = dr["department_code"].ToString();
+                if (dr["parent_department_id"] != DBNull.Value) i.parent_department_id = Convert.ToInt32(dr["parent_department_id"]);
+                if (dr["sort_order"] != DBNull.Value) i.sort_order = Convert.ToInt32(dr["sort_order"]);
+                if (dr["department_degree_id"] != DBNull.Value) i.department_degree_id = Convert.ToInt32(dr["department_degree_id"]);
+
+                result.Add(i);
+            }
+            return result;
+        }
     }
 
     public class external_menu 
diff --git a/Models/external_employee/external_employeeViewModel.cs b/Models/external_employee/external_employeeViewModel.cs
index 8ee2d9f..3c0e4fc 100644
--- a/Models/external_employee/external_employeeViewModel.cs
+++ b/Models/external_employee/external_employeeViewModel.cs
@@ -11,6 +11,18 @@ using TTSW.Common;
 
 namespace TodoAPI2.Models
 {
+    public class dept_mappingViewModel
+    {
+        public int? id { get; set; }
+        public int? id2 { get; set; }
+        public string full_dep { get; set; }
+        public string department_name { get; set; }
+        public string department_code { get; set; }
+        public int? parent_department_id { get; set; }
+        public int? sort_order { get; set; }
+        public int? department_degree_id { get; set; }
+    }
+
     public class employee_leaveViewModel
     {
         public decimal? sum_day_sick_leave { get; set; }
diff --git a/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml b/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
index 107178f..dd1d900 100644
--- a/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
+++ b/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
@@ -29,7 +29,17 @@
                                 <input class="form-control" type="text" id="eva_evaluation_group_thegroup" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_evaluation_group" />
                             </div>
                         </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_evaluation_group_main_dept_id" for="eva_evaluation_group_main_dept_id">กอง/แผนก</label>
+                                <select class="form-control" id="eva_evaluation_group_main_dept_id" iLabel="กอง/แผนก" iRequire="false" iGroup="eva_evaluation_group"></select>
+                            </div>
 
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_evaluation_group_percentage" for="eva_evaluation_group_percentage">กรอบวงเงิน</label>
+                                <input class="form-control" type="number" id="eva_evaluation_group_percentage" iLabel="กรอบวงเงิน" iRequire="true" iGroup="eva_evaluation_group" />
+                            </div>
+                        </div>
 
                     </div>
                 </div>
@@ -82,7 +92,8 @@
                     <th>เครื่องมือ</th>
                     <th><label id='h_eva_evaluation_group_code'>รหัสกลุ่มการประเมิน</label></th>
                     <th><label id='h_eva_evaluation_group_thegroup'>กลุ่มการประเมิน</label></th>
-
+                    <th><label id='h_eva_evaluation_group_main_dept_id'>กอง/แผนก</label></th>
+                    <th><label id='h_eva_evaluation_group_percentage'>กรอบวงเงิน</label></th>
                 </tr>
             </thead>
             <tbody></tbody>
diff --git a/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml b/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml
index 3e90735..de3de84 100644
--- a/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml
+++ b/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml
@@ -44,7 +44,17 @@
                             <input class="form-control" type="text" id="eva_evaluation_group_thegroup" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_evaluation_group" />
                         </div>
                     </div>
+                    <div class='row'>
+                        <div class="form-group col-md-6">
+                            <label id="lab_eva_evaluation_group_main_dept_id" for="eva_evaluation_group_main_dept_id">กอง/แผนก</label>
+                            <select class="form-control" id="eva_evaluation_group_main_dept_id" iLabel="กอง/แผนก" iRequire="false" iGroup="eva_evaluation_group"></select>
+                        </div>
 
+                        <div class="form-group col-md-6">
+                            <label id="lab_eva_evaluation_group_percentage" for="eva_evaluation_group_percentage">กรอบวงเงิน</label>
+                            <input class="form-control" type="number" id="eva_evaluation_group_percentage" iLabel="กรอบวงเงิน" iRequire="true" iGroup="eva_evaluation_group" />
+                        </div>
+                    </div>
 
                 </div>
 			</div>
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml
deleted file mode 100644
index 5f06a29..0000000
--- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml
+++ /dev/null
@@ -1,159 +0,0 @@
-@using Microsoft.Extensions.Configuration
-@inject IConfiguration Configuration
-@{
-    ViewData["Title"] = "eva_limit_frame_employee";
-}
-
-<div class="modal fade" id="eva_limit_frame_employeeModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_limit_frame_employeeModelLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="eva_limit_frame_employeeModelLabel">บันทึกข้อมูล eva_limit_frame_employee</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-md-12">
-
-                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_id" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
-
-                        <div class='row'></div>
-                        <div class='row'></div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-                                <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-                                <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
-                                <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
-                                <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee" />
-                            </div>
-                        </div>
-
-
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
-                <button type="button" class="btn btn-primary" onclick="javascript:eva_limit_frame_employee_PutUpdate()">บันทึก</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="row page-title">
-    <div class="col-md-5">
-        <div class="page-title">
-            @Configuration["SiteInformation:modulename"]
-        </div>
-    </div>
-    <div class="col-md-7">
-        <ol class="breadcrumb" style="">
-            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]">หน้าแรก</a></li>
-            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]@Configuration["SiteInformation:appsite"]">@Configuration["SiteInformation:modulename"]</a></li>
-            <li class="breadcrumb-item active">eva_limit_frame_employee</li>
-        </ol>
-    </div>
-</div>
-
-<section class="wrapper">
-    <div class="title"><div class="line"></div>ค้นหา eva_limit_frame_employee</div>
-    <div class="tools">
-        <div class="row">
-
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_employee_frame_group_guid' for='s_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label>
-                <input class="form-control" type="hidden" id="s_eva_limit_frame_employee_frame_group_guid" />
-            </div>
-
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_employee_employee_id' for='s_eva_limit_frame_employee_employee_id'>พนักงาน</label>
-                <select class="form-control" id="s_eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="s_eva_limit_frame_employee" title='พนักงาน' placeholder='พนักงาน'></select>
-            </div>
-
-            <div class="col-md-6">
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_DoSearch();">ค้นหา</button>
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GetSelect('id');">ดึงตัวเลือก</button>
-            </div>
-
-        </div>
-    </div>
-
-    <table id="eva_limit_frame_employeeTable" class="display table table-bordered table-striped">
-        <thead>
-            <tr>
-                <!--<th>เลือก</th>-->
-                <th>เครื่องมือ</th>
-                <th><label id='h_eva_limit_frame_employee_id'>id</label></th>
-                <th><label id='h_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label></th>
-                <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
-                <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
-                <th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
-                <th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
-                <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
-                <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
-                <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
-                <th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
-                <th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
-
-            </tr>
-        </thead>
-        <tbody></tbody>
-    </table>
-</section>
-
-@section FooterPlaceHolder{
-    <script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee.js"></script>
-    <script>
-        $(document).ready(function () {
-            eva_limit_frame_employee_InitiateDataTable();
-            eva_limit_frame_employee_InitialForm();
-            SetupValidationRemark("eva_limit_frame_employee");
-        });
-    </script>
-}
-
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml
deleted file mode 100644
index f0c2a41..0000000
--- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml
+++ /dev/null
@@ -1,119 +0,0 @@
-@using Microsoft.Extensions.Configuration
-@inject IConfiguration Configuration
-@{
-    ViewData["Title"] = "eva_limit_frame_employee";
-	Layout = "_LayoutDirect";
-}
-
-<div class="row page-title">
-    <div class="col-md-5">
-        <div class="page-title">
-            @Configuration["SiteInformation:modulename"]
-        </div>
-    </div>
-    <div class="col-md-7">
-        <ol class="breadcrumb" style="">
-            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]">หน้าแรก</a></li>
-            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]@Configuration["SiteInformation:appsite"]">@Configuration["SiteInformation:modulename"]</a></li>
-            <li class="breadcrumb-item active">eva_limit_frame_employee</li>
-        </ol>        
-    </div>
-</div>
-
-<section class="wrapper">
-	<div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล eva_limit_frame_employee</div>
-
-    <section class="card no-border">
-            <header class="card-header">
-            กรุณากรอกข้อมูลลงในแบบฟอร์ม
-        </header>
-        <div class="card-body" style="">
-
-			<div class="row">
-				<div class="col-md-12">
-
-	<input class="form-control" type="hidden" id="eva_limit_frame_employee_id" />
-<input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
-
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-	    <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-	    <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
-	    <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
-	    <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-
-
-				</div>
-			</div>
-		</div>
-	</section>
-
-	<div class="row">
-		<div class="form-group col-md-12">
-			<button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
-			<button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_employee_PutUpdate()">บันทึก</button>
-		</div>
-	</div>
-
-</section>
-
-@section FooterPlaceHolder{
-<script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js"></script>
-<script>
-    $(document).ready(function () {
-        var id = getUrlParameter("id");
-        if (id) {
-            eva_limit_frame_employee_SetEditForm(id);
-        } else {
-            eva_limit_frame_employee_SetCreateForm();
-        }
-        SetupValidationRemark("eva_limit_frame_employee");
-    });
-</script>
-}
-
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml
deleted file mode 100644
index ea5a432..0000000
--- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml
+++ /dev/null
@@ -1,70 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-    ViewData["Title"] = "eva_limit_frame_employee";
-}
-
-<section class="wrapper">
-
-    <div class="title col-md-12"><div class="line"></div>จัดการ eva_limit_frame_employee</div>
-
-    <div class="tools">
-        <div class="row">
-
-            <div class="col-md-12">
-                <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_employee_Add()">
-                    <i class="fa fa-plus"></i> เพิ่มรายการ
-                </button>
-            </div>
-
-        </div>
-    </div>
-
-    <table id="eva_limit_frame_employeeTable" class="display table table-bordered table-striped">
-        <thead>
-            <tr>
-                <th>ลำดับ</th>
-<th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
-<th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
-<th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
-<th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
-<th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
-<th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
-<th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
-<th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
-<th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
-
-                <th>กิจกรรม</th>
-            </tr>
-        </thead>
-        <tbody class="thin-border-bottom" id="eva_limit_frame_employeeBody"></tbody>
-    </table>
-
-    <div class="tools">
-        <div class="row">
-
-            <div class="col-md-12">
-                <button type="button" class="btn btn-outline" data-dismiss="modal">ยกเลิก</button>
-                <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_employee_Save(getUrlParameter('id'))">บันทึก</button>
-            </div>
-
-        </div>
-    </div>
-
-</section>
-
-@section FooterPlaceHolder{
-<script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js"></script>
-<script>
-    $(document).ready(function () {
-        //var id = getUrlParameter("id");
-        //if (id) {
-        //    eva_limit_frame_employee_InitialForm(id);
-		//} 
-		eva_limit_frame_employee_InitialForm('');
-	});
-
-	$(document).on("change", ".input_score", function () {
-        eva_limit_frame_employee_Summary();
-	});
-</script>
-}
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml
deleted file mode 100644
index fa58d16..0000000
--- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml
+++ /dev/null
@@ -1,60 +0,0 @@
-@using Microsoft.Extensions.Configuration
-@inject IConfiguration Configuration
-@{
-    ViewData["Title"] = "eva_limit_frame_employee";
-}
-
-<div class="row page-title">
-    <div class="col-md-5">
-        <div class="page-title">
-            @Configuration["SiteInformation:modulename"]
-        </div>
-    </div>
-    <div class="col-md-7">
-        <ol class="breadcrumb" style="">
-            <li class="breadcrumb-item "><a href="javascript:window_open_from_root('@Configuration["SiteInformation:mainsite"]');">หน้าแรก</a></li>
-            <li class="breadcrumb-item "><a href="javascript:window_open_from_root('@Configuration["SiteInformation:modulesite"]');">@Configuration["SiteInformation:modulename"]</a></li>
-            <li class="breadcrumb-item active">รายงาน eva_limit_frame_employee</li>
-        </ol>
-    </div>
-</div>
-
-<section class="wrapper">
-    <div class="title"><div class="line"></div>รายงาน eva_limit_frame_employee</div>
-    <div class="tools">
-        <div class="row">
-            <div class="col-md-12">
-				<div class="row">
-
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_employee_frame_group_guid' for='s_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label>
-                            <input class="form-control" type="hidden" id="s_eva_limit_frame_employee_frame_group_guid" />
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_employee_employee_id' for='s_eva_limit_frame_employee_employee_id'>พนักงาน</label>
-                            <select class="form-control" id="s_eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="s_eva_limit_frame_employee" title='พนักงาน' placeholder='พนักงาน'></select>
-                        </div>
-                
-				</div>
-            </div>
-            <div class="col-md-12">
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_DoSearch('pdf');">แสดงรายงาน</button>
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_DoSearch('xlsx');">ดาวน์โหลดเป็น Excel</button>
-            </div>
-        </div>
-    </div>
-</section>
-<br/>
-<iframe id="report_result" style="display:none; height:500px; width:100%;"></iframe>
-
-@section FooterPlaceHolder{
-    <script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee_report.js"></script>
-    <script>
-        $(document).ready(function () {
-            eva_limit_frame_employee_InitialForm();
-            SetupValidationRemark("s_eva_limit_frame_employee");
-        });
-    </script>
-}
-
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml
deleted file mode 100644
index 91135be..0000000
--- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml
+++ /dev/null
@@ -1,90 +0,0 @@
-<input class="inpt-control" type="hidden" id="eva_limit_frame_employee_id" />
-<input class="inpt-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
-
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-	    <div class="inpt-group"> 
-		    <select class="inpt-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-	    <div class="inpt-group"> 
-		    <select class="inpt-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-</div>
-<div class='row'>
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-</div>
-<div class='row'>
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-</div>
-<div class='row'>
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-	    </div>
-    </div>
-</div>
-</div>
diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
index 9b748d8..f58ee7a 100644
--- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
+++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
@@ -20,27 +20,34 @@
                     <div class="col-md-12">
 
                         <input class="form-control" type="hidden" id="eva_limit_frame_employee_id" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
-
 
+                        <div class='row'></div>
                         <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_frame_group_guid" for="eva_limit_frame_employee_frame_group_guid">กลุ่มการประเมิน</label>
+                                <select class="form-control" id="eva_limit_frame_employee_frame_group_guid" iLabel="กลุ่มการประเมิน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
+                            </div>
+
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
                                 <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="false" iGroup="eva_limit_frame_employee" />
                             </div>
                         </div>
                         <div class='row'>
-                            <div class="form-group col-md-6">
+                            <div class="form-group col-md-4">
                                 <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-                                <select disabled class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
+                                <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
                             </div>
 
-                            <div class="form-group col-md-6">
-                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-                                <select disabled class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน ต้นสังกัด</label>
+                                <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน ต้นสังกัด" iRequire="false" iGroup="eva_limit_frame_employee"></select>
                             </div>
 
-
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_help_org_id" for="eva_limit_frame_employee_help_org_id">ช่วยปฏิบัติงานที่</label>
+                                <select class="form-control" id="eva_limit_frame_employee_help_org_id" iLabel="ช่วยปฏิบัติงานที่" iRequire="false" iGroup="eva_limit_frame_employee"></select>
+                            </div>
                         </div>
                         <div class='row'>
                             <div class="form-group col-md-4">
@@ -54,21 +61,23 @@
                             </div>
                         </div>
                         <div class='row'>
-                            <div class="form-group col-md-3">
+                            <div class="form-group col-md-4">
                                 <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
                                 <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
                             </div>
 
-                            <div class="form-group col-md-3">
+                            <div class="form-group col-md-4">
                                 <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
                                 <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee" />
                             </div>
 
-                            <div class="form-group col-md-3">
+                            <div class="form-group col-md-4">
                                 <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
                                 <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
                             </div>
-                            <div class="form-group col-md-3">
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
                                 <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
                                 <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="false" iGroup="eva_limit_frame_employee" />
                             </div>
@@ -172,14 +181,14 @@
                 <th>เครื่องมือ</th>
                 <th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
                 <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
-                <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
+                <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน ต้นสังกัด</label></th>
                 <th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
                 <th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
                 <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
                 <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
                 <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
                 <th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
-
+                <th><label id='h_eva_limit_frame_employee_help_org_id'>ช่วยปฏิบัติงานที่</label></th>
 
             </tr>
         </thead>
diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml
deleted file mode 100644
index 389f7c1..0000000
--- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml
+++ /dev/null
@@ -1,67 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-    ViewData["Title"] = "eva_limit_frame_group";
-}
-
-<section class="wrapper">
-
-    <div class="title col-md-12"><div class="line"></div>จัดการ eva_limit_frame_group</div>
-
-    <div class="tools">
-        <div class="row">
-
-            <div class="col-md-12">
-                <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_group_Add()">
-                    <i class="fa fa-plus"></i> เพิ่มรายการ
-                </button>
-            </div>
-
-        </div>
-    </div>
-
-    <table id="eva_limit_frame_groupTable" class="display table table-bordered table-striped">
-        <thead>
-            <tr>
-                <th>ลำดับ</th>
-<th><label id='h_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label></th>
-<th><label id='h_eva_limit_frame_group_limit_frame_295'>กรอบวงเงินที่กันไว้</label></th>
-<th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
-<th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
-<th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
-<th><label id='h_eva_limit_frame_group_remark'>หมายเหตุ</label></th>
-
-                <th>กิจกรรม</th>
-            </tr>
-        </thead>
-        <tbody class="thin-border-bottom" id="eva_limit_frame_groupBody"></tbody>
-    </table>
-
-    <div class="tools">
-        <div class="row">
-
-            <div class="col-md-12">
-                <button type="button" class="btn btn-outline" data-dismiss="modal">ยกเลิก</button>
-                <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_group_Save(getUrlParameter('id'))">บันทึก</button>
-            </div>
-
-        </div>
-    </div>
-
-</section>
-
-@section FooterPlaceHolder{
-<script src="~/js/eva_limit_frame_group/eva_limit_frame_group_inline.js"></script>
-<script>
-    $(document).ready(function () {
-        //var id = getUrlParameter("id");
-        //if (id) {
-        //    eva_limit_frame_group_InitialForm(id);
-		//} 
-		eva_limit_frame_group_InitialForm('');
-	});
-
-	$(document).on("change", ".input_score", function () {
-        eva_limit_frame_group_Summary();
-	});
-</script>
-}
diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_report.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_report.cshtml
deleted file mode 100644
index 88889d5..0000000
--- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_report.cshtml
+++ /dev/null
@@ -1,60 +0,0 @@
-@using Microsoft.Extensions.Configuration
-@inject IConfiguration Configuration
-@{
-    ViewData["Title"] = "eva_limit_frame_group";
-}
-
-<div class="row page-title">
-    <div class="col-md-5">
-        <div class="page-title">
-            @Configuration["SiteInformation:modulename"]
-        </div>
-    </div>
-    <div class="col-md-7">
-        <ol class="breadcrumb" style="">
-            <li class="breadcrumb-item "><a href="javascript:window_open_from_root('@Configuration["SiteInformation:mainsite"]');">หน้าแรก</a></li>
-            <li class="breadcrumb-item "><a href="javascript:window_open_from_root('@Configuration["SiteInformation:modulesite"]');">@Configuration["SiteInformation:modulename"]</a></li>
-            <li class="breadcrumb-item active">รายงาน eva_limit_frame_group</li>
-        </ol>
-    </div>
-</div>
-
-<section class="wrapper">
-    <div class="title"><div class="line"></div>รายงาน eva_limit_frame_group</div>
-    <div class="tools">
-        <div class="row">
-            <div class="col-md-12">
-				<div class="row">
-
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_group_frame_plan_guid' for='s_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label>
-                            <input class="form-control" type="hidden" id="s_eva_limit_frame_group_frame_plan_guid" />
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_group_group_guid' for='s_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label>
-                            <select class="form-control" id="s_eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="s_eva_limit_frame_group" title='กลุ่มการประเมิน' placeholder='กลุ่มการประเมิน'></select>
-                        </div>
-                
-				</div>
-            </div>
-            <div class="col-md-12">
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_group_DoSearch('pdf');">แสดงรายงาน</button>
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_group_DoSearch('xlsx');">ดาวน์โหลดเป็น Excel</button>
-            </div>
-        </div>
-    </div>
-</section>
-<br/>
-<iframe id="report_result" style="display:none; height:500px; width:100%;"></iframe>
-
-@section FooterPlaceHolder{
-    <script src="~/js/eva_limit_frame_group/eva_limit_frame_group_report.js"></script>
-    <script>
-        $(document).ready(function () {
-            eva_limit_frame_group_InitialForm();
-            SetupValidationRemark("s_eva_limit_frame_group");
-        });
-    </script>
-}
-
diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml
deleted file mode 100644
index 5514ab7..0000000
--- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<input class="inpt-control" type="hidden" id="eva_limit_frame_group_id" />
-<input class="inpt-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
-
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
-	    <div class="inpt-group"> 
-		    <select class="inpt-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_limit_frame_group" ></select>
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_group"  />
-	    </div>
-    </div>
-</div>
-</div>
-<div class='row'>
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="true" iGroup="eva_limit_frame_group"  />
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="true" iGroup="eva_limit_frame_group"  />
-	    </div>
-    </div>
-</div>
-
-<div class="col-md-4">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
-	    <div class="inpt-group"> 
-		    <input class="inpt-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="true" iGroup="eva_limit_frame_group"  />
-	    </div>
-    </div>
-</div>
-</div>
-<div class='row'>
-<div class="col-md-12">
-    <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
-	    <div class="inpt-group"> 
-		    <textarea  class="inpt-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group" ></textarea>
-	    </div>
-    </div>
-</div>
-</div>
diff --git a/tb320eva.csproj b/tb320eva.csproj
index 3b3c6c0..a11c9b0 100644
--- a/tb320eva.csproj
+++ b/tb320eva.csproj
@@ -70,16 +70,8 @@
 	<None Include="Views\eva_create_evaluation_detail_firstdocView\eva_create_evaluation_detail_firstdoc.cshtml" />
 	<None Include="Views\eva_create_evaluation_detail_firstdocView\eva_create_evaluation_detail_firstdoc_d.cshtml" />
 	<None Include="Views\eva_evaluation_operating_agreementView\eva_evaluation_operating_agreement.cshtml" />
-	<None Include="Views\eva_limit_frame_employeeView\eva_limit_frame_employee.cshtml" />
-	<None Include="Views\eva_limit_frame_employeeView\eva_limit_frame_employee_d.cshtml" />
-	<None Include="Views\eva_limit_frame_employeeView\eva_limit_frame_employee_inline.cshtml" />
-	<None Include="Views\eva_limit_frame_employeeView\eva_limit_frame_employee_report.cshtml" />
-	<None Include="Views\eva_limit_frame_employeeView\eva_limit_frame_employee_wizardform.cshtml" />
 	<None Include="Views\eva_limit_frame_groupView\eva_limit_frame_group.cshtml" />
 	<None Include="Views\eva_limit_frame_groupView\eva_limit_frame_group_d.cshtml" />
-	<None Include="Views\eva_limit_frame_groupView\eva_limit_frame_group_inline.cshtml" />
-	<None Include="Views\eva_limit_frame_groupView\eva_limit_frame_group_report.cshtml" />
-	<None Include="Views\eva_limit_frame_groupView\eva_limit_frame_group_wizardform.cshtml" />
 	<None Include="Views\eva_limit_frame_planView\eva_limit_frame_plan.cshtml" />
 	<None Include="Views\eva_limit_frame_planView\eva_limit_frame_plan_d.cshtml" />
 	<None Include="Views\eva_limit_frame_planView\eva_limit_frame_plan_inline.cshtml" />
@@ -96,9 +88,6 @@
 	<None Include="wwwroot\js\eva_create_evaluation_detail_review0A\eva_create_evaluation_detail_review0A_d.js" />
 	<None Include="wwwroot\js\eva_evaluation_operating_agreement\eva_evaluation_operating_agreement.js" />
 	<None Include="wwwroot\js\eva_limit_frame_employee\eva_limit_frame_employee.js" />
-	<None Include="wwwroot\js\eva_limit_frame_employee\eva_limit_frame_employee_d.js" />
-	<None Include="wwwroot\js\eva_limit_frame_employee\eva_limit_frame_employee_inline.js" />
-	<None Include="wwwroot\js\eva_limit_frame_employee\eva_limit_frame_employee_report.js" />
 	<None Include="wwwroot\js\eva_limit_frame_group\eva_limit_frame_group.js" />
 	<None Include="wwwroot\js\eva_limit_frame_group\eva_limit_frame_group_d.js" />
 	<None Include="wwwroot\js\eva_limit_frame_group\eva_limit_frame_group_inline.js" />
diff --git a/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js b/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js
index ff55ec4..68f0903 100644
--- a/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js
+++ b/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js
@@ -5,31 +5,33 @@ var eva_evaluation_group_API = "/api/eva_evaluation_group/";
 
 function eva_evaluation_group_GetSearchParameter() {
     var eva_evaluation_groupSearchObject = new Object();
-eva_evaluation_groupSearchObject.code = $("#s_eva_evaluation_group_code").val();
+    eva_evaluation_groupSearchObject.code = $("#s_eva_evaluation_group_code").val();
 
     return eva_evaluation_groupSearchObject;
 }
 
 function eva_evaluation_group_FeedDataToSearchForm(data) {
-$("#s_eva_evaluation_group_code").val(data.code);
+    $("#s_eva_evaluation_group_code").val(data.code);
 
 }
 
 //================= Form Data Customizaiton =========================================
 
 function eva_evaluation_group_FeedDataToForm(data) {
-$("#eva_evaluation_group_id").val(data.id);
-$("#eva_evaluation_group_code").val(data.code);
-$("#eva_evaluation_group_thegroup").val(data.thegroup);
-
+    $("#eva_evaluation_group_id").val(data.id);
+    $("#eva_evaluation_group_code").val(data.code);
+    $("#eva_evaluation_group_thegroup").val(data.thegroup);
+    DropDownClearFormAndFeedWithData($("#eva_evaluation_group_main_dept_id"), data, "id", "external_name", "item_main_dept_id", data.main_dept_id);
+    $("#eva_evaluation_group_percentage").val(data.percentage);
 }
 
 function eva_evaluation_group_GetFromForm() {
     var eva_evaluation_groupObject = new Object();
-eva_evaluation_groupObject.id = $("#eva_evaluation_group_id").val();
-eva_evaluation_groupObject.code = $("#eva_evaluation_group_code").val();
-eva_evaluation_groupObject.thegroup = $("#eva_evaluation_group_thegroup").val();
-
+    eva_evaluation_groupObject.id = $("#eva_evaluation_group_id").val();
+    eva_evaluation_groupObject.code = $("#eva_evaluation_group_code").val();
+    eva_evaluation_groupObject.thegroup = $("#eva_evaluation_group_thegroup").val();
+    eva_evaluation_groupObject.main_dept_id = $("#eva_evaluation_group_main_dept_id").val();
+    eva_evaluation_groupObject.percentage = $("#eva_evaluation_group_percentage").val();
 
     return eva_evaluation_groupObject;
 }
@@ -37,14 +39,14 @@ eva_evaluation_groupObject.thegroup = $("#eva_evaluation_group_thegroup").val();
 function eva_evaluation_group_InitialForm(s) {
     var successFunc = function (result) {
         eva_evaluation_group_FeedDataToForm(result);
-		eva_evaluation_group_FeedDataToSearchForm(result);
+        eva_evaluation_group_FeedDataToSearchForm(result);
         if (s) {
             // Incase model popup
             $("#eva_evaluation_groupModel").modal("show");
         }
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_evaluation_group_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -71,15 +73,15 @@ function eva_evaluation_group_SetEditForm(a) {
         eva_evaluation_group_editMode = "UPDATE";
         eva_evaluation_group_FeedDataToForm(result);
         $("#eva_evaluation_groupModel").modal("show");
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_evaluation_group_API + a, successFunc, AlertDanger);
 }
 
 function eva_evaluation_group_SetCreateForm(s) {
     eva_evaluation_group_editMode = "CREATE";
-	eva_evaluation_group_InitialForm(s);
+    eva_evaluation_group_InitialForm(s);
 }
 
 function eva_evaluation_group_RefreshTable() {
@@ -97,8 +99,7 @@ var eva_evaluation_group_customValidation = function (group) {
 };
 
 function eva_evaluation_group_PutUpdate() {
-	if (!ValidateForm('eva_evaluation_group', eva_evaluation_group_customValidation))
-    {
+    if (!ValidateForm('eva_evaluation_group', eva_evaluation_group_customValidation)) {
         return;
     }
 
@@ -110,9 +111,9 @@ function eva_evaluation_group_PutUpdate() {
             $("#eva_evaluation_groupModel").modal("hide");
             AlertSuccess(result.message);
             eva_evaluation_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPutRequest(apisite + eva_evaluation_group_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
@@ -121,9 +122,9 @@ function eva_evaluation_group_PutUpdate() {
             $("#eva_evaluation_groupModel").modal("hide");
             AlertSuccess(result.message);
             eva_evaluation_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPostRequest(apisite + eva_evaluation_group_API, data, successFunc2, AlertDanger);
     }
 }
@@ -134,9 +135,9 @@ function eva_evaluation_group_GoDelete(a) {
             $("#eva_evaluation_groupModel").modal("hide");
             AlertSuccess(result.message);
             eva_evaluation_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxDeleteRequest(apisite + eva_evaluation_group_API + a, null, successFunc, AlertDanger);
     }
 }
@@ -146,16 +147,18 @@ function eva_evaluation_group_GoDelete(a) {
 var eva_evaluation_groupTableV;
 
 var eva_evaluation_group_setupTable = function (result) {
-	tmp = '"';
+    tmp = '"';
     eva_evaluation_groupTableV = $('#eva_evaluation_groupTable').DataTable({
         "processing": true,
         "serverSide": false,
         "data": result,
-		"select": false,
+        "select": false,
         "columns": [
-		{ "data": "id" },
-                { "data": "code" },
-                { "data": "thegroup" },            
+            { "data": "id" },
+            { "data": "code" },
+            { "data": "thegroup" },
+            { "data": "main_dept_id_external_linkage_external_name" },
+            { "data": "percentage" },   
         ],
         "columnDefs": [
             {
@@ -169,13 +172,13 @@ var eva_evaluation_group_setupTable = function (result) {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
         "paging": true,
-		"searching": false
+        "searching": false
     });
-	endLoad();
+    endLoad();
 };
 
 function eva_evaluation_group_InitiateDataTable() {
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + "/api/eva_evaluation_group/GetListBySearch", eva_evaluation_group_setupTable, AlertDanger);
 }
 
@@ -184,10 +187,10 @@ function eva_evaluation_group_DoSearch() {
     var eva_evaluation_group_reload = function (result) {
         eva_evaluation_groupTableV.destroy();
         eva_evaluation_group_setupTable(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
-    AjaxGetRequest(apisite + "/api/eva_evaluation_group/GetListBySearch?"+p, eva_evaluation_group_reload, AlertDanger);
+    startLoad();
+    AjaxGetRequest(apisite + "/api/eva_evaluation_group/GetListBySearch?" + p, eva_evaluation_group_reload, AlertDanger);
 }
 
 function eva_evaluation_group_GetSelect(f) {
diff --git a/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js b/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js
index 54cd8f6..eae15d2 100644
--- a/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js
+++ b/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js
@@ -4,18 +4,20 @@ var eva_evaluation_group_API = "/api/eva_evaluation_group/";
 //================= Form Data Customizaiton =========================================
 
 function eva_evaluation_group_FeedDataToForm(data) {
-$("#eva_evaluation_group_id").val(data.id);
-$("#eva_evaluation_group_code").val(data.code);
-$("#eva_evaluation_group_thegroup").val(data.thegroup);
-
+    $("#eva_evaluation_group_id").val(data.id);
+    $("#eva_evaluation_group_code").val(data.code);
+    $("#eva_evaluation_group_thegroup").val(data.thegroup);
+    DropDownClearFormAndFeedWithData($("#eva_evaluation_group_main_dept_id"), data, "id", "external_name", "item_main_dept_id", data.main_dept_id);
+    $("#eva_evaluation_group_percentage").val(data.percentage);
 }
 
 function eva_evaluation_group_GetFromForm() {
     var eva_evaluation_groupObject = new Object();
-eva_evaluation_groupObject.id = $("#eva_evaluation_group_id").val();
-eva_evaluation_groupObject.code = $("#eva_evaluation_group_code").val();
-eva_evaluation_groupObject.thegroup = $("#eva_evaluation_group_thegroup").val();
-
+    eva_evaluation_groupObject.id = $("#eva_evaluation_group_id").val();
+    eva_evaluation_groupObject.code = $("#eva_evaluation_group_code").val();
+    eva_evaluation_groupObject.thegroup = $("#eva_evaluation_group_thegroup").val();
+    eva_evaluation_groupObject.main_dept_id = $("#eva_evaluation_group_main_dept_id").val();
+    eva_evaluation_groupObject.percentage = $("#eva_evaluation_group_percentage").val();
 
     return eva_evaluation_groupObject;
 }
@@ -23,9 +25,9 @@ eva_evaluation_groupObject.thegroup = $("#eva_evaluation_group_thegroup").val();
 function eva_evaluation_group_InitialForm() {
     var successFunc = function (result) {
         eva_evaluation_group_FeedDataToForm(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_evaluation_group_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -35,15 +37,15 @@ function eva_evaluation_group_SetEditForm(a) {
     var successFunc = function (result) {
         eva_evaluation_group_editMode = "UPDATE";
         eva_evaluation_group_FeedDataToForm(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_evaluation_group_API + a, successFunc, AlertDanger);
 }
 
 function eva_evaluation_group_SetCreateForm() {
     eva_evaluation_group_editMode = "CREATE";
-	eva_evaluation_group_InitialForm();
+    eva_evaluation_group_InitialForm();
 }
 
 //================= Update and Delete =========================================
@@ -53,8 +55,7 @@ var eva_evaluation_group_customValidation = function (group) {
 };
 
 function eva_evaluation_group_PutUpdate() {
-	if (!ValidateForm('eva_evaluation_group', eva_evaluation_group_customValidation))
-    {
+    if (!ValidateForm('eva_evaluation_group', eva_evaluation_group_customValidation)) {
         return;
     }
     var data = eva_evaluation_group_GetFromForm();
@@ -63,18 +64,18 @@ function eva_evaluation_group_PutUpdate() {
     if (eva_evaluation_group_editMode === "UPDATE") {
         var successFunc1 = function (result) {
             AlertSuccess(result.message);
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPutRequest(apisite + eva_evaluation_group_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
             AlertSuccess(result.message);
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPostRequest(apisite + eva_evaluation_group_API, data, successFunc2, AlertDanger);
     }
 }
@@ -84,9 +85,9 @@ function eva_evaluation_group_GoDelete(a) {
         var successFunc = function (result) {
             AlertSuccess(result.message);
             eva_evaluation_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxDeleteRequest(apisite + eva_evaluation_group_API + a, null, successFunc, AlertDanger);
     }
 }
diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
index de7c030..a3404af 100644
--- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
+++ b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
@@ -21,7 +21,7 @@ function eva_limit_frame_employee_FeedDataToSearchForm(data) {
 
 function eva_limit_frame_employee_FeedDataToForm(data) {
     $("#eva_limit_frame_employee_id").val(data.id);
-    $("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
+    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_frame_group_guid"), data, "id_guid", "external_name", "item_frame_group_guid", data.frame_group_guid);
     DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id);
     DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
     $("#eva_limit_frame_employee_position_text").val(data.position_text);
@@ -31,13 +31,14 @@ function eva_limit_frame_employee_FeedDataToForm(data) {
     $("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
     $("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living);
     $("#eva_limit_frame_employee_order_of_data").val(data.order_of_data);
+    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_help_org_id"), data, "id", "external_name", "item_help_org_id", data.help_org_id);
     console.log(data);
 }
 
 function eva_limit_frame_employee_GetFromForm() {
     var eva_limit_frame_employeeObject = new Object();
     eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
-    eva_limit_frame_employeeObject.frame_group_guid = getUrlParameter("id");
+    eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val();
     eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
     eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
     eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val();
@@ -47,6 +48,7 @@ function eva_limit_frame_employee_GetFromForm() {
     eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
     eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val();
     eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val();
+    eva_limit_frame_employeeObject.help_org_id = $("#eva_limit_frame_employee_help_org_id").val();
 
 
     return eva_limit_frame_employeeObject;
@@ -184,7 +186,7 @@ var eva_limit_frame_employee_setupTable = function (result) {
             { "data": "position_allowance" },
             { "data": "monthly_remuneration" },
             { "data": "cost_of_living" },
-            
+            { "data": "help_org_id_external_linkage_external_name" },        
         ],
         "columnDefs": [
             {
diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js
deleted file mode 100644
index 8279875..0000000
--- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js
+++ /dev/null
@@ -1,116 +0,0 @@
-var eva_limit_frame_employee_editMode = "CREATE";
-var eva_limit_frame_employee_API = "/api/eva_limit_frame_employee/";
-
-//================= Form Data Customizaiton =========================================
-
-function eva_limit_frame_employee_FeedDataToForm(data) {
-$("#eva_limit_frame_employee_id").val(data.id);
-$("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-$("#eva_limit_frame_employee_position_text").val(data.position_text);
-$("#eva_limit_frame_employee_level_text").val(data.level_text);
-$("#eva_limit_frame_employee_salary").val(data.salary);
-$("#eva_limit_frame_employee_position_allowance").val(data.position_allowance);
-$("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
-$("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living);
-$("#eva_limit_frame_employee_order_of_data").val(data.order_of_data);
-
-}
-
-function eva_limit_frame_employee_GetFromForm() {
-    var eva_limit_frame_employeeObject = new Object();
-eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
-eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val();
-eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
-eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
-eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val();
-eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val();
-eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val();
-eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val();
-eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
-eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val();
-eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val();
-
-
-    return eva_limit_frame_employeeObject;
-}
-
-function eva_limit_frame_employee_InitialForm() {
-    var successFunc = function (result) {
-        eva_limit_frame_employee_FeedDataToForm(result);
-		endLoad();
-    };
-	startLoad();
-    AjaxGetRequest(apisite + eva_limit_frame_employee_API + "GetBlankItem", successFunc, AlertDanger);
-}
-
-//================= Form Mode Setup and Flow =========================================
-
-function eva_limit_frame_employee_SetEditForm(a) {
-    var successFunc = function (result) {
-        eva_limit_frame_employee_editMode = "UPDATE";
-        eva_limit_frame_employee_FeedDataToForm(result);
-		endLoad();
-    };
-	startLoad();
-    AjaxGetRequest(apisite + eva_limit_frame_employee_API + a, successFunc, AlertDanger);
-}
-
-function eva_limit_frame_employee_SetCreateForm() {
-    eva_limit_frame_employee_editMode = "CREATE";
-	eva_limit_frame_employee_InitialForm();
-}
-
-//================= Update and Delete =========================================
-
-var eva_limit_frame_employee_customValidation = function (group) {
-    return "";
-};
-
-function eva_limit_frame_employee_PutUpdate() {
-	if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation))
-    {
-        return;
-    }
-    var data = eva_limit_frame_employee_GetFromForm();
-
-    //Update Mode
-    if (eva_limit_frame_employee_editMode === "UPDATE") {
-        var successFunc1 = function (result) {
-            AlertSuccess(result.code+" "+result.message);
-			endLoad();
-        };
-		startLoad();
-        AjaxPutRequest(apisite + eva_limit_frame_employee_API + data.id, data, successFunc1, AlertDanger);
-    }
-    // Create mode
-    else {
-        var successFunc2 = function (result) {
-            AlertSuccess(result.code+" "+result.message);
-			endLoad();
-        };
-		startLoad();
-        AjaxPostRequest(apisite + eva_limit_frame_employee_API, data, successFunc2, AlertDanger);
-    }
-}
-
-function eva_limit_frame_employee_GoDelete(a) {
-    if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) {
-        var successFunc = function (result) {
-            AlertSuccess(result.code+" "+result.message);
-            eva_limit_frame_employee_RefreshTable();
-			endLoad();
-        };
-		startLoad();
-        AjaxDeleteRequest(apisite + eva_limit_frame_employee_API + a, null, successFunc, AlertDanger);
-    }
-}
-
-//================= File Upload =========================================
-
-
-
-//================= Multi-Selection Function =========================================
-
-
diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js
deleted file mode 100644
index bf0dc63..0000000
--- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js
+++ /dev/null
@@ -1,173 +0,0 @@
-function eva_limit_frame_employee_ClearForm(i, blankItem) {
-	var data = blankItem;
-$("#eva_limit_frame_employee_id_" + i).val("");
-$("#eva_limit_frame_employee_frame_group_guid_" + i).val("");
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
-$("#eva_limit_frame_employee_position_text_" + i).val("");
-$("#eva_limit_frame_employee_level_text_" + i).val("");
-$("#eva_limit_frame_employee_salary_" + i).val("");
-$("#eva_limit_frame_employee_position_allowance_" + i).val("");
-$("#eva_limit_frame_employee_monthly_remuneration_" + i).val("");
-$("#eva_limit_frame_employee_cost_of_living_" + i).val("");
-$("#eva_limit_frame_employee_order_of_data_" + i).val("");
-
-}
-
-function eva_limit_frame_employee_FeedDataToForm(data, i, blankItem) {
-$("#eva_limit_frame_employee_id_" + i).val(data.id);
-$("#eva_limit_frame_employee_frame_group_guid_" + i).val(data.frame_group_guid);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
-$("#eva_limit_frame_employee_position_text_" + i).val(data.position_text);
-$("#eva_limit_frame_employee_level_text_" + i).val(data.level_text);
-$("#eva_limit_frame_employee_salary_" + i).val(data.salary);
-$("#eva_limit_frame_employee_position_allowance_" + i).val(data.position_allowance);
-$("#eva_limit_frame_employee_monthly_remuneration_" + i).val(data.monthly_remuneration);
-$("#eva_limit_frame_employee_cost_of_living_" + i).val(data.cost_of_living);
-$("#eva_limit_frame_employee_order_of_data_" + i).val(data.order_of_data);
-
-}
-
-function eva_limit_frame_employee_GetFromForm(obj, i) {
-    var eva_limit_frame_employeeObject = new Object();
-eva_limit_frame_employeeObject.id = obj.find("#eva_limit_frame_employee_id_" + i).val();
-eva_limit_frame_employeeObject.frame_group_guid = obj.find("#eva_limit_frame_employee_frame_group_guid_" + i).val();
-eva_limit_frame_employeeObject.employee_id = obj.find("#eva_limit_frame_employee_employee_id_" + i).val();
-eva_limit_frame_employeeObject.org_id = obj.find("#eva_limit_frame_employee_org_id_" + i).val();
-eva_limit_frame_employeeObject.position_text = obj.find("#eva_limit_frame_employee_position_text_" + i).val();
-eva_limit_frame_employeeObject.level_text = obj.find("#eva_limit_frame_employee_level_text_" + i).val();
-eva_limit_frame_employeeObject.salary = obj.find("#eva_limit_frame_employee_salary_" + i).val();
-eva_limit_frame_employeeObject.position_allowance = obj.find("#eva_limit_frame_employee_position_allowance_" + i).val();
-eva_limit_frame_employeeObject.monthly_remuneration = obj.find("#eva_limit_frame_employee_monthly_remuneration_" + i).val();
-eva_limit_frame_employeeObject.cost_of_living = obj.find("#eva_limit_frame_employee_cost_of_living_" + i).val();
-eva_limit_frame_employeeObject.order_of_data = obj.find("#eva_limit_frame_employee_order_of_data_" + i).val();
-
-    eva_limit_frame_employeeObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_employee").val();
-    return eva_limit_frame_employeeObject;
-}
-
-function eva_limit_frame_employee_GetAllData() {
-    //Insert eva_limit_frame_employee List
-    var eva_limit_frame_employee = [];
-    $('#eva_limit_frame_employeeBody tr').each(function () {
-        var i = $(this).find("#rowCount").text();
-        var eacheva_limit_frame_employee = eva_limit_frame_employee_GetFromForm($(this), i);
-        eva_limit_frame_employee.push(eacheva_limit_frame_employee);
-    });
-    return eva_limit_frame_employee;
-}
-
-function eva_limit_frame_employee_Save(id) {
-	//Insert eva_limit_frame_employee List
-	var eva_limit_frame_employee = eva_limit_frame_employee_GetAllData();
-
-    var successFunc = function (result) {
-        AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
-		endLoad();
-    };
-	startLoad();
-	AjaxPutRequest(apisite + '/api/eva_limit_frame_employee/UpdateMultiple', eva_limit_frame_employee, successFunc, AlertDanger);
-}
-
-function eva_limit_frame_employee_Get(id, blankItem) {
-
-	$('#eva_limit_frame_employeeBody').empty();
-
-	var successFunc = function (response) {
-    //console.log(response);
-		$.each(response, function (i, data) {
-			var tag = '<tr>';
-            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_limit_frame_employee" value="1" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid_' + (i + 1)+'" /></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_employee_id_' + (i + 1) +'"></select></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_org_id_' + (i + 1) +'"></select></td>';
- tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_position_text_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_level_text_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_salary_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data_' + (i + 1)+'" /></td>';
-
-			tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_employee_Removeeva_limit_frame_employee(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_employee_Restoreeva_limit_frame_employee(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
-			tag += '</tr>';
-			$('#eva_limit_frame_employeeBody').append($(tag));
-			eva_limit_frame_employee_FeedDataToForm(data, (i + 1), blankItem);
-		});
-        eva_limit_frame_employee_Summary();
-		endLoad();
-	};
-	startLoad();
-	AjaxGetRequest(apisite + "/api/eva_limit_frame_employee", successFunc, AlertDanger);
-			//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByframe_group_guid/' + a, successFunc, AlertDanger);
-		//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByemployee_id/' + a, successFunc, AlertDanger);
-		//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByorg_id/' + a, successFunc, AlertDanger);
-
-}
-
-function eva_limit_frame_employee_Add() {
-	var successFunc = function (result) {
-		var i = $("#eva_limit_frame_employeeBody tr").length;
-		var tag = '<tr>';
-		tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_limit_frame_employee" value="1" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid_' + (i + 1)+'" /></td>';
-	 tag += '<td><select class="form-control" id="eva_limit_frame_employee_employee_id_' + (i + 1) +'"></select></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_org_id_' + (i + 1) +'"></select></td>';
- tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_position_text_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_level_text_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_salary_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living_' + (i + 1)+'" /></td>';
- tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data_' + (i + 1)+'" /></td>';
-
-		tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_employee_Removeeva_limit_frame_employee(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_employee_Restoreeva_limit_frame_employee(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
-		tag += '</tr>';
-    
-		$('#eva_limit_frame_employeeBody').append($(tag));
-		eva_limit_frame_employee_ClearForm(i + 1, result);
-		endLoad();
-	};
-	startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/" + "GetBlankItem", successFunc, AlertDanger);
-}
-
-function eva_limit_frame_employee_Removeeva_limit_frame_employee(e) {
-    if (confirm('กรุณากดตกลง เพื่อยืนยันการลบ?')) {
-        $(e).closest('tr').find("input,select,textarea").attr('disabled', true);
-        $(e).closest('tr').find("input,select,textarea").css({ opacity: '0.5' });
-        $(e).hide();
-        $(e).closest('tr').find("#restoreBtn").show();
-        $(e).closest('tr').find("input").first().val("0");
-        console.log($(e).closest('tr').find("input").first().val());
-        eva_limit_frame_employee_Summary();
-    }
-}
-
-function eva_limit_frame_employee_Restoreeva_limit_frame_employee(e) {
-    if (confirm('กรุณากดตกลง เพื่อยืนยันการกู้คืน?')) {
-        $(e).closest('tr').find("input,select,textarea").attr('disabled', false);
-        $(e).closest('tr').find("input,select,textarea").css({ opacity: '1' });
-        $(e).hide();
-        $(e).closest('tr').find("#removeBtn").show();
-        $(e).closest('tr').find("input").first().val("1");
-        console.log($(e).closest('tr').find("input").first().val());
-        eva_limit_frame_employee_Summary();
-    }
-}
-
-function eva_limit_frame_employee_Summary() {
-    var sum = 0;
-    $(".input_score").each(function () {
-        sum += +$(this).val();
-    });
-    $("#score_label").text("ผลรวม: " + sum);
-}
-
-function eva_limit_frame_employee_InitialForm(id) {
-    var successFunc = function (result) {
-        eva_limit_frame_employee_Get(id, result);
-        endLoad();
-    };
-    startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/" + "GetBlankItem", successFunc, AlertDanger);
-}
diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_report.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_report.js
deleted file mode 100644
index 369692b..0000000
--- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_report.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var eva_limit_frame_employee_API = "/api/eva_limit_frame_employee/";
-
-//================= Search Customizaiton =========================================
-
-function eva_limit_frame_employee_GetSearchParameter(fileType) {
-    var eva_limit_frame_employeeSearchObject = new Object();
-eva_limit_frame_employeeSearchObject.frame_group_guid = $("#s_eva_limit_frame_employee_frame_group_guid").val();
-eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val();
-
-
-    eva_limit_frame_employeeSearchObject.fileType = fileType;
-
-    console.log(eva_limit_frame_employeeSearchObject);
-
-    return eva_limit_frame_employeeSearchObject;
-}
-
-function eva_limit_frame_employee_FeedDataToSearchForm(data) {
-$("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
-DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-
-}
-
-//================= Form Data Customizaiton =========================================
-
-function eva_limit_frame_employee_InitialForm(s) {
-    var successFunc = function (result) {
-        eva_limit_frame_employee_FeedDataToSearchForm(result);
-        endLoad();
-    };
-    startLoad();
-    AjaxGetRequest(apisite + eva_limit_frame_employee_API + "GetBlankItem", successFunc, AlertDanger);
-}
-
-//================= Data Table =========================================
-
-var s_eva_limit_frame_employee_customValidation = function (group) {
-    return "";
-};
-
-
-function eva_limit_frame_employee_DoSearch(fileType) {
-    if (!ValidateForm('s_eva_limit_frame_employee', s_eva_limit_frame_employee_customValidation)) {
-        return;
-    }
-
-    var p = $.param(eva_limit_frame_employee_GetSearchParameter(fileType));
-
-    var report_url = apisite + "/api/eva_limit_frame_employee/eva_limit_frame_employee_report?" + p;
-
-    if (fileType === "pdf") {        
-        $("#report_result").attr("src", report_url);
-        $("#report_result").show();
-        //window.open(report_url);
-    } else {
-        $("#report_result").hide();
-        window.open(report_url);
-    }
-}
-