diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index d745956c5..385369625 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -184,6 +184,17 @@ function clearForm() {
   profesLicenseData.issuer = "";
 }
 
+function editForm(row: any) {
+  dialogStatus.value = "edit";
+  editId.value = row.id;
+  profesLicenseData.certificateType = row.certificateType;
+  profesLicenseData.certificateNo = row.certificateNo;
+  profesLicenseData.issuer = row.issuer;
+  profesLicenseData.issueDate = row.issueDate;
+  profesLicenseData.expireDate = row.expireDate;
+  dialog.value = true;
+}
+
 async function addData() {
   await http
     .post(config.API.profileNewCertificate, {
@@ -384,14 +395,7 @@ onMounted(async () => {
             clickable
             @click="
               () => {
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                profesLicenseData.certificateType = props.row.certificateType;
-                profesLicenseData.certificateNo = props.row.certificateNo;
-                profesLicenseData.issuer = props.row.issuer;
-                profesLicenseData.issueDate = props.row.issueDate;
-                profesLicenseData.expireDate = props.row.expireDate;
-                dialog = true;
+                editForm(props.row);
               }
             "
           >
@@ -439,16 +443,7 @@ onMounted(async () => {
               round
               color="primary"
               icon="edit"
-              @click="
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                profesLicenseData.certificateType = props.row.certificateType;
-                profesLicenseData.certificateNo = props.row.certificateNo;
-                profesLicenseData.issuer = props.row.issuer;
-                profesLicenseData.issueDate = props.row.issueDate;
-                profesLicenseData.expireDate = props.row.expireDate;
-                dialog = true;
-              "
+              @click="editForm(props.row)"
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index 107adfc9d..30f6c778b 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -245,6 +245,25 @@ function clearForm() {
   trainData.endDate = new Date();
 }
 
+function editForm(row: any) {
+  dialogStatus.value = "edit";
+  editId.value = row.id;
+  isDate.value = row.isDate ? "true" : "false";
+  trainData.name = row.name;
+  trainData.topic = row.topic;
+  trainData.yearly = row.yearly;
+  trainData.place = row.place;
+  trainData.duration = row.duration;
+  trainData.department = row.department;
+  trainData.numberOrder = row.numberOrder;
+  trainData.dateOrder = row.dateOrder;
+  trainData.startDate = row.startDate;
+  trainData.endDate = row.endDate;
+  trainData.startYear = +row.startDate.slice(0, 4);
+  trainData.finishYear = +row.endDate.slice(0, 4);
+  dialog.value = true;
+}
+
 async function addData() {
   await http
     .post(config.API.profileNewTraining, {
@@ -277,7 +296,6 @@ async function addData() {
 async function editData(idData: string) {
   await http
     .patch(config.API.profileNewTrainingByTrainingId(idData), {
-      profileId: id.value,
       name: trainData.name,
       topic: trainData.topic ? trainData.topic : "",
       yearly: trainData.yearly,
@@ -534,22 +552,7 @@ onMounted(async () => {
             clickable
             @click="
               () => {
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                isDate = props.row.isDate ? 'true' : 'false';
-                trainData.name = props.row.name;
-                trainData.topic = props.row.topic;
-                trainData.yearly = props.row.yearly;
-                trainData.place = props.row.place;
-                trainData.duration = props.row.duration;
-                trainData.department = props.row.department;
-                trainData.numberOrder = props.row.numberOrder;
-                trainData.dateOrder = props.row.dateOrder;
-                trainData.startDate = props.row.startDate;
-                trainData.endDate = props.row.endDate;
-                trainData.startYear = +props.row.startDate.slice(0, 4);
-                trainData.finishYear = +props.row.endDate.slice(0, 4);
-                dialog = true;
+                editForm(props.row);
               }
             "
           >
@@ -598,24 +601,7 @@ onMounted(async () => {
               size="14px"
               color="primary"
               icon="mdi-pencil-outline"
-              @click="
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                isDate = props.row.isDate ? 'true' : 'false';
-                trainData.name = props.row.name;
-                trainData.topic = props.row.topic;
-                trainData.yearly = props.row.yearly;
-                trainData.place = props.row.place;
-                trainData.duration = props.row.duration;
-                trainData.department = props.row.department;
-                trainData.numberOrder = props.row.numberOrder;
-                trainData.dateOrder = props.row.dateOrder;
-                trainData.startDate = props.row.startDate;
-                trainData.endDate = props.row.endDate;
-                trainData.startYear = +props.row.startDate.slice(0, 4);
-                trainData.finishYear = +props.row.endDate.slice(0, 4);
-                dialog = true;
-              "
+              @click="editForm(props.row)"
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index b149e169f..721fabea6 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -326,6 +326,30 @@ function clearForm() {
   educationData.note = "";
 }
 
+function editForm(row: any) {
+  dialogStatus.value = "edit";
+  editId.value = row.id;
+  isDate.value = row.isDate ? "true" : "false";
+  educationData.educationLevel = row.educationLevel;
+  educationData.institute = row.institute;
+  educationData.finishDate = row.finishDate;
+  educationData.startDate = row.startDate;
+  educationData.endDate = row.endDate;
+  educationData.isEducation = row.isEducation;
+  educationData.degree = row.degree;
+  educationData.field = row.field;
+  educationData.fundName = row.fundName;
+  educationData.gpa = row.gpa;
+  educationData.country = row.country;
+  educationData.other = row.other;
+  educationData.duration = row.duration;
+  educationData.durationYear = row.durationYear;
+  educationData.note = row.note;
+  educationData.startYear = +row.startDate.slice(0, 4);
+  educationData.endYear = +row.endDate.slice(0, 4);
+  dialog.value = true;
+}
+
 function closeDialog() {
   clearForm();
   dialog.value = false;
@@ -403,7 +427,6 @@ async function addData() {
 async function editData(idData: string) {
   await http
     .patch(config.API.profileNewEducationByEducationId(idData), {
-      profileId: id.value,
       isActive: true,
       country: educationData.country,
       degree: educationData.degree,
@@ -519,7 +542,7 @@ onMounted(async () => {
       @click="
         () => {
           dialogStatus = 'create';
-          clearForm;
+          clearForm();
           dialog = true;
         }
       "
@@ -631,27 +654,7 @@ onMounted(async () => {
             clickable
             @click="
               () => {
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                isDate = props.row.isDate ? 'true' : 'false';
-                educationData.educationLevel = props.row.educationLevel;
-                educationData.institute = props.row.institute;
-                educationData.finishDate = props.row.finishDate;
-                educationData.startDate = props.row.startDate;
-                educationData.endDate = props.row.endDate;
-                educationData.isEducation = props.row.isEducation;
-                educationData.degree = props.row.degree;
-                educationData.field = props.row.field;
-                educationData.fundName = props.row.fundName;
-                educationData.gpa = props.row.gpa;
-                educationData.country = props.row.country;
-                educationData.other = props.row.other;
-                educationData.duration = props.row.duration;
-                educationData.durationYear = props.row.durationYear;
-                educationData.note = props.row.note;
-                educationData.startYear = +props.row.startDate.slice(0, 4);
-                educationData.endYear = +props.row.endDate.slice(0, 4);
-                dialog = true;
+                editForm(props.row);
               }
             "
           >
@@ -700,29 +703,7 @@ onMounted(async () => {
               color="primary"
               size="14px"
               icon="mdi-pencil-outline"
-              @click="
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                isDate = props.row.isDate ? 'true' : 'false';
-                educationData.educationLevel = props.row.educationLevel;
-                educationData.institute = props.row.institute;
-                educationData.finishDate = props.row.finishDate;
-                educationData.startDate = props.row.startDate;
-                educationData.endDate = props.row.endDate;
-                educationData.isEducation = props.row.isEducation;
-                educationData.degree = props.row.degree;
-                educationData.field = props.row.field;
-                educationData.fundName = props.row.fundName;
-                educationData.gpa = props.row.gpa;
-                educationData.country = props.row.country;
-                educationData.other = props.row.other;
-                educationData.duration = props.row.duration;
-                educationData.durationYear = props.row.durationYear;
-                educationData.note = props.row.note;
-                educationData.startYear = +props.row.startDate.slice(0, 4);
-                educationData.endYear = +props.row.endDate.slice(0, 4);
-                dialog = true;
-              "
+              @click="editForm(props.row)"
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
index 96896a2c9..0d5250ee8 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -150,6 +150,16 @@ function clearForm() {
   specialSkill.remark = "";
 }
 
+function editForm(row: any) {
+  dialogStatus.value = "edit";
+  editId.value = row.id;
+  specialSkill.detail = row.detail;
+  specialSkill.field = row.field;
+  specialSkill.reference = row.reference;
+  specialSkill.remark = row.remark;
+  dialog.value = true;
+}
+
 async function fetchData(id: string) {
   showLoader();
   await http
@@ -208,7 +218,6 @@ async function addData() {
 async function editData(idData: string) {
   await http
     .patch(config.API.profileNewAbilityByAbilityId(idData), {
-      profileId: id.value,
       isActive: true,
       remark: specialSkill.remark,
       field: specialSkill.field,
@@ -359,13 +368,7 @@ onMounted(async () => {
             clickable
             @click="
               () => {
-                dialogStatus = 'edit';
-                editId = props.row.id;
-                specialSkill.detail = props.row.detail;
-                specialSkill.field = props.row.field;
-                specialSkill.reference = props.row.reference;
-                specialSkill.remark = props.row.remark;
-                dialog = true;
+                editForm(props.row);
               }
             "
           >
@@ -417,13 +420,7 @@ onMounted(async () => {
               size="14px"
               @click="
                 () => {
-                  dialogStatus = 'edit';
-                  editId = props.row.id;
-                  specialSkill.detail = props.row.detail;
-                  specialSkill.field = props.row.field;
-                  specialSkill.reference = props.row.reference;
-                  specialSkill.remark = props.row.remark;
-                  dialog = true;
+                  editForm(props.row);
                 }
               "
             >