diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index fd490411..9e6ca98f 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -23,6 +23,7 @@ import { paymentMethodCodes } from '~/const/key-val/common'
 
 // App things
 import { genEncounter, type Encounter } from '~/models/encounter'
+import { se } from 'date-fns/locale'
 
 // Props
 const props = defineProps<{
@@ -48,7 +49,7 @@ const model = defineModel<Encounter>()
 model.value = genEncounter()
 
 // Common preparation
-const defaultCBItems = [{ label: 'Pilih', value: '' }];
+const defaultCBItems = [{ label: 'Pilih', value: '' }]
 const paymentMethodItems = CB.recStrToItem(paymentMethodCodes)
 
 // Emit preparation
@@ -95,7 +96,10 @@ const isInsurancePayment = computed(() => ['insurance', 'jkn'].includes(paymentM
 const isDateLoading = ref(false)
 const debouncedSepNumber = refDebounced(sepNumber, 500)
 const debouncedCardNumber = refDebounced(cardNumber, 500)
+const sepFileReview = ref<any>(null)
+const sippFileReview = ref<any>(null)
 const unitFullName = ref('') // Unit, specialist, subspecialist
+const formRef = ref<HTMLFormElement | null>(null) // Expose submit method for parent component
 
 if (mode === 'add') {
   // Set default sepDate to current date in YYYY-MM-DD format
@@ -106,11 +110,10 @@ if (mode === 'add') {
   registerDate.value = `${year}-${month}-${day}`
 }
 
-watch(() => props.selectedDoctor, (doctor) => {
-    unitFullName.value = doctor.subspecialist?.name ??
-      doctor.specialist?.name ??
-      doctor.unit?.name ??
-      'tidak diketahui'
+watch(
+  () => props.selectedDoctor,
+  (doctor) => {
+    unitFullName.value = doctor.subspecialist?.name ?? doctor.specialist?.name ?? doctor.unit?.name ?? 'tidak diketahui'
     model.value!.unit_code = doctor.unit_code || ''
     model.value!.specialist_code = doctor.specialist_code || ''
     model.value!.subspecialist_code = doctor.subspecialist_code || ''
@@ -126,12 +129,13 @@ watch(
       nationalIdentity.value = objects?.nationalIdentity || ''
       medicalRecordNumber.value = objects?.medicalRecordNumber || ''
       doctorCode.value = objects?.doctorCode || ''
-      // subSpecialistCode.value = objects?.subSpecialistCode || ''
       paymentMethodCode.value = objects?.paymentMethodCode || ''
       patientCategory.value = objects?.patientCategory || ''
       cardNumber.value = objects?.cardNumber || ''
       sepType.value = objects?.sepType || ''
       sepNumber.value = objects?.sepNumber || ''
+      sepFileReview.value = objects?.sepFileReview || ''
+      sippFileReview.value = objects?.sippFileReview || ''
       isDateLoading.value = true
       setTimeout(() => {
         registerDate.value = objects?.registerDate || ''
@@ -186,7 +190,7 @@ function onAddSep() {
     paymentMethodCode: paymentMethodCode.value,
     sepFile: sepFile.value,
     sippFile: sippFile.value,
-    sepType: sepType.value
+    sepType: sepType.value,
   }
   emit('event', 'add-sep', formValues)
 }
@@ -197,12 +201,21 @@ function onSearchSep() {
 
 // Submit handler
 const onSubmit = handleSubmit((values) => {
-  console.log('✅ Validated form values:', JSON.stringify(values, null, 2))
-  emit('event', 'save', values)
+  let payload: any = values
+  if (props.mode === 'edit') {
+    payload = {
+      ...payload,
+      sepFileReview: sepFileReview.value,
+      sippFileReview: sippFileReview.value,
+    }
+    return
+  }
+  emit('event', 'save', payload)
 })
 
-// Expose submit method for parent component
-const formRef = ref<HTMLFormElement | null>(null)
+function openFile(path: string) {
+  window.open(path, '_blank')
+}
 
 function submitForm() {
   // Trigger form submit using native form submit
@@ -347,7 +360,10 @@ defineExpose({
             <span class="text-red-500">*</span>
           </DE.Label>
           <DE.Field :errMessage="errors.unit_code">
-            <Input :value="unitFullName" :disabled="true"/>
+            <Input
+              :value="unitFullName"
+              :disabled="true"
+            />
           </DE.Field>
         </DE.Cell>
 
@@ -415,7 +431,7 @@ defineExpose({
                 placeholder="Pilih Kelompok Peserta"
               />
             </DE.Field>
-             <span class="text-sm text-gray-500">
+            <span class="text-sm text-gray-500">
               {{ noteReference }}
             </span>
           </DE.Cell>
@@ -434,7 +450,7 @@ defineExpose({
                 placeholder="Masukkan nomor kartu BPJS"
               />
             </DE.Field>
-             <div
+            <div
               v-if="isMemberValid"
               class="mt-1 flex items-center gap-2"
             >
@@ -559,6 +575,14 @@ defineExpose({
             <span class="mt-1 text-sm text-gray-500">
               {{ noteFile }}
             </span>
+            <a
+              v-if="sepFileReview"
+              class="text-bluered-500 mt-1 text-sm"
+              href="#"
+              @click="openFile(sepFileReview.filePath)"
+            >
+              {{ sepFileReview?.fileName }}
+            </a>
           </DE.Cell>
 
           <DE.Cell>
@@ -575,6 +599,14 @@ defineExpose({
             <span class="mt-1 text-sm text-gray-500">
               {{ noteFile }}
             </span>
+            <a
+              v-if="sippFileReview"
+              class="text-bluered-500 mt-1 text-sm"
+              href="#"
+              @click="openFile(sippFileReview.filePath)"
+            >
+              {{ sippFileReview?.fileName }}
+            </a>
           </DE.Cell>
         </DE.Block>
       </template>
diff --git a/app/handlers/encounter-entry.handler.ts b/app/handlers/encounter-entry.handler.ts
index 2a91b1b1..2efb3c9d 100644
--- a/app/handlers/encounter-entry.handler.ts
+++ b/app/handlers/encounter-entry.handler.ts
@@ -13,6 +13,9 @@ import { genDoctor, type Doctor } from '~/models/doctor'
 // Stores
 import { useUserStore } from '~/stores/user'
 
+// Handlers
+import { uploadAttachmentCustom } from '~/handlers/supporting-document.handler'
+
 // Services
 import {
   getList as getSpecialistList,
@@ -26,7 +29,6 @@ import {
 } from '~/services/encounter.service'
 import { getList as getMemberList } from '~/services/vclaim-member.service'
 import { getList as getSepList } from '~/services/vclaim-sep.service'
-import { uploadAttachment } from '~/services/supporting-document.service'
 
 // Handlers
 import {
@@ -468,6 +470,19 @@ export function useEncounterEntry(props: {
     if (formData.subSpecialistId) {
       await handleFetchDoctors(formData.subSpecialistId)
     }
+    if (encounter.encounterDocuments && Array.isArray(encounter.encounterDocuments)) {
+      let sepFileReview = {}
+      let sippFileReview = {}
+      for (const doc of encounter.encounterDocuments) {
+        if (doc.type === 'vclaim-sep') {
+          sepFileReview = { id: doc.id, fileName: doc.fileName, filePath: doc.filePath, type: doc.type_code }
+        } else if (doc.type === 'vclaim-sipp') {
+          sippFileReview = { id: doc.id, fileName: doc.fileName, filePath: doc.filePath, type: doc.type_code }
+        }
+      }
+      formData.sepFileReview = sepFileReview
+      formData.sippFileReview = sippFileReview
+    }
 
     formObjects.value = { ...formData }
   }
@@ -501,7 +516,7 @@ export function useEncounterEntry(props: {
       const visitDateValue = formValues.visitDate || formValues.registeredAt || formValues.registerDate || ''
       const memberNumber = formValues.member_number ?? formValues.cardNumber ?? formValues.memberNumber ?? null
       const refNumber = formValues.ref_number ?? formValues.sepNumber ?? formValues.refNumber ?? null
-      sepFile.value = formValues.sepFile || null 
+      sepFile.value = formValues.sepFile || null
       sippFile.value = formValues.sippFile || null
 
       let paymentMethodCode = formValues.paymentMethod_code ?? null
@@ -519,7 +534,7 @@ export function useEncounterEntry(props: {
 
       const payload: any = {
         patient_id: patientId,
-        appointment_doctor_code: formValues.doctorCode || null,
+        appointment_doctor_code: formValues.doctor_code || null,
         class_code: props.classCode || '',
         subClass_code: props.subClassCode || '',
         infra_id: formValues.infra_id ?? null,
@@ -578,13 +593,26 @@ export function useEncounterEntry(props: {
       }
 
       if (result.success) {
-        // const encounterId = isEditMode.value ? props.id : result.body?.data?.id
-        if (patientId) {
+        const encounterId = isEditMode.value ? props.id : result.body?.data?.id
+
+        if (encounterId) {
           if (sepFile.value) {
-            await uploadAttachment(sepFile.value, patientId, 'vclaim-sep')
+            await uploadAttachmentCustom({
+              id: isEditMode.value && formValues.sepFileReview ? formValues.sepFileReview.id : null,
+              file: sepFile.value,
+              refId: encounterId,
+              entityTypeCode: 'encounter',
+              type: 'vclaim-sep',
+            })
           }
           if (sippFile.value) {
-            await uploadAttachment(sippFile.value, patientId, 'vclaim-sipp')
+            await uploadAttachmentCustom({
+              id: isEditMode.value && formValues.sippFileReview ? formValues.sippFileReview.id : null,
+              file: sippFile.value,
+              refId: encounterId,
+              entityTypeCode: 'encounter',
+              type: 'vclaim-sipp',
+            })
           }
         }
 
diff --git a/app/handlers/supporting-document.handler.ts b/app/handlers/supporting-document.handler.ts
index 70b29612..87ff864a 100644
--- a/app/handlers/supporting-document.handler.ts
+++ b/app/handlers/supporting-document.handler.ts
@@ -22,3 +22,17 @@ export const {
   update,
   remove,
 })
+
+export async function uploadAttachmentCustom(payload: any) {
+  const { user } = useUserStore()
+  
+  const formData = new FormData()
+  formData.append('content', payload.file)
+  formData.append('entityType_code', payload.entityTypeCode)
+  formData.append('type_code', payload.type)
+  formData.append('ref_id', payload.refId)
+  formData.append('upload_employee_id', user.employee_id)
+
+  const response = payload.id ? await update(payload.id, formData) : await create(formData)
+  return response?.body?.data
+}