diff --git a/app/components/content/sep/entry.vue b/app/components/content/sep/entry.vue
index 53b00935..ba262587 100644
--- a/app/components/content/sep/entry.vue
+++ b/app/components/content/sep/entry.vue
@@ -3,6 +3,7 @@ import { ref, onMounted } from 'vue'
 import { useRoute } from 'vue-router'
 
 // Components
+import AppSepEntryForm from '~/components/app/sep/entry-form.vue'
 import AppViewHistory from '~/components/app/sep/view-history.vue'
 import { toast } from '~/components/pub/ui/toast'
 
diff --git a/app/services/vclaim-diagnose.service.ts b/app/services/vclaim-diagnose.service.ts
index ac6ef979..7993a7c2 100644
--- a/app/services/vclaim-diagnose.service.ts
+++ b/app/services/vclaim-diagnose.service.ts
@@ -21,7 +21,7 @@ export async function getValueLabelList(params: any = null): Promise<{ value: st
     const resultUnique = [...new Map(resultData.map((item: any) => [item.kode, item])).values()]
     data = resultUnique.map((item: any) => ({
       value: item.kode ? String(item.kode) : '',
-      label: item.nama,
+      label: `${item.kode} - ${item.nama}`,
     }))
   }
   return data
diff --git a/app/services/vclaim-doctor.service.ts b/app/services/vclaim-doctor.service.ts
index 28c31c06..0e72862f 100644
--- a/app/services/vclaim-doctor.service.ts
+++ b/app/services/vclaim-doctor.service.ts
@@ -16,7 +16,7 @@ export async function getValueLabelList(params: any = null): Promise<{ value: st
     const resultUnique = [...new Map(resultData.map((item: any) => [item.kode, item])).values()]
     data = resultUnique.map((item: any) => ({
       value: item.kode ? String(item.kode) : '',
-      label: item.nama,
+      label: `${item.kode} - ${item.nama}`,
     }))
   }
   return data
diff --git a/app/services/vclaim-health-facility.service.ts b/app/services/vclaim-health-facility.service.ts
index f3bc2ff3..bfd751e6 100644
--- a/app/services/vclaim-health-facility.service.ts
+++ b/app/services/vclaim-health-facility.service.ts
@@ -16,7 +16,7 @@ export async function getValueLabelList(params: any = null): Promise<{ value: st
     const resultUnique = [...new Map(resultData.map((item: any) => [item.kode, item])).values()]
     data = resultUnique.map((item: any) => ({
       value: item.kode ? String(item.kode) : '',
-      label: item.nama,
+      label: `${item.kode} - ${item.nama}`,
     }))
   }
   return data
diff --git a/app/services/vclaim-sep.service.ts b/app/services/vclaim-sep.service.ts
index 18f399cb..f6dab89c 100644
--- a/app/services/vclaim-sep.service.ts
+++ b/app/services/vclaim-sep.service.ts
@@ -20,20 +20,16 @@ export function makeSepData(
   },
 ) {
   const content = {
-    noKartu: '0002084879801', // data.bpjsNumber || '',
+    noKartu: data.bpjsNumber || '',
     tglSep: data.sepDate,
-    ppkPelayanan: '1323R001', // data.serviceType || '',
+    ppkPelayanan: data.fromClinic || '',
     jnsPelayanan: data.admissionType ? String(data.admissionType) : '1',
     noMR: data.medicalRecordNumber || '',
     catatan: data.note || '',
     diagAwal: data.initialDiagnosis || '',
-    // poli: {
-    //   tujuan: data.destinationClinic || '',
-    //   eksekutif: data.clinicExcecutive === 'yes' ? '1' : '0',
-    // },
     poli: {
-      tujuan: 'URO',
-      eksekutif: '0',
+      tujuan: data.destinationClinic || '',
+      eksekutif: data.clinicExcecutive === 'yes' ? '1' : '0',
     },
     cob: {
       cob: data.cob === 'yes' ? '1' : '0',
@@ -46,20 +42,14 @@ export function makeSepData(
     kdPenunjang: data.supportCode || '',
     assesmentPel: data.serviceAssessment || '',
     skdp: {
-      noSurat: '', // data.admissionType === '3' ? data.referralLetterNumber : '',
-      kodeDPJP: '', // data.admissionType === '3' ? data.attendingDoctor : '',
+      noSurat: ['3'].includes(data.admissionType) ? data.referralLetterNumber : '',
+      kodeDPJP: ['3'].includes(data.admissionType)? data.attendingDoctor : '',
     },
-    // rujukan: {
-    //   asalRujukan: data?.referralFrom || '',
-    //   tglRujukan: '', // data?.referralLetterDate || '',
-    //   noRujukan: '', // data?.referralLetterNumber || '',
-    //   ppkRujukan: data?.referralTo || '',
-    // },
     rujukan: {
-      noRujukan: '0212R0300625B000006',
-      ppkRujukan: '0212R030',
-      tglRujukan: '2025-06-26',
-      asalRujukan: '2',
+      asalRujukan: ['2'].includes(data.admissionType) ? data?.referralFrom || '' : '',
+      tglRujukan: ['2'].includes(data.admissionType) ? data?.referralLetterDate || '' : '',
+      noRujukan: ['2'].includes(data.admissionType) ? data?.referralLetterNumber || '' : '',
+      ppkRujukan: ['2'].includes(data.admissionType) ? data?.referralTo || '' : '',
     },
     klsRawat: {
       klsRawatHak: data.classLevel || '',
@@ -67,7 +57,7 @@ export function makeSepData(
       pembiayaan: data.classPaySource || '',
       penanggungJawab: data.responsiblePerson || '',
     },
-    dpjpLayan: '28080', // data.attendingDoctor || '',
+    dpjpLayan: data.attendingDoctor || '',
     noTelp: data.phoneNumber || '',
     user: data.patientName || '',
     jaminan: {