diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index bde2c4bcc..de1285812 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -535,7 +535,7 @@ async function addEditData(editStatus: boolean = false) {
   try {
     await http[method](url, reqBody).then(async (res) => {
       if ((fileUpload.value && id.value) || res.data.result) {
-        await uploadProfile(id.value);
+        await uploadProfile(editStatus ? id.value:res.data.result);
       }
     });
 
@@ -568,7 +568,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value);
+      await uploadFileURL(uploadUrl.value, fileUpload.value,id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -580,7 +580,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any) {
+async function uploadFileURL(uploadUrl: string, file: any,id:string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -589,7 +589,7 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     })
     .then(async (res) => {
       if (res.status == 200) {
-        await isUploadFn();
+        await isUploadFn(id);
       }
       fileUpload.value = null;
     })
@@ -598,9 +598,9 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     });
 }
 
-async function isUploadFn() {
+async function isUploadFn(id:string) {
   await http
-    .patch(config.API.profileNewInsignById(id.value, empType.value), {
+    .patch(config.API.profileNewInsignById(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
     })
     .then(async (res) => {})
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
index bbd549ce8..9c0eaac45 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -301,7 +301,7 @@ async function addEditData(editStatus: boolean = false) {
   try {
     await http[method](url, reqBody).then(async (res) => {
       if ((fileUpload.value && id.value) || res.data.result) {
-        await uploadProfile(id.value);
+        await uploadProfile(editStatus ? id.value:res.data.result);
       }
     });
     await fetchData();
@@ -338,7 +338,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value);
+      await uploadFileURL(uploadUrl.value, fileUpload.value,id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -350,7 +350,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any) {
+async function uploadFileURL(uploadUrl: string, file: any,id:string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -359,7 +359,7 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     })
     .then(async (res) => {
       if (res.status == 200) {
-        await isUploadFn();
+        await isUploadFn(id);
       }
       fileUpload.value = null;
     })
@@ -368,9 +368,9 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     });
 }
 
-async function isUploadFn() {
+async function isUploadFn(id:string) {
   await http
-    .patch(config.API.profileNewHonorById(id.value, empType.value), {
+    .patch(config.API.profileNewHonorById(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
       isDate: declHonorForm.isDate === "true" ? true : false,
     })
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index 4fc0bdbdd..b7a8860c9 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -228,7 +228,6 @@ function addData() {
     reference: dutyData.reference,
     refCommandNo: dutyData.refCommandNo,
     refCommandDate: dutyData.refCommandDate,
-    isUpload: !edit.value ? undefined : isUpload.value,
   };
   http
     .post(config.API.profileNewDuty(empType.value), body)
@@ -255,10 +254,11 @@ function editData(idData: string) {
     .patch(config.API.profileNewDutyByDutyId(idData, empType.value), {
       ...dutyData,
       profileId: undefined,
+      isUpload: !edit.value ? undefined : isUpload.value,
     })
     .then(async (res) => {
-      if (fileUpload.value && id.value) {
-        await uploadProfile(id.value);
+      if (fileUpload.value && idData) {
+        await uploadProfile(idData);
       }
       await fetchData(profileId.value);
       await success($q, "บันทึกข้อมูลสำเร็จ");
@@ -296,7 +296,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value);
+      await uploadFileURL(uploadUrl.value, fileUpload.value,id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -308,7 +308,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any) {
+async function uploadFileURL(uploadUrl: string, file: any,id:string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -317,7 +317,7 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     })
     .then(async (res) => {
       if (res.status == 200) {
-        await isUploadFn();
+        await isUploadFn(id);
       }
       fileUpload.value = null;
     })
@@ -326,9 +326,9 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     });
 }
 
-async function isUploadFn() {
+async function isUploadFn(id:string) {
   await http
-    .patch(config.API.profileNewDutyByDutyId(id.value, empType.value), {
+    .patch(config.API.profileNewDutyByDutyId(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
     })
     .then(async (res) => {})
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
index 0f1e10b7a..d5adc6b29 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -305,7 +305,6 @@ async function addData() {
       dateEnd: null,
       profileId: empType.value === "" ? id.value : undefined,
       profileEmployeeId: empType.value !== "" ? id.value : undefined,
-      isUpload: !isEdit.value ? undefined : isUpload.value,
     })
     .then(async (res) => {
       if (fileUpload.value && res.data.result) {
@@ -335,10 +334,11 @@ async function editData(idData: string) {
       dateStart: null,
       dateEnd: null,
       profileId: undefined,
+      isUpload: !isEdit.value ? undefined : isUpload.value,
     })
     .then(async (res) => {
-      if (fileUpload.value && id.value) {
-        await uploadProfile(id.value);
+      if (fileUpload.value && idData) {
+        await uploadProfile(idData);
       }
       await fetchData(id.value);
       await success($q, "บันทึกข้อมูลสำเร็จ");
@@ -376,7 +376,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value);
+      await uploadFileURL(uploadUrl.value, fileUpload.value, id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -388,7 +388,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any) {
+async function uploadFileURL(uploadUrl: string, file: any, id: string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -397,7 +397,7 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     })
     .then(async (res) => {
       if (res.status == 200) {
-        await isUploadFn();
+        await isUploadFn(id);
       }
       fileUpload.value = null;
     })
@@ -406,9 +406,9 @@ async function uploadFileURL(uploadUrl: string, file: any) {
     });
 }
 
-async function isUploadFn() {
+async function isUploadFn(id: string) {
   await http
-    .patch(config.API.profileNewAbilityByAbilityId(editId.value, empType.value), {
+    .patch(config.API.profileNewAbilityByAbilityId(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
     })
     .then(async (res) => {})