diff --git a/app/components/app/encounter/dropdown-action.vue b/app/components/app/encounter/dropdown-action.vue
index 0cd85204..0815e6a7 100644
--- a/app/components/app/encounter/dropdown-action.vue
+++ b/app/components/app/encounter/dropdown-action.vue
@@ -13,32 +13,39 @@ const activeServicePosition = inject<Ref<string>>('activeServicePosition')! // p
 
 const activeKey = ref<string | null>(null)
 const linkItemsFiltered = ref<LinkItem[]>([])
+
 const baseLinkItems: LinkItem[] = [
   {
     label: 'Detail',
     value: 'detail',
+    groups: ['medical', 'registration'],
     onClick: () => {
       proceedItem(ActionEvents.showDetail)
     },
     icon: 'i-lucide-eye',
   },
-]
-
-const medicalLinkItems: LinkItem[] = [
+  {
+    label: 'Edit',
+    value: 'edit',
+    groups: ['registration'],
+    onClick: () => {
+      proceedItem(ActionEvents.showEdit)
+    },
+    icon: 'i-lucide-pencil',
+  },
   {
     label: 'Process',
     value: 'process',
+    groups: ['medical'],
     onClick: () => {
       proceedItem(ActionEvents.showProcess)
     },
     icon: 'i-lucide-shuffle',
   },
-]
-
-const regLinkItems: LinkItem[] = [
   {
     label: 'Print',
     value: 'print',
+    groups: ['registration'],
     onClick: () => {
       proceedItem(ActionEvents.showPrint)
     },
@@ -47,6 +54,7 @@ const regLinkItems: LinkItem[] = [
   {
     label: 'Batalkan',
     value: 'cancel',
+    groups: ['registration'],
     onClick: () => {
       proceedItem(ActionEvents.showCancel)
     },
@@ -55,6 +63,7 @@ const regLinkItems: LinkItem[] = [
   {
     label: 'Hapus',
     value: 'remove',
+    groups: ['registration'],
     onClick: () => {
       proceedItem(ActionEvents.showConfirmDelete)
     },
@@ -62,7 +71,7 @@ const regLinkItems: LinkItem[] = [
   },
 ]
 
-const voidLinkItems: LinkItem[] = [
+const noneLinkItems: LinkItem[] = [
    {
     label: 'Nothing',
     value: 'nothing',
@@ -72,12 +81,6 @@ const voidLinkItems: LinkItem[] = [
 
 linkItemsFiltered.value = [...baseLinkItems]
 
-getLinks()
-
-watch(activeServicePosition, () => {
-  getLinks()
-})
-
 function proceedItem(action: string) {
   recId.value = props.rec.id || 0
   recItem.value = props.rec
@@ -87,18 +90,24 @@ function proceedItem(action: string) {
 function getLinks() {
   switch (activeServicePosition.value) {
     case 'medical':
-      linkItemsFiltered.value = [...baseLinkItems, ...medicalLinkItems]
+      linkItemsFiltered.value = baseLinkItems.filter((item) => item.groups?.includes('medical'))
       break
     case 'registration':
-      linkItemsFiltered.value = [...baseLinkItems, ...regLinkItems]
-    case 'unit|resp':
-      linkItemsFiltered.value = [...baseLinkItems]
+      linkItemsFiltered.value = baseLinkItems.filter((item) => item.groups?.includes('registration'))
       break
     default:
-      linkItemsFiltered.value = voidLinkItems
+      linkItemsFiltered.value = noneLinkItems
       break
   }
 }
+
+watch(activeServicePosition, () => {
+  getLinks()
+})
+
+onMounted(() => {
+  getLinks()
+})
 </script>
 
 <template>
diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 66d2e4e3..34497de7 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -26,19 +26,21 @@ import { genEncounter, type Encounter } from '~/models/encounter'
 
 // Props
 const props = defineProps<{
+  mode?: string
   isLoading?: boolean
   isReadonly?: boolean
   isSepValid?: boolean
+  isMemberValid?: boolean
   isCheckingSep?: boolean
   doctorItems?: CB.Item[]
   selectedDoctor: Doctor
   // subSpecialist?: any[]
   // specialists?: TreeItem[]
-  // paymentMethods: PaymentMethodCode[]
+  payments?: any[]
   participantGroups?: any[]
   seps: any[]
   patient?: PatientEntity | null | undefined
-  // objects?: any
+  objects?: any
 }>()
 
 // Model
@@ -73,17 +75,37 @@ const [sepNumber, sepNumberAttrs] = defineField('sepNumber')
 const [patientName, patientNameAttrs] = defineField('patientName')
 const [nationalIdentity, nationalIdentityAttrs] = defineField('nationalIdentity')
 const [medicalRecordNumber, medicalRecordNumberAttrs] = defineField('medicalRecordNumber')
+const [sepFile, sepFileAttrs] = defineField('sepFile')
+const [sippFile, sippFileAttrs] = defineField('sippFile')
 const patientId = ref('')
+const sepReference = ref('')
+const sepControlDate = ref('')
+const sepTrafficStatus = ref('')
+const diagnosis = ref('')
+const noteReference = ref('Hanya diperlukan jika pembayaran jenis JKN')
+const noteFile = ref('Gunakan file [.pdf, .jpg, .png] dengan ukuran maksimal 1MB')
 
 const isLoading = props.isLoading !== undefined ? props.isLoading : false
 const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
-
+const mode = props.mode !== undefined ? props.mode : 'add'
 // SEP validation state from props
 const isSepValid = computed(() => props.isSepValid || false)
 const isCheckingSep = computed(() => props.isCheckingSep || false)
+const isInsurancePayment = computed(() => ['insurance', 'jkn'].includes(paymentMethodCode.value))
+const isDateLoading = ref(false)
+const debouncedSepNumber = refDebounced(sepNumber, 500)
+const debouncedCardNumber = refDebounced(cardNumber, 500)
+const unitFullName = ref('') // Unit, specialist, subspecialist
+
+if (mode === 'add') {
+  // Set default sepDate to current date in YYYY-MM-DD format
+  const today = new Date()
+  const year = today.getFullYear()
+  const month = String(today.getMonth() + 1).padStart(2, '0')
+  const day = String(today.getDate()).padStart(2, '0')
+  registerDate.value = `${year}-${month}-${day}`
+}
 
-// Unit, specialist, subspecialist
-const unitFullName = ref('')
 watch(() => props.selectedDoctor, (doctor) => {
     unitFullName.value = doctor.subspecialist?.name ??
       doctor.specialist?.name ??
@@ -94,65 +116,31 @@ watch(() => props.selectedDoctor, (doctor) => {
     model.value!.subspecialist_code = doctor.subspecialist_code || ''
   },
 )
-// const doctorOpts = computed(() => {
-//   const defaultOption = [{ label: 'Pilih', value: '' }]
-//   const doctors = props.doctors || []
-//   return [...defaultOption, ...doctors]
-// })
-// watch(doctorCode, (newValue) => {
-//   // doctor.value = props.doctors?.find(doc => doc.code === newValue)
-//   unitFullName.value = doctor.value?.subspecialist?.name ??
-//     doctor.value?.specialist?.name ??
-//     doctor.value?.unit?.name ??
-//     'tidak diketahui'
-//   model.value!.responsible_doctor_code = doctor.value?.code
-//   // const unitName = selectedDoctor?.specialist?.name || ''
-//   // emit('event', 'unit-changed', unitName)
-// })
-
-const isJKNPayment = computed(() => paymentMethodCode.value === 'jkn')
-
-// async function onFetchChildren(parentId: string): Promise<void> {
-//   console.log('onFetchChildren', parentId)
-// }
-
-// Watch specialist/subspecialist selection to fetch doctors
-// watch(subSpecialistCode, async (newValue) => {
-//   if (newValue) {
-//     console.log('SubSpecialist changed:', newValue)
-//     // Reset doctor selection
-//     doctorCode.value = ''
-//     // Emit fetch event to parent
-//     emit('fetch', { subSpecialistCode: newValue })
-//   }
-// })
-
-// Debounced SEP number watcher: emit change only after user stops typing
-const debouncedSepNumber = refDebounced(sepNumber, 500)
-watch(debouncedSepNumber, (newValue) => {
-  emit('event', 'sep-number-changed', newValue)
-})
 
 // Sync props to form fields
-// watch(
-//   () => props.objects,
-//   (objects) => {
-//     if (objects && Object.keys(objects).length > 0) {
-//       patientName.value = objects?.patientName || ''
-//       nationalIdentity.value = objects?.nationalIdentity || ''
-//       medicalRecordNumber.value = objects?.medicalRecordNumber || ''
-//       doctorCode.value = objects?.doctorCode || ''
-//       subSpecialistCode.value = objects?.subSpecialistCode || ''
-//       registerDate.value = objects?.registerDate || ''
-//       paymentMethodCode.value = objects?.paymentMethodCode || ''
-//       patientCategory.value = objects?.patientCategory || ''
-//       cardNumber.value = objects?.cardNumber || ''
-//       sepType.value = objects?.sepType || ''
-//       sepNumber.value = objects?.sepNumber || ''
-//     }
-//   },
-//   { deep: true, immediate: true },
-// )
+watch(
+  () => props.objects,
+  (objects) => {
+    if (objects && Object.keys(objects).length > 0) {
+      patientName.value = objects?.patientName || ''
+      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 || ''
+      isDateLoading.value = true
+      setTimeout(() => {
+        registerDate.value = objects?.registerDate || ''
+        isDateLoading.value = false
+      }, 100)
+    }
+  },
+  { deep: true, immediate: true },
+)
 
 watch(
   () => props.patient,
@@ -167,6 +155,28 @@ watch(
   { deep: true, immediate: true },
 )
 
+watch(
+  () => props.isSepValid,
+  (value) => {
+    if (!value) return
+    const objects = props.objects
+    if (objects && Object.keys(objects).length > 0) {
+      sepReference.value = objects?.sepReference || ''
+      sepControlDate.value = objects?.sepControlDate || ''
+      sepTrafficStatus.value = objects?.sepTrafficStatus || ''
+      diagnosis.value = objects?.diagnosis || ''
+    }
+  },
+)
+
+watch(debouncedSepNumber, (newValue) => {
+  emit('event', 'sep-number-changed', newValue)
+})
+
+watch(debouncedCardNumber, (newValue) => {
+  emit('event', 'member-changed', newValue)
+})
+
 function onAddSep() {
   const formValues = {
     patientId: patientId.value || '',
@@ -180,6 +190,10 @@ function onAddSep() {
   emit('event', 'add-sep', formValues)
 }
 
+function onSearchSep() {
+  emit('event', 'search-sep', { cardNumber: cardNumber.value })
+}
+
 // Submit handler
 const onSubmit = handleSubmit((values) => {
   console.log('✅ Validated form values:', JSON.stringify(values, null, 2))
@@ -190,23 +204,11 @@ const onSubmit = handleSubmit((values) => {
 const formRef = ref<HTMLFormElement | null>(null)
 
 function submitForm() {
-  console.log('🔵 submitForm called, formRef:', formRef.value)
-  console.log('🔵 Form values:', {
-    doctorCode: doctorCode.value,
-    // subSpecialistCode: subSpecialistCode.value,
-    registerDate: registerDate.value,
-    paymentMethodCode: paymentMethodCode.value,
-  })
-  console.log('🔵 Form errors:', errors.value)
-  console.log('🔵 Form meta:', meta.value)
-
   // Trigger form submit using native form submit
   // This will trigger validation and onSubmit handler
   if (formRef.value) {
-    console.log('🔵 Calling formRef.value.requestSubmit()')
     formRef.value.requestSubmit()
   } else {
-    console.warn('⚠️ formRef.value is null, cannot submit form')
     // Fallback: directly call onSubmit handler
     // Create a mock event object
     const mockEvent = {
@@ -215,7 +217,6 @@ function submitForm() {
     } as SubmitEvent
 
     // Call onSubmit directly
-    console.log('🔵 Calling onSubmit with mock event')
     onSubmit(mockEvent)
   }
 }
@@ -345,14 +346,23 @@ defineExpose({
             <span class="text-red-500">*</span>
           </DE.Label>
           <DE.Field :errMessage="errors.unit_code">
-            <Input :value="unitFullName"/>
-            <!-- <TreeSelect
-              id="subSpecialistCode"
-              v-model="subSpecialistCode"
-              v-bind="subSpecialistCodeAttrs"
-              :data="specialists || []"
-              :on-fetch-children="onFetchChildren"
-            /> -->
+            <Input :value="unitFullName" :disabled="true"/>
+          </DE.Field>
+        </DE.Cell>
+
+        <DE.Cell>
+          <DE.Label height="compact">
+            Tanggal Daftar
+            <span class="text-red-500">*</span>
+          </DE.Label>
+          <DE.Field :errMessage="errors.registerDate">
+            <DatepickerSingle
+              v-if="!isDateLoading"
+              id="registerDate"
+              v-model="registerDate"
+              v-bind="registerDateAttrs"
+              placeholder="Pilih tanggal"
+            />
           </DE.Field>
         </DE.Cell>
       </DE.Block>
@@ -363,21 +373,6 @@ defineExpose({
         :colCount="3"
         :cellFlex="false"
       >
-        <DE.Cell>
-          <DE.Label height="compact">
-            Tanggal Daftar
-            <span class="text-red-500">*</span>
-          </DE.Label>
-          <DE.Field :errMessage="errors.registerDate">
-            <DatepickerSingle
-              id="registerDate"
-              v-model="registerDate"
-              v-bind="registerDateAttrs"
-              placeholder="Pilih tanggal"
-            />
-          </DE.Field>
-        </DE.Cell>
-
         <DE.Cell>
           <DE.Label height="compact">
             Jenis Pembayaran
@@ -397,7 +392,7 @@ defineExpose({
       </DE.Block>
 
       <!-- BPJS Fields (conditional) -->
-      <template v-if="isJKNPayment">
+      <template v-if="isInsurancePayment">
         <DE.Block
           labelSize="thin"
           class="!pt-0"
@@ -419,6 +414,9 @@ defineExpose({
                 placeholder="Pilih Kelompok Peserta"
               />
             </DE.Field>
+             <span class="text-sm text-gray-500">
+              {{ noteReference }}
+            </span>
           </DE.Cell>
 
           <DE.Cell>
@@ -435,6 +433,26 @@ defineExpose({
                 placeholder="Masukkan nomor kartu BPJS"
               />
             </DE.Field>
+             <div
+              v-if="isMemberValid"
+              class="mt-1 flex items-center gap-2"
+            >
+              <Icon
+                name="i-lucide-badge-check"
+                class="h-4 w-4 bg-green-500 text-white"
+              />
+              <span class="text-sm text-green-500">Aktif</span>
+            </div>
+            <div
+              v-if="!isMemberValid"
+              class="mt-1 flex items-center gap-2"
+            >
+              <Icon
+                name="i-lucide-x"
+                class="h-4 w-4 bg-red-500 text-white"
+              />
+              <span class="text-sm text-red-500">Tidak aktif</span>
+            </div>
           </DE.Cell>
 
           <DE.Cell>
@@ -474,7 +492,7 @@ defineExpose({
                   v-bind="sepNumberAttrs"
                   placeholder="Tambah SEP terlebih dahulu"
                   class="flex-1"
-                  :disabled="isLoading || isReadonly"
+                  :disabled="isLoading || isReadonly || isSepValid"
                 />
                 <Button
                   v-if="!isSepValid"
@@ -490,44 +508,152 @@ defineExpose({
                     name="i-lucide-loader-2"
                     class="h-4 w-4 animate-spin"
                   />
-                   <Icon
+                  <Icon
                     v-else
                     name="i-lucide-plus"
                     class="h-4 w-4"
                   />
                 </Button>
                 <Button
-                  v-else
+                  v-if="isMemberValid"
                   variant="outline"
                   type="button"
-                  class="bg-green-500 text-white hover:bg-green-600"
+                  class="bg-primary"
                   size="sm"
-                  disabled
+                  @click="onSearchSep"
                 >
                   <Icon
-                    name="i-lucide-check"
+                    name="i-lucide-search"
                     class="h-4 w-4"
                   />
                 </Button>
               </div>
             </DE.Field>
+            <div
+              v-if="isSepValid"
+              class="mt-1 flex items-center gap-2"
+            >
+              <Icon
+                name="i-lucide-badge-check"
+                class="h-4 w-4 bg-green-500 text-white"
+              />
+              <span class="text-sm text-green-500">Aktif</span>
+            </div>
+            <span class="text-sm text-gray-500">
+              {{ noteReference }}
+            </span>
           </DE.Cell>
 
-          <FileUpload
-            field-name="sepFile"
-            label="Dokumen SEP"
-            placeholder="Unggah dokumen SEP"
-            :accept="['pdf', 'jpg', 'png']"
-            :max-size-mb="1"
-          />
+          <DE.Cell>
+            <FileUpload
+              field-name="sepFile"
+              label="Dokumen SEP"
+              placeholder="Pilih file"
+              :accept="['pdf', 'jpg', 'png']"
+              :max-size-mb="1"
+              v-model="sepFile"
+              v-bind="sepFileAttrs"
+              @file-selected="(file: any) => { console.log(file) }"
+            />
+            <span class="mt-1 text-sm text-gray-500">
+              {{ noteFile }}
+            </span>
+          </DE.Cell>
 
-          <FileUpload
-            field-name="sippFile"
-            label="Dokumen SIPP"
-            placeholder="Unggah dokumen SIPP"
-            :accept="['pdf', 'jpg', 'png']"
-            :max-size-mb="1"
-          />
+          <DE.Cell>
+            <FileUpload
+              field-name="sippFile"
+              label="Dokumen SIPP"
+              placeholder="Pilih file"
+              :accept="['pdf', 'jpg', 'png']"
+              :max-size-mb="1"
+              v-model="sippFile"
+              v-bind="sippFileAttrs"
+              @file-selected="(file: any) => { console.log(file) }"
+            />
+            <span class="mt-1 text-sm text-gray-500">
+              {{ noteFile }}
+            </span>
+          </DE.Cell>
+        </DE.Block>
+      </template>
+
+      <template v-if="isSepValid">
+        <hr />
+        <!-- Data SEP -->
+        <h3 class="text-lg font-semibold">Data SEP</h3>
+
+        <DE.Block
+          labelSize="thin"
+          class="!pt-0"
+          :colCount="3"
+          :cellFlex="false"
+        >
+          <DE.Cell>
+            <Label height="compact">Dengan Rujukan / Surat Kontrol</Label>
+            <Field>
+              <Input
+                id="sepReference"
+                v-model="sepReference"
+                :disabled="true"
+              />
+            </Field>
+          </DE.Cell>
+
+          <DE.Cell>
+            <Label height="compact">No. Rujukan / Surat Kontrol</Label>
+            <DE.Field>
+              <Input
+                id="sepReference"
+                v-model="sepNumber"
+                :disabled="true"
+              />
+            </DE.Field>
+          </DE.Cell>
+
+          <DE.Cell>
+            <Label height="compact">
+              Tanggal Rujukan / Surat Kontrol
+              <span class="ml-1 text-red-500">*</span>
+            </Label>
+            <DE.Field>
+              <DatepickerSingle
+                id="sepControlDate"
+                v-model="sepControlDate"
+                :disabled="true"
+                placeholder="Pilih tanggal sep"
+              />
+            </DE.Field>
+          </DE.Cell>
+        </DE.Block>
+
+        <DE.Block
+          labelSize="thin"
+          class="!pt-0"
+          :colCount="3"
+          :cellFlex="false"
+        >
+          <DE.Cell :col-span="2">
+            <Label height="compact">Diagnosis</Label>
+            <Field>
+              <Input
+                id="diagnosis"
+                v-model="diagnosis"
+                :disabled="true"
+              />
+            </Field>
+          </DE.Cell>
+
+          <DE.Cell>
+            <Label height="compact">Status Kecelakaan</Label>
+            <DE.Field>
+              <Input
+                id="sepTrafficStatus"
+                v-model="sepTrafficStatus"
+                :disabled="true"
+              />
+            </DE.Field>
+          </DE.Cell>
         </DE.Block>
       </template>
     </form>
diff --git a/app/components/app/encounter/filter-nav.vue b/app/components/app/encounter/filter-nav.vue
index 2a16d723..947148aa 100644
--- a/app/components/app/encounter/filter-nav.vue
+++ b/app/components/app/encounter/filter-nav.vue
@@ -8,6 +8,7 @@ import { cn } from '~/lib/utils'
 import type { RefExportNav, RefSearchNav } from '~/components/pub/my-ui/data/types'
 
 const props = defineProps<{
+  activePositon?: string
   refSearchNav?: RefSearchNav
   enableExport?: boolean
   refExportNav?: RefExportNav
@@ -30,6 +31,8 @@ const props = defineProps<{
 // }
 
 const searchQuery = ref('')
+const isRoleRegistration = props.activePositon === 'registration'
+const isRoleMedical = props.activePositon === 'medical'
 const dateRange = ref<{ from: Date | null; to: Date | null }>({
   from: new Date(),
   to: new Date(),
@@ -70,7 +73,7 @@ const value = ref({
     <PopoverTrigger as-child>
       <Button
         variant="outline"
-        :class="cn('w-[200px] justify-start text-left font-normal', !value && 'text-muted-foreground')"
+        :class="cn('min-w-[240px] max-w-[320px] justify-start text-left font-normal', !value && 'text-muted-foreground')"
       >
         <CalendarIcon class="mr-2 h-4 w-4" />
         <template v-if="value.start">
@@ -101,7 +104,7 @@ const value = ref({
     Filter
   </Button>
 
-  <DropdownMenu v-show="props.enableExport">
+  <DropdownMenu v-show="props.enableExport && (isRoleRegistration || isRoleMedical)">
     <DropdownMenuTrigger as-child>
       <Button variant="outline" class="ml-auto border-orange-500 text-orange-600 hover:bg-orange-50">
         <Icon name="i-lucide-download" class="h-4 w-4" />
diff --git a/app/components/app/initial-nursing/entry-form.vue b/app/components/app/initial-nursing/entry-form.vue
new file mode 100644
index 00000000..acca54fb
--- /dev/null
+++ b/app/components/app/initial-nursing/entry-form.vue
@@ -0,0 +1,524 @@
+<script setup lang="ts">
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
+
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+import { genBase } from '~/models/_base'
+
+interface Masalah {
+  id: number
+  date: string
+  diagnosa: string
+  finishDate: string
+  staff: string
+}
+
+const props = defineProps<{
+  modelValue: any
+  schema: z.ZodSchema<any>
+  excludeFields?: string[]
+  isReadonly?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', val: any): void
+  (e: 'submit', val: any): void
+}>()
+
+// Setup form
+const {
+  validate: _validate,
+  defineField,
+  handleSubmit,
+  errors,
+  values,
+} = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: props.modelValue,
+})
+
+watch(values, (val) => emit('update:modelValue', val), { deep: true })
+
+// Subjective
+const [primaryComplaint, primaryComplaintAttrs] = defineField('pri-complain')
+const [medType, medTypeAttrs] = defineField('med-type')
+const [medName, medNameAttrs] = defineField('med-name')
+const [medReaction, medReactionAttrs] = defineField('med-reaction')
+const [foodType, foodTypeAttrs] = defineField('food-type')
+const [foodName, foodNameAttrs] = defineField('food-name')
+const [foodReaction, foodReactionAttrs] = defineField('food-reaction')
+const [otherType, otherTypeAttrs] = defineField('other-type')
+const [otherName, otherNameAttrs] = defineField('other-name')
+const [otherReaction, otherReactionAttrs] = defineField('other-reaction')
+const [painAsst, painAsstAttrs] = defineField('pain-asst')
+const [painScale, painScaleAttrs] = defineField('pain-scale')
+const [painTime, painTimeAttrs] = defineField('pain-time')
+const [painDuration, painDurationAttrs] = defineField('pain-duration')
+const [painFreq, painFreqAttrs] = defineField('pain-freq')
+const [painLoc, painLocAttrs] = defineField('pain-loc')
+const [nutScreening, nutScreeningAttrs] = defineField('nut-screening')
+const [spiritualAsst, spiritualAsstAttrs] = defineField('spiritual-asst')
+
+// Objective
+const [generalCondition, generalConditionAttrs] = defineField('general-condition')
+const [supportExam, supportExamAttrs] = defineField('support-exam')
+const [riskFall, riskFallAttrs] = defineField('risk-fall')
+const [bracelet, braceletAttrs] = defineField('bracelet')
+const [braceletAlg, braceletAlgAttrs] = defineField('bracelet-alg')
+
+const validate = async () => {
+  const result = await _validate()
+  console.log('Component validate() result:', result)
+
+  return {
+    valid: true,
+    data: result.values,
+    errors: result.errors,
+  }
+}
+
+const form = ref<Masalah>({
+  id: 0,
+  date: '',
+  diagnosa: '',
+  finishDate: '',
+  staff: '',
+})
+
+const list = ref<Masalah[]>([])
+const isEditing = ref(false)
+const showForm = ref(false)
+
+const resetForm = () => {
+  form.value = {
+    id: 0,
+    date: '',
+    diagnosa: '',
+    finishDate: '',
+    staff: '',
+  }
+  isEditing.value = false
+}
+
+const openAdd = () => {
+  resetForm()
+  showForm.value = true
+}
+
+const submitForm = () => {
+  if (isEditing.value) {
+    const index = list.value.findIndex((v) => v.id === form.value.id)
+    if (index !== -1) list.value[index] = { ...form.value }
+  } else {
+    list.value.push({
+      ...form.value,
+      id: Date.now(),
+    })
+    emit('click', { type: 'add-problem', data: list.value })
+  }
+
+  showForm.value = false
+  resetForm()
+}
+
+const editItem = (item: Masalah) => {
+  form.value = { ...item }
+  isEditing.value = true
+  showForm.value = true
+}
+
+const deleteItem = (id: number) => {
+  list.value = list.value.filter((v) => v.id !== id)
+}
+
+defineExpose({ validate })
+const icdPreview = inject('icdPreview')
+
+const isExcluded = (key: string) => props.excludeFields?.includes(key)
+</script>
+
+<template>
+  <form id="entry-form">
+    <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+      <div>
+        <h1 class="font-semibold">A. Data Subyektif</h1>
+      </div>
+
+      <div class="my-2">
+        <Block>
+          <Cell>
+            <Label dynamic>Keluhan Pasien</Label>
+            <Field :errMessage="errors['pri-complain']">
+              <Textarea
+                v-model="primaryComplaint"
+                v-bind="primaryComplaintAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+      </div>
+      <div class="my-2 rounded-md border border-slate-300 p-4">
+        <span class="mb-4 text-sm font-semibold">Riwayat Alergi dan Reaksi Alergi</span>
+        <Block
+          :colCount="3"
+          class="mt-2"
+        >
+          <Cell>
+            <Label dynamic>a. Obat</Label>
+            <Field>
+              <Input
+                v-model="medType"
+                v-bind="medTypeAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Sebutkan</Label>
+            <Field>
+              <Input
+                v-model="medName"
+                v-bind="medNameAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Reaksi</Label>
+            <Field>
+              <Input
+                v-model="medReaction"
+                v-bind="medReactionAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block
+          :colCount="3"
+          class="mt-2"
+        >
+          <Cell>
+            <Label dynamic>b. Makanan</Label>
+            <Field>
+              <Input
+                v-model="foodType"
+                v-bind="foodTypeAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Sebutkan</Label>
+            <Field>
+              <Input
+                v-model="foodName"
+                v-bind="foodNameAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Reaksi</Label>
+            <Field>
+              <Input
+                v-model="foodReaction"
+                v-bind="foodReactionAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block
+          :colCount="3"
+          class="mt-2"
+        >
+          <Cell>
+            <Label dynamic>c. Lain-Lain</Label>
+            <Field>
+              <Input
+                v-model="otherType"
+                v-bind="otherTypeAttrs"
+              />
+            </Field>
+          </Cell>
+          <Cell>
+            <Label dynamic>Sebutkan</Label>
+            <Field>
+              <Input
+                v-model="otherName"
+                v-bind="otherNameAttrs"
+              />
+            </Field>
+          </Cell>
+          <Cell>
+            <Label dynamic>Reaksi</Label>
+            <Field>
+              <Input
+                v-model="otherReaction"
+                v-bind="otherReactionAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+      </div>
+      <div class="my-4">
+        <Block :colCount="3">
+          <Cell>
+            <Label dynamic>Kajian Nyeri</Label>
+            <Field>
+              <Input
+                v-model="painAsst"
+                v-bind="painAsstAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Skala Nyeri</Label>
+            <Field>
+              <Input
+                v-model="painScale"
+                v-bind="painScaleAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Waktu Nyeri</Label>
+            <Field>
+              <Input
+                v-model="paintTime"
+                v-bind="painTimeAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block :colCount="3">
+          <Cell>
+            <Label dynamic>Durasi Nyeri</Label>
+            <Field>
+              <Input
+                v-model="painDuration"
+                v-bind="painDurationAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Frequensi Nyeri</Label>
+            <Field>
+              <Input
+                v-model="painFreq"
+                v-bind="painFreqAttrs"
+              />
+            </Field>
+          </Cell>
+          <Cell>
+            <Label dynamic>Lokasi</Label>
+            <Field>
+              <Input
+                v-model="painLoc"
+                v-bind="painLocAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block :colCount="2">
+          <Cell>
+            <Label dynamic>Skrining Nutrisi</Label>
+            <Field>
+              <Textarea
+                v-model="nutScreening"
+                v-bind="nutScreeningAttrs"
+              />
+            </Field>
+          </Cell>
+          <Cell>
+            <Label dynamic>Kajian Spiritual</Label>
+            <Field>
+              <Textarea
+                v-model="spiritualAsst"
+                v-bind="spiritualAsstAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+      </div>
+
+      <Separator class="mt-8" />
+
+      <div class="my-2">
+        <h1 class="font-semibold">B. Data Obyektif</h1>
+      </div>
+
+      <div class="my-2">
+        <Block :colCount="2">
+          <Cell>
+            <Label dynamic>Keadaan Umum</Label>
+            <Field>
+              <Textarea
+                v-model="generalCondition"
+                v-bind="generalConditionAttrs"
+              />
+            </Field>
+          </Cell>
+          <Cell>
+            <Label dynamic>Pemeriksaan Penunjang</Label>
+            <Field>
+              <Input
+                v-model="supportExam"
+                v-bind="supportExamAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block :colCount="3">
+          <Cell>
+            <Label dynamic>Risiko Jatuh</Label>
+            <Field>
+              <Input
+                v-model="riskFall"
+                v-bind="riskFallAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Pemakaian Gelang</Label>
+            <Field>
+              <Input
+                v-model="bracelet"
+                v-bind="braceletAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Pasang Gelang Alergi</Label>
+            <Field>
+              <Input
+                v-model="braceletAlg"
+                v-bind="braceletAlgAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+      </div>
+
+      <Separator class="mt-8" />
+
+      <div class="my-2">
+        <h1 class="my-3 font-semibold">C. Daftar Masalah Keperawatan</h1>
+
+        <Button
+          class="rounded bg-orange-100 px-3 py-1 text-orange-600"
+          type="button"
+          @click="showForm = true"
+        >
+          + Tambah
+        </Button>
+      </div>
+
+      <div
+        v-if="showForm"
+        class="mb-4 space-y-3 rounded border bg-gray-50 p-4 shadow-sm"
+      >
+        <div>
+          <Label>Tanggal Muncul</Label>
+          <Input
+            v-model="form.date"
+            type="date"
+          />
+        </div>
+
+        <div>
+          <Label class="font-medium">Diagnosa Keperawatan</Label>
+          <Input v-model="form.diagnosa" />
+        </div>
+
+        <div>
+          <Label class="font-medium">Tanggal Teratasi</Label>
+          <Input
+            v-model="form.finishDate"
+            type="date"
+          />
+        </div>
+
+        <div>
+          <Label class="font-medium">Nama Petugas</Label>
+          <Input v-model="form.staff" />
+        </div>
+
+        <div class="mt-2 flex gap-2">
+          <Button
+            @click="submitForm"
+            type="button"
+          >
+            {{ isEditing ? 'Update' : 'Tambah' }}
+          </Button>
+
+          <Button
+            @click="showForm = false"
+            type="button"
+            class="rounded bg-gray-300 px-3 py-1"
+          >
+            Batal
+          </Button>
+        </div>
+      </div>
+
+      <div class="mb-8">
+        <table class="w-full border text-sm">
+          <thead class="bg-gray-100">
+            <tr>
+              <th class="border p-2">Tanggal Muncul</th>
+              <th class="border p-2">Diagnosa</th>
+              <th class="border p-2">Tanggal Teratasi</th>
+              <th class="border p-2">Petugas</th>
+              <th class="w-28 border p-2">Aksi</th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr
+              v-for="item in list"
+              :key="item.id"
+              class="border"
+            >
+              <td class="border p-2">{{ item.date }}</td>
+              <td class="border p-2">{{ item.diagnosa }}</td>
+              <td class="border p-2">{{ item.finishDate }}</td>
+              <td class="border p-2">{{ item.staff }}</td>
+              <td class="flex justify-center gap-4 border p-2">
+                <Icon
+                  @click="editItem(item)"
+                  name="i-lucide-pencil"
+                  class="h-4 w-4 cursor-pointer"
+                />
+
+                <Icon
+                  @click="deleteItem(item.id)"
+                  name="i-lucide-trash"
+                  class="h-4 w-4 cursor-pointer"
+                />
+              </td>
+            </tr>
+
+            <tr v-if="list.length === 0">
+              <td
+                colspan="5"
+                class="p-4 text-center text-gray-500"
+              >
+                Belum ada data
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </form>
+</template>
diff --git a/app/components/app/initial-nursing/list-cfg.ts b/app/components/app/initial-nursing/list-cfg.ts
new file mode 100644
index 00000000..4461a35b
--- /dev/null
+++ b/app/components/app/initial-nursing/list-cfg.ts
@@ -0,0 +1,73 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+type SmallDetailDto = any
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-ud.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 100 }, { width: 120 }, {}, {}, {}, { width: 100 }, { width: 50 }],
+
+  headers: [
+    [{ label: 'Tanggal' }, { label: 'Diagnosa' }, { label: 'Tanggal Selesai' }, { label: 'Staff' }, { label: 'Aksi' }],
+  ],
+
+  keys: ['date', 'diagnosa', 'finishDate', 'staff', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    time(rec: any) {
+      return rec.time ? new Date(rec.time).toLocaleDateString() : ''
+    },
+    main_complaint(rec: any) {
+      const { value } = rec ?? {}
+
+      if (typeof value !== 'string') return '-'
+
+      try {
+        const parsed = JSON.parse(value)
+        console.log('parsed', parsed)
+        return parsed?.['prim-compl'] || '-'
+      } catch {
+        return '-'
+      }
+    },
+    encounter(rec: any) {
+      const data = rec?.encounter ?? {}
+      return data?.class_code || '-'
+    },
+    diagnose(rec: any) {
+      const { value } = rec ?? {}
+
+      if (typeof value !== 'string') return '-'
+
+      try {
+        const parsed = JSON.parse(value)
+        const diagnose = parsed?.diagnose || []
+        return diagnose.map((d: any) => d.name).join(', ')
+      } catch {
+        return '-'
+      }
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+    patient_address(_rec) {
+      return '-'
+    },
+  },
+}
diff --git a/app/components/app/initial-nursing/list.vue b/app/components/app/initial-nursing/list.vue
new file mode 100644
index 00000000..96697bde
--- /dev/null
+++ b/app/components/app/initial-nursing/list.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { config } from './list-cfg'
+
+defineProps<{
+  data: any[]
+}>()
+</script>
+
+<template>
+  <PubMyUiDataTable
+    v-bind="config"
+    :rows="data"
+  />
+</template>
diff --git a/app/components/app/initial-nursing/preview.vue b/app/components/app/initial-nursing/preview.vue
new file mode 100644
index 00000000..501969f0
--- /dev/null
+++ b/app/components/app/initial-nursing/preview.vue
@@ -0,0 +1,128 @@
+<script setup lang="ts">
+const props = defineProps<{
+  preview: any
+}>()
+</script>
+
+<template>
+  <div class="p-1 text-sm">
+    <div class="mb-4 flex gap-3">
+      <span class="w-40 font-semibold">Jam Tanggal</span>
+      <span>: {{ '-' }}</span>
+    </div>
+
+    <hr class="my-4" />
+
+    <h2 class="mb-3 font-semibold">A. Data Subyektif</h2>
+
+    <div class="space-y-3">
+      <div class="flex">
+        <span class="w-40 font-medium">Keluhan Pasien</span>
+        <span>: {{ preview?.['pri-complain'] || '-' }}</span>
+      </div>
+
+      <div>
+        <div class="flex">
+          <span class="w-40 font-medium">Riwayat Alergi dan Reaksi</span>
+          <span>:</span>
+        </div>
+
+        <div class="mt-1 space-y-1 pl-10">
+          <div class="flex">
+            <span class="w-28">a. Obat</span>
+            <span>: {{ preview?.['med-type'] || '-' }}</span>
+            <span class="ml-6 w-20">Sebutkan</span>
+            <span>: {{ preview?.['med-name'] || '-' }}</span>
+            <span class="ml-6 w-16">Reaksi</span>
+            <span>: {{ preview?.['med-reaction'] || '-' }}</span>
+          </div>
+
+          <div class="flex">
+            <span class="w-28">b. Makanan</span>
+            <span>: {{ preview?.['food-type'] || '-' }}</span>
+            <span class="ml-6 w-20">Sebutkan</span>
+            <span>: {{ preview?.['food-name'] || '-' }}</span>
+            <span class="ml-6 w-16">Reaksi</span>
+            <span>: {{ preview?.['food-reaction'] || '-' }}</span>
+          </div>
+
+          <div class="flex">
+            <span class="w-28">c. Lain-lain</span>
+            <span>: {{ preview?.['other-type'] || '-' }}</span>
+            <span class="ml-6 w-20">Sebutkan</span>
+            <span>: {{ preview?.['other-name'] || '-' }}</span>
+            <span class="ml-6 w-16">Reaksi</span>
+            <span>: {{ preview?.['other-reaction'] || '-' }}</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Kajian Nyeri</span>
+        <span>: {{ preview?.['pain-asst'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40">Skala Nyeri</span>
+        <span>: {{ preview?.['pain-scale'] || '-' }}</span>
+      </div>
+      <div class="flex">
+        <span class="w-40">Waktu Nyeri</span>
+        <span>: {{ preview?.['pain-time'] || '-' }}</span>
+      </div>
+      <div class="flex">
+        <span class="w-40">Durasi Nyeri</span>
+        <span>: {{ preview?.['pain-duration'] || '-' }}</span>
+      </div>
+      <div class="flex">
+        <span class="w-40">Frekwensi Nyeri</span>
+        <span>: {{ preview?.['pain-freq'] || '-' }}</span>
+      </div>
+      <div class="flex">
+        <span class="w-40">Lokasi</span>
+        <span>: {{ preview?.['pain-loc'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Skrining Nutrisi</span>
+        <span>: {{ preview?.['nut-screening'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Kajian psiko-sosio-kultural-spiritual</span>
+        <span>: {{ preview?.['spiritual-asst'] || '-' }}</span>
+      </div>
+    </div>
+
+    <hr class="my-4" />
+
+    <h2 class="mb-3 font-semibold">B. Data Obyektif</h2>
+
+    <div class="space-y-3">
+      <div class="flex">
+        <span class="w-40 font-medium">Keadaan Umum</span>
+        <span>: {{ preview?.['general-condition'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Pemeriksaan Penunjang</span>
+        <span>: {{ preview?.['support-exam'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Risiko Jatuh</span>
+        <span>: {{ preview?.['risk-fall'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Pemakaian Gelang Risiko Jatuh</span>
+        <span>: {{ preview?.['bracelet'] || '-' }}</span>
+      </div>
+
+      <div class="flex">
+        <span class="w-40 font-medium">Pasang Gelang Alergi</span>
+        <span>: {{ preview?.['bracelet-alg'] || '-' }}</span>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/sep/action-history.vue b/app/components/app/sep/action-history.vue
new file mode 100644
index 00000000..8ca652b1
--- /dev/null
+++ b/app/components/app/sep/action-history.vue
@@ -0,0 +1,32 @@
+<script lang="ts" setup>
+import { inject, type Ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+// Components
+import { Button } from '~/components/pub/ui/button'
+
+const props = defineProps<{
+  rec: { sepNumber: string; }
+}>()
+
+const route = useRoute()
+const router = useRouter()
+const record = props.rec || {}
+const recSepId = inject('rec_sep_id') as Ref<string>
+
+function handleSelection() {
+  recSepId.value = record.sepNumber || ''
+  const pathUrl = `/integration/bpjs-vclaim/sep/${record.sepNumber || ''}/link?source-path=${route.path}`
+  router.push(pathUrl)
+}
+</script>
+
+<template>
+  <Button
+    variant="outline"
+    type="button"
+    class="h-[40px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50"
+    @click="handleSelection"
+  >
+    Detail SEP
+  </Button>
+</template>
diff --git a/app/components/app/sep/entry-form.vue b/app/components/app/sep/entry-form.vue
index 0aa33178..f921d633 100644
--- a/app/components/app/sep/entry-form.vue
+++ b/app/components/app/sep/entry-form.vue
@@ -24,11 +24,11 @@ import { useForm } from 'vee-validate'
 import { refDebounced } from '@vueuse/core'
 
 const props = defineProps<{
+  mode?: string
   isLoading?: boolean
   isReadonly?: boolean
   isService?: boolean
-  isShowPatient?: boolean;
-  mode?: string
+  isShowPatient?: boolean
   doctors: any[]
   diagnoses: any[]
   facilitiesFrom: any[]
@@ -102,14 +102,17 @@ const titleLetterNumber = computed(() => (admissionType.value === '3' ? 'Surat K
 const titleLetterDate = computed(() =>
   admissionType.value === '3' ? 'Tanggal Surat Kontrol' : 'Tanggal Surat Rujukan',
 )
+const mode = props.mode !== undefined ? props.mode : 'add'
+const attendingDoctorName = ref('')
+const diagnosisName = ref('')
 const isAccidentally = computed(() => accident.value === '1' || accident.value === '2')
 const isProvinceSelected = computed(() => accidentProvince.value !== '')
 const isCitySelected = computed(() => accidentCity.value !== '')
-const mode = props.mode !== undefined ? props.mode : 'add'
 const isLoading = props.isLoading !== undefined ? props.isLoading : false
 const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const isService = ref(props.isService || false)
 const isShowPatient = ref(props.isShowPatient || false)
+const isShowSpecialist = ref(false)
 const isDateReload = ref(false)
 
 // Debounced search for bpjsNumber and nationalId
@@ -129,32 +132,139 @@ async function onFetchChildren(parentId: string): Promise<void> {
   console.log('onFetchChildren', parentId)
 }
 
+const onBack = () => {
+  emit('event', 'back')
+}
+
+const onSaveNumber = () => {
+  emit('event', 'save-sep-number', { sepNumber: props?.objects?.sepNumber || '' })
+}
+
 // Submit handler
 const onSubmit = handleSubmit((values) => {
   console.log('✅ Validated form values:', JSON.stringify(values, null, 2))
   emit('event', 'save-sep', values)
 })
 
+const onInitialized = (objects: any) => {
+  sepDate.value = objects?.registerDate || new Date().toISOString().substring(0, 10)
+  cardNumber.value = objects?.cardNumber || '-'
+  nationalId.value = objects?.nationalIdentity || '-'
+  medicalRecordNumber.value = objects?.medicalRecordNumber || '-'
+  patientName.value = objects?.patientName || '-'
+  phoneNumber.value = objects?.phoneNumber || '-'
+  if (objects?.sepType === 'internal') {
+    admissionType.value = '4'
+  }
+  if (objects?.sepType === 'external') {
+    admissionType.value = '1'
+  }
+  if (objects?.diagnosisName) {
+    diagnosisName.value = objects?.diagnosisName
+  }
+  // Patient data
+  if (objects?.serviceType) {
+    serviceType.value = objects?.serviceType
+  }
+  if (objects?.fromClinic) {
+    fromClinic.value = objects?.fromClinic
+  }
+  if (objects?.destinationClinic) {
+    destinationClinic.value = objects?.destinationClinic
+  }
+  // Doctor & Support data
+  if (objects?.attendingDoctor) {
+    attendingDoctor.value = objects?.attendingDoctor
+  }
+  if (objects?.attendingDoctorName) {
+    attendingDoctorName.value = objects?.attendingDoctorName
+  }
+  if (objects?.cob) {
+    cob.value = objects?.cob
+  }
+  if (objects?.cataract) {
+    cataract.value = objects?.cataract
+  }
+  if (objects?.clinicExcecutive) {
+    clinicExcecutive.value = objects?.clinicExcecutive
+  }
+  if (objects?.procedureType) {
+    procedureType.value = objects?.procedureType
+  }
+  if (objects?.supportCode) {
+    supportCode.value = objects?.supportCode
+  }
+  // Class & Payment data
+  if (objects?.classLevel) {
+    classLevel.value = objects?.classLevel
+  }
+  if (objects?.classLevelUpgrade) {
+    classLevelUpgrade.value = objects?.classLevelUpgrade
+  }
+  if (objects?.classPaySource) {
+    classPaySource.value = objects?.classPaySource
+  }
+  if (objects?.responsiblePerson) {
+    responsiblePerson.value = objects?.responsiblePerson
+  }
+  // Accident data
+  if (objects?.trafficAccident) {
+    accident.value = objects?.trafficAccident
+  }
+  if (objects?.lpNumber) {
+    lpNumber.value = objects?.lpNumber
+  }
+  if (objects?.accidentDate) {
+    accidentDate.value = objects?.accidentDate
+  }
+  if (objects?.accidentNote) {
+    accidentNote.value = objects?.accidentNote
+  }
+  if (objects?.accidentProvince) {
+    accidentProvince.value = objects?.accidentProvince
+  }
+  if (objects?.accidentCity) {
+    accidentCity.value = objects?.accidentCity
+  }
+  if (objects?.accidentDistrict) {
+    accidentDistrict.value = objects?.accidentDistrict
+  }
+  if (objects?.suplesi) {
+    suplesi.value = objects?.suplesi
+  }
+  if (objects?.suplesiNumber) {
+    suplesiNumber.value = objects?.suplesiNumber
+  }
+  // Visit purpose & Assessment
+  if (objects?.purposeOfVisit) {
+    purposeOfVisit.value = objects?.purposeOfVisit
+  }
+  if (objects?.serviceAssessment) {
+    serviceAssessment.value = objects?.serviceAssessment
+  }
+  // Note & Specialist
+  if (objects?.note) {
+    note.value = objects?.note
+  }
+  if (objects?.subSpecialistId) {
+    subSpecialistId.value = objects?.subSpecialistId
+  }
+  // Referral letter
+  if (objects?.referralLetterNumber) {
+    referralLetterNumber.value = objects?.referralLetterNumber
+  }
+}
+
 watch(props, (value) => {
   const objects = value.objects || ({} as any)
   if (Object.keys(objects).length > 0) {
-    sepDate.value = objects?.registerDate || new Date().toISOString().substring(0, 10)
-    cardNumber.value = objects?.cardNumber || '-'
-    nationalId.value = objects?.nationalIdentity || '-'
-    medicalRecordNumber.value = objects?.medicalRecordNumber || '-'
-    patientName.value = objects?.patientName || '-'
-    phoneNumber.value = objects?.phoneNumber || '-'
-    if (objects?.sepType === 'internal') {
-      admissionType.value = '4'
-    }
-    if (objects?.sepType === 'external') {
-      admissionType.value = '1'
-    }
-    if (objects?.diagnoseLabel) {
-      initialDiagnosis.value = objects?.diagnoseLabel
-    }
+    onInitialized(objects)
     isDateReload.value = true
     setTimeout(() => {
+      if (objects?.sepDate) {
+        sepDate.value = objects?.sepDate
+        referralLetterDate.value = objects?.sepDate
+      }
       if (objects?.letterDate) {
         referralLetterDate.value = objects?.letterDate
       }
@@ -206,10 +316,11 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.sepDate">
             <DatepickerSingle
+              v-if="!isDateReload"
               id="sepDate"
               v-model="sepDate"
               v-bind="sepDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal sep"
             />
           </Field>
@@ -284,7 +395,7 @@ onMounted(() => {
               id="cardNumber"
               v-model="cardNumber"
               v-bind="cardNumberAttrs"
-              :disabled="false"
+              :disabled="isLoading || isReadonly"
             />
           </Field>
         </Cell>
@@ -299,7 +410,7 @@ onMounted(() => {
               id="nationalId"
               v-model="nationalId"
               v-bind="nationalIdAttrs"
-              :disabled="false"
+              :disabled="isLoading || isReadonly"
             />
           </Field>
         </Cell>
@@ -378,6 +489,7 @@ onMounted(() => {
                 "
               />
               <Button
+                v-if="!isReadonly"
                 variant="outline"
                 type="button"
                 class="h-[40px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50"
@@ -406,7 +518,7 @@ onMounted(() => {
               id="referralLetterDate"
               v-model="referralLetterDate"
               v-bind="referralLetterDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal surat"
             />
           </Field>
@@ -417,11 +529,12 @@ onMounted(() => {
             Klinik Eksekutif
             <span class="text-red-500">*</span>
           </Label>
-          <Field :errMessage="errors.cob">
+          <Field :errMessage="errors.clinicExcecutive">
             <RadioGroup
               v-model="clinicExcecutive"
               v-bind="clinicExcecutiveAttrs"
               class="flex items-center gap-2"
+              :disabled="isLoading || isReadonly"
             >
               <div class="flex items-center space-x-2">
                 <RadioGroupItem
@@ -481,7 +594,7 @@ onMounted(() => {
           </Field>
         </Cell>
 
-         <Cell>
+        <Cell v-if="!isReadonly && isShowSpecialist">
           <Label height="compact">
             Spesialis / Subspesialis
             <span class="text-red-500">*</span>
@@ -504,6 +617,7 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.attendingDoctor">
             <Combobox
+              v-if="!isReadonly"
               id="attendingDoctor"
               v-model="attendingDoctor"
               v-bind="attendingDoctorAttrs"
@@ -514,6 +628,12 @@ onMounted(() => {
               empty-message="Item tidak ditemukan"
               @update:searchText="emit('fetch', { menu: 'doctor', value: $event })"
             />
+            <Input
+              v-else
+              v-model="attendingDoctorName"
+              v-bind="attendingDoctorAttrs"
+              :disabled="isLoading || isReadonly"
+            />
           </Field>
         </Cell>
 
@@ -524,6 +644,7 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.initialDiagnosis">
             <Combobox
+              v-if="!isReadonly"
               id="initialDiagnosis"
               v-model="initialDiagnosis"
               v-bind="initialDiagnosisAttrs"
@@ -534,6 +655,12 @@ onMounted(() => {
               empty-message="Item tidak ditemukan"
               @update:searchText="emit('fetch', { menu: 'diagnosis', value: $event })"
             />
+            <Input
+              v-else
+              v-model="diagnosisName"
+              v-bind="initialDiagnosisAttrs"
+              :disabled="isLoading || isReadonly"
+            />
           </Field>
         </Cell>
       </Block>
@@ -658,6 +785,7 @@ onMounted(() => {
               v-model="cob"
               v-bind="cobAttrs"
               class="flex items-center gap-2"
+              :disabled="isLoading || isReadonly"
             >
               <div class="flex items-center space-x-2">
                 <RadioGroupItem
@@ -668,7 +796,7 @@ onMounted(() => {
               </div>
               <div class="flex items-center space-x-2">
                 <RadioGroupItem
-                  value="Tidak"
+                  value="no"
                   id="cob-no"
                 />
                 <Label for="cob-no">Tidak</Label>
@@ -687,6 +815,7 @@ onMounted(() => {
               v-model="cataract"
               v-bind="cataractAttrs"
               class="flex items-center gap-2"
+              :disabled="isLoading || isReadonly"
             >
               <div class="flex items-center space-x-2">
                 <RadioGroupItem
@@ -756,7 +885,7 @@ onMounted(() => {
               id="accidentDate"
               v-model="accidentDate"
               v-bind="accidentDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal kejadian"
             />
           </Field>
@@ -966,6 +1095,7 @@ onMounted(() => {
       <!-- Actions -->
       <div class="mt-6 flex justify-end gap-2">
         <Button
+          v-if="props.mode === 'detail'"
           variant="ghost"
           type="button"
           class="h-[40px] min-w-[120px] text-orange-400 hover:bg-green-50"
@@ -978,6 +1108,7 @@ onMounted(() => {
           Riwayat SEP
         </Button>
         <Button
+          v-if="props.mode === 'detail'"
           variant="outline"
           type="button"
           class="h-[40px] min-w-[120px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50 hover:text-orange-400"
@@ -989,6 +1120,7 @@ onMounted(() => {
           Preview
         </Button>
         <Button
+          v-if="props.mode === 'add'"
           type="button"
           class="h-[40px] min-w-[120px] text-white"
           :disabled="isLoading"
@@ -1000,6 +1132,32 @@ onMounted(() => {
           />
           Simpan
         </Button>
+        <Button
+          v-if="props.mode === 'detail'"
+          type="button"
+          class="h-[40px] min-w-[120px] text-white"
+          :disabled="isLoading"
+          @click="onBack"
+        >
+          <Icon
+            name="i-lucide-chevron-left"
+            class="h-5 w-5"
+          />
+          Kembali
+        </Button>
+        <Button
+          v-if="props.mode === 'link'"
+          type="button"
+          class="h-[40px] min-w-[120px] text-white"
+          :disabled="isLoading"
+          @click="onSaveNumber"
+        >
+          <Icon
+            name="i-lucide-save"
+            class="h-5 w-5"
+          />
+          Terapkan
+        </Button>
       </div>
     </form>
   </div>
diff --git a/app/components/app/sep/list-cfg.history.ts b/app/components/app/sep/list-cfg.history.ts
index 35bb656c..5e46a335 100644
--- a/app/components/app/sep/list-cfg.history.ts
+++ b/app/components/app/sep/list-cfg.history.ts
@@ -9,21 +9,25 @@ export interface SepHistoryData {
   careClass: string
 }
 
+const ActionHistory = defineAsyncComponent(() => import('~/components/app/sep/action-history.vue'))
+
+const keysDefault = ['sepNumber', 'sepDate', 'referralNumber', 'diagnosis', 'serviceType', 'careClass']
+const colsDefault = [{ width: 100 }, { width: 100 }, { width: 100 }, { width: 100 }, { width: 100 }, { width: 100 }]
+const headersDefault = [
+  { label: 'NO. SEP' },
+  { label: 'TGL. SEP' },
+  { label: 'NO. RUJUKAN' },
+  { label: 'DIAGNOSIS AWAL' },
+  { label: 'JENIS PELAYANAN' },
+  { label: 'KELAS RAWAT' },
+]
+
 export const config: Config = {
-  cols: [{ width: 100 }, { width: 100 }, { width: 100 }, { width: 100 }, { width: 100 }, { width: 100 }],
+  cols: [...colsDefault],
 
-  headers: [
-    [
-      { label: 'NO. SEP' },
-      { label: 'TGL. SEP' },
-      { label: 'NO. RUJUKAN' },
-      { label: 'DIAGNOSIS AWAL' },
-      { label: 'JENIS PELAYANAN' },
-      { label: 'KELAS RAWAT' },
-    ],
-  ],
+  headers: [[...headersDefault]],
 
-  keys: ['sepNumber', 'sepDate', 'referralNumber', 'diagnosis', 'serviceType', 'careClass'],
+  keys: [...keysDefault],
 
   delKeyNames: [{ key: 'code', label: 'Kode' }],
 
@@ -33,3 +37,27 @@ export const config: Config = {
 
   htmls: {},
 }
+
+export const configDetail: Config = {
+  cols: [...colsDefault, { width: 50 }],
+
+  headers: [[...headersDefault, { label: 'AKSI' }]],
+
+  keys: [...keysDefault, 'action'],
+
+  delKeyNames: [{ key: 'code', label: 'Kode' }],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: { ...(rec as object) },
+        component: ActionHistory,
+      }
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/sep/list-cfg.ts b/app/components/app/sep/list-cfg.ts
index e2257954..2c3e7af8 100644
--- a/app/components/app/sep/list-cfg.ts
+++ b/app/components/app/sep/list-cfg.ts
@@ -1,9 +1,7 @@
 import type { Config } from '~/components/pub/my-ui/data-table'
 import { defineAsyncComponent } from 'vue'
 
-type SepDto = any
-
-const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dd.vue'))
 
 export const config: Config = {
   cols: [
diff --git a/app/components/app/sep/list-history.vue b/app/components/app/sep/list-history.vue
index fdad0791..cea58e3d 100644
--- a/app/components/app/sep/list-history.vue
+++ b/app/components/app/sep/list-history.vue
@@ -7,9 +7,10 @@ import type { SepHistoryData } from './list-cfg.history'
 import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
 
 // Configs
-import { config } from './list-cfg.history'
+import { config, configDetail } from './list-cfg.history'
 
 const props = defineProps<{
+  isAction?: boolean
   data: SepHistoryData[]
   paginationMeta?: PaginationMeta
 }>()
@@ -25,7 +26,7 @@ function handlePageChange(page: number) {
 
 <template>
   <PubMyUiDataTable
-    v-bind="config"
+    v-bind="isAction ? configDetail : config"
     :rows="props.data"
   />
   <PaginationView
diff --git a/app/components/app/sep/view-history.vue b/app/components/app/sep/view-history.vue
index a6a6091c..13b54feb 100644
--- a/app/components/app/sep/view-history.vue
+++ b/app/components/app/sep/view-history.vue
@@ -16,6 +16,7 @@ import type { PaginationMeta } from '~/components/pub/my-ui/pagination/paginatio
 
 const props = defineProps<{
   open: boolean
+  isAction?: boolean
   histories: Array<SepHistoryData>
   paginationMeta?: PaginationMeta
 }>()
@@ -37,7 +38,7 @@ const emit = defineEmits<{
       </DialogHeader>
 
       <div class="overflow-x-auto rounded-lg border">
-        <ListHistory :data="histories" :pagination-meta="paginationMeta" />
+        <ListHistory :data="histories" :is-action="props.isAction || false" :pagination-meta="paginationMeta" />
       </div>
 
       <DialogFooter></DialogFooter>
diff --git a/app/components/content/cprj/list.vue b/app/components/content/cprj/list.vue
index 109bea6b..6da61716 100644
--- a/app/components/content/cprj/list.vue
+++ b/app/components/content/cprj/list.vue
@@ -63,7 +63,7 @@ const {
   fetchFn: async ({ page, search }) => {
     const result = await getList({
       'encounter-id': id,
-      typeCode: 'dev-record',
+      'type-code': 'dev-record',
       includes: 'encounter',
       search,
       page,
diff --git a/app/components/content/encounter/entry.vue b/app/components/content/encounter/entry.vue
index 203d781a..a06a4165 100644
--- a/app/components/content/encounter/entry.vue
+++ b/app/components/content/encounter/entry.vue
@@ -3,14 +3,14 @@
 import { Button } from '~/components/pub/ui/button'
 import AppEncounterEntryForm from '~/components/app/encounter/entry-form.vue'
 import AppViewPatient from '~/components/app/patient/view-patient.vue'
+import AppViewHistory from '~/components/app/sep/view-history.vue'
 
 // Helpers
 import { refDebounced } from '@vueuse/core'
 
 // Handlers
-import { getDetail as getDoctorDetail  } from '~/services/doctor.service'
 import { useEncounterEntry } from '~/handlers/encounter-entry.handler'
-import { genDoctor, type Doctor } from '~/models/doctor'
+import { useIntegrationSepEntry } from '~/handlers/integration-sep-entry.handler'
 
 // Props
 const props = defineProps<{
@@ -34,54 +34,33 @@ const {
   isLoadingDetail,
   formObjects,
   openPatient,
+  isMemberValid,
   isSepValid,
   isCheckingSep,
   isSaveDisabled,
-  isSaving,
   isLoading,
   patients,
+  selectedDoctor,
   selectedPatient,
   selectedPatientObject,
   paginationMeta,
   toNavigateSep,
   getListPath,
   handleInit,
-  loadEncounterDetail,
+  getFetchEncounterDetail,
   handleSaveEncounter,
   getPatientsList,
   getPatientCurrent,
   getPatientByIdentifierSearch,
-  getIsSubspecialist,
+  // getIsSubspecialist,
+  getDoctorInfo,
+  getValidateMember,
   getValidateSepNumber,
   handleFetchDoctors,
 } = useEncounterEntry(props)
+const { recSepId, openHistory, histories, getMonitoringHistoryMappers } = useIntegrationSepEntry()
 
 const debouncedSepNumber = refDebounced(sepNumber, 500)
-const selectedDoctor = ref<Doctor>(genDoctor())
-
-provide('rec_select_id', recSelectId)
-provide('table_data_loader', isLoading)
-
-watch(debouncedSepNumber, async (newValue) => {
-  await getValidateSepNumber(newValue)
-})
-
-watch(
-  () => formObjects.value?.paymentType,
-  (newValue) => {
-    isSepValid.value = false
-    if (newValue !== 'jkn') {
-      sepNumber.value = ''
-    }
-  },
-)
-
-onMounted(async () => {
-  await handleInit()
-  if (props.id > 0) {
-    await loadEncounterDetail()
-  }
-})
 
 ///// Functions
 function handleSavePatient() {
@@ -116,12 +95,28 @@ async function handleEvent(menu: string, value?: any) {
     }
     toNavigateSep({
       isService: 'false',
+      encounterId: props.id || null,
       sourcePath: route.path,
       resource: `${props.classCode}-${props.subClassCode}`,
       ...value,
     })
   } else if (menu === 'sep-number-changed') {
-    await getValidateSepNumber(String(value || ''))
+    const sepNumberText = String(value || '').trim()
+    if (sepNumberText.length > 5) {
+      await getValidateSepNumber(sepNumberText)
+    }
+  } else if (menu === 'member-changed') {
+    const memberText = String(value || '').trim()
+    if (memberText.length > 5) {
+      await getValidateMember(memberText)
+    }
+  } else if (menu === 'search-sep') {
+    const memberText = String(value?.cardNumber || '').trim()
+    if (memberText.length < 5) return
+    getMonitoringHistoryMappers(memberText).then(() => {
+      openHistory.value = true
+    })
+    return
   } else if (menu === 'save') {
     await handleSaveEncounter(value)
   } else if (menu === 'cancel') {
@@ -129,13 +124,39 @@ async function handleEvent(menu: string, value?: any) {
   }
 }
 
-async function getDoctorInfo(value: string) {
-  const resp = await getDoctorDetail(value, { includes: 'unit,specialist,subspecialist'})
-  if (resp.success) {
-    selectedDoctor.value = resp.body.data
-    // console.log(selectedDoctor.value)
+provide('rec_select_id', recSelectId)
+provide('rec_sep_id', recSepId)
+provide('table_data_loader', isLoading)
+
+watch(debouncedSepNumber, async (newValue) => {
+  await getValidateSepNumber(newValue)
+})
+
+watch(
+  () => formObjects.value?.paymentType,
+  (newValue) => {
+    isSepValid.value = false
+    if (newValue !== 'jkn') {
+      sepNumber.value = ''
+    }
+  },
+)
+
+watch(
+  () => props.id,
+  async (newId) => {
+    if (props.formType === 'edit' && newId > 0) {
+      await getFetchEncounterDetail()
+    }
+  },
+)
+
+onMounted(async () => {
+  await handleInit()
+  if (props.formType === 'edit' && props.id > 0) {
+    await getFetchEncounterDetail()
   }
-}
+})
 </script>
 
 <template>
@@ -144,13 +165,15 @@ async function getDoctorInfo(value: string) {
       name="i-lucide-user"
       class="me-2"
     />
-    <span class="font-semibold">{{ props.formType }}</span>
+    <span class="font-semibold">{{ props.formType === 'add' ? 'Tambah' : 'Ubah' }}</span>
     Kunjungan
   </div>
 
   <AppEncounterEntryForm
     ref="formRef"
+    :mode="props.formType"
     :is-loading="isLoadingDetail"
+    :is-member-valid="isMemberValid"
     :is-sep-valid="isSepValid"
     :is-checking-sep="isCheckingSep"
     :payments="paymentsList"
@@ -165,7 +188,6 @@ async function getDoctorInfo(value: string) {
     @event="handleEvent"
     @fetch="handleFetch"
   />
-
   <AppViewPatient
     v-model:open="openPatient"
     v-model:selected="selectedPatient"
@@ -184,7 +206,11 @@ async function getDoctorInfo(value: string) {
     "
     @save="handleSavePatient"
   />
-
+  <AppViewHistory
+    v-model:open="openHistory"
+    :is-action="true"
+    :histories="histories"
+  />
   <!-- Footer Actions -->
   <div class="mt-6 flex justify-end gap-2 border-t border-t-slate-300 pt-4">
     <Button
diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index 31c11326..1ea0d6a0 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -34,8 +34,13 @@ const props = defineProps<{
 const { setOpen } = useSidebar()
 setOpen(true)
 
+// Role reactivities
+const { getActiveRole } = useUserStore()
+
 // Main data
 const data = ref([])
+const dataFiltered = ref([])
+const activeServicePosition = ref(getServicePosition(getActiveRole()))
 const isLoading = reactive<DataTableLoader>({
   summary: false,
   isTableLoading: false,
@@ -87,29 +92,25 @@ const filter = ref<{
   schema: {},
 })
 
-// Role reactivities
-const { getActiveRole } = useUserStore()
-const activeServicePosition = ref(getServicePosition(getActiveRole()))
-provide('activeServicePosition', activeServicePosition)
-watch(getActiveRole, (role? : string) => {
-  activeServicePosition.value = getServicePosition(role)
-})
-
 // Recrod reactivities
+provide('activeServicePosition', activeServicePosition)
 provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
+
+watch(getActiveRole, (role? : string) => {
+  activeServicePosition.value = getServicePosition(role)
+})
+
 watch(() => recAction.value, () => {
   const basePath = `/${props.classCode}/encounter`
-  // console.log(`${basePath}/${recId.value}`, recAction.value)
-  // return
   if (recAction.value === ActionEvents.showConfirmDelete) {
     isRecordConfirmationOpen.value = true
   } else if (recAction.value === ActionEvents.showCancel) {
     isRecordCancelOpen.value = true
   } else if (recAction.value === ActionEvents.showDetail) {
-    navigateTo(`${basePath}/${recId.value}`)
+    navigateTo(`${basePath}/${recId.value}/detail`)
   } else if (recAction.value === ActionEvents.showEdit) {
     navigateTo(`${basePath}/${recId.value}/edit`)
   } else if (recAction.value === ActionEvents.showProcess) {
@@ -138,6 +139,7 @@ async function getPatientList() {
     const result = await getEncounterList(params)
     if (result.success) {
       data.value = result.body?.data || []
+      dataFiltered.value = [...data.value]
     }
   } catch (error) {
     console.error('Error fetching encounter list:', error)
@@ -240,6 +242,7 @@ function handleRemoveConfirmation() {
 <template>
   <CH.ContentHeader v-bind="hreaderPrep">
     <FilterNav
+      :active-positon="activeServicePosition"
       @onFilterClick="() => isFilterFormDialogOpen = true"
       @onExportPdf="() => {}"
       @onExportExcel="() => {}"
@@ -261,6 +264,7 @@ function handleRemoveConfirmation() {
 
   <!-- Batal -->
   <RecordConfirmation
+    v-if="canDelete"
     v-model:open="isRecordCancelOpen"
     custom-title="Batalkan Kunjungan"
     custom-message="Apakah anda yakin ingin membatalkan kunjungan pasien berikut?"
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 52698dd9..b298c92f 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -16,8 +16,24 @@ import { genEncounter, type Encounter } from '~/models/encounter'
 // Handlers
 import type { EncounterProps } from '~/handlers/encounter-init.handler'
 import { getEncounterData } from '~/handlers/encounter-process.handler'
-import { getMenuItems } from "~/handlers/encounter-init.handler"
+import { getMenuItems } from '~/handlers/encounter-init.handler'
 
+// PLASE ORDER BY TAB POSITION
+import Status from '~/components/content/encounter/status.vue'
+import AssesmentFunctionList from '~/components/content/soapi/entry.vue'
+import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
+import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
+import DeviceOrder from '~/components/content/device-order/main.vue'
+import Prescription from '~/components/content/prescription/main.vue'
+import CpLabOrder from '~/components/content/cp-lab-order/main.vue'
+import Radiology from '~/components/content/radiology-order/main.vue'
+import Consultation from '~/components/content/consultation/list.vue'
+import Cprj from '~/components/content/cprj/entry.vue'
+import DocUploadList from '~/components/content/document-upload/list.vue'
+import GeneralConsentList from '~/components/content/general-consent/entry.vue'
+import ResumeList from '~/components/content/resume/list.vue'
+import ControlLetterList from '~/components/content/control-letter/list.vue'
+import InitialNursingStudy from '~/components/content/initial-nursing/entry.vue'
 // App Components
 import EncounterPatientInfo from '~/components/app/encounter/quick-info.vue'
 import EncounterHistoryButtonMenu from '~/components/app/encounter/quick-shortcut.vue'
@@ -51,7 +67,8 @@ const isShowPatient = computed(() => data.value && data.value?.patient?.person)
 const { setOpen } = useSidebar()
 setOpen(false)
 
-if (activePosition.value === 'none') { // if user position is none, redirect to home page
+if (activePosition.value === 'none') {
+  // if user position is none, redirect to home page
   router.push('/')
 }
 
@@ -66,6 +83,45 @@ const protocolRows = [
     action: '',
   },
   {
+    value: 'rehab-medical-assessment',
+    label: 'Pengkajian Awal Medis Rehabilitasi Medis',
+    component: EarlyMedicalRehabList,
+    props: { encounter: data, type: 'early-rehab', label: 'Pengkajian Awal Medis Rehabilitasi Medis' },
+  },
+  {
+    value: 'function-assessment',
+    label: 'Asesmen Fungsi',
+    component: AssesmentFunctionList,
+    props: { encounter: data, type: 'function', label: 'Asesmen Fungsi' },
+  },
+  { value: 'therapy-protocol', label: 'Protokol Terapi' },
+  { value: 'education-assessment', label: 'Asesmen Kebutuhan Edukasi' },
+  { value: 'patient-note', label: 'CPRJ', component: Cprj, props: { encounter: data } },
+  { value: 'consent', label: 'General Consent', component: GeneralConsentList, props: { encounter: data } },
+  {
+    value: 'initial-nursing-study',
+    label: 'Kajian Awal Keperawatan',
+    component: InitialNursingStudy,
+    props: { encounter: data },
+  },
+  { value: 'prescription', label: 'Order Obat', component: Prescription, props: { encounter_id: data.value.id } },
+  { value: 'device-order', label: 'Order Alkes', component: DeviceOrder, props: { encounter_id: data.value.id } },
+  { value: 'device', label: 'Order Alkes' },
+  { value: 'mcu-radiology', label: 'Order Radiologi', component: Radiology, props: { encounter_id: data.id } },
+  { value: 'mcu-lab-cp', label: 'Order Lab PK', component: CpLabOrder, props: { encounter_id: data.id } },
+  { value: 'mcu-lab-micro', label: 'Order Lab Mikro' },
+  { value: 'mcu-lab-pa', label: 'Order Lab PA' },
+  { value: 'medical-action', label: 'Order Ruang Tindakan' },
+  { value: 'mcu-result', label: 'Hasil Penunjang' },
+  { value: 'consultation', label: 'Konsultasi', component: Consultation, props: { encounter: data } },
+  { value: 'resume', label: 'Resume', component: ResumeList, props: { encounter: data } },
+  { value: 'control', label: 'Surat Kontrol', component: ControlLetterList, props: { encounter: data } },
+  { value: 'screening', label: 'Skrinning MPP' },
+  {
+    value: 'supporting-document',
+    label: 'Upload Dokumen Pendukung',
+    component: DocUploadList,
+    props: { encounter: data },
     number: '2',
     tanggal: new Date().toISOString().substring(0, 10),
     siklus: 'II',
@@ -103,13 +159,19 @@ function handleClick(type: string) {
 }
 
 function initMenus() {
-  menus.value = getMenuItems(id, props, user, {
-    encounter: data.value
-  } as any, {
-    protocolTheraphy: paginationMeta,
-    protocolChemotherapy: paginationMeta,
-    medicineProtocolChemotherapy: paginationMeta,
-  })
+  menus.value = getMenuItems(
+    id,
+    props,
+    user,
+    {
+      encounter: data.value,
+    } as any,
+    {
+      protocolTheraphy: paginationMeta,
+      protocolChemotherapy: paginationMeta,
+      medicineProtocolChemotherapy: paginationMeta,
+    },
+  )
 }
 
 async function getData() {
@@ -119,24 +181,37 @@ async function getData() {
 
 <template>
   <div class="w-full">
-    <div class="bg-white dark:bg-slate-800 p-4 2xl:p-5">
+    <div class="bg-white p-4 dark:bg-slate-800 2xl:p-5">
       <div class="mb-4 flex">
         <div>
-          <ContentNavBa label="Kembali" @click="handleClick" />
+          <ContentNavBa
+            label="Kembali"
+            @click="handleClick"
+          />
         </div>
         <!-- <div class="ms-auto pe-3 pt-1 text-end text-xl 2xl:text-2xl font-semibold">
             Pasien: {{ data.patient.person.name }} --- No. RM: {{ data.patient.number }}
         </div> -->
       </div>
-      <ContentSwitcher :active="1" :height="150">
+      <ContentSwitcher
+        :active="1"
+        :height="150"
+      >
         <template v-slot:content1>
-          <EncounterPatientInfo v-if="isShowPatient" :data="data" />
+          <EncounterPatientInfo
+            v-if="isShowPatient"
+            :data="data"
+          />
         </template>
         <template v-slot:content2>
           <EncounterHistoryButtonMenu v-if="isShowPatient" />
         </template>
       </ContentSwitcher>
     </div>
-    <SubMenu :data="menus" :initial-active-menu="activeMenu" @change-menu="activeMenu = $event" />
+    <SubMenu
+      :data="menus"
+      :initial-active-menu="activeMenu"
+      @change-menu="activeMenu = $event"
+    />
   </div>
 </template>
\ No newline at end of file
diff --git a/app/components/content/initial-nursing/entry.vue b/app/components/content/initial-nursing/entry.vue
new file mode 100644
index 00000000..5769e967
--- /dev/null
+++ b/app/components/content/initial-nursing/entry.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+import { useQueryMode } from '@/composables/useQueryMode'
+
+import List from './list.vue'
+import Form from './form.vue'
+
+// Models
+import type { Encounter } from '~/models/encounter'
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+
+const props = defineProps<Props>()
+const route = useRoute()
+
+const { mode, goToEntry, backToList } = useQueryCRUDMode('mode')
+</script>
+
+<template>
+  <div>
+    <List
+      v-if="mode === 'list'"
+      :encounter="props.encounter"
+      @add="goToEntry"
+      @edit="goToEntry"
+    />
+    <Form
+      v-else
+      @back="backToList"
+    />
+  </div>
+</template>
diff --git a/app/components/content/initial-nursing/form.vue b/app/components/content/initial-nursing/form.vue
new file mode 100644
index 00000000..006b1dc0
--- /dev/null
+++ b/app/components/content/initial-nursing/form.vue
@@ -0,0 +1,138 @@
+<script setup lang="ts">
+import { z } from 'zod'
+import Entry from '~/components/app/initial-nursing/entry-form.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import ActionDialog from '~/components/pub/my-ui/nav-footer/ba-su.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { InitialNursingSchema } from '~/schemas/soapi.schema'
+import { toast } from '~/components/pub/ui/toast'
+import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
+const { backToList } = useQueryMode('mode')
+
+const route = useRoute()
+const isOpenProcedure = ref(false)
+const isOpenDiagnose = ref(false)
+const procedures = ref([])
+const diagnoses = ref([])
+const selectedProcedure = ref<any>(null)
+const selectedDiagnose = ref<any>(null)
+const schema = InitialNursingSchema
+const payload = ref({
+  encounter_id: 0,
+  time: '',
+  typeCode: 'early-nursery',
+  value: '',
+})
+const listProblem = ref([])
+
+const model = ref({
+  'pri-complain': '',
+  'med-type': '',
+  'med-name': '',
+  'med-reaction': '',
+  'food-type': '',
+  'food-name': '',
+  'food-reaction': '',
+  'other-type': '',
+  'other-name': '',
+  'other-reaction': '',
+  'pain-asst': '',
+  'pain-scale': '',
+  'pain-time': '',
+  'pain-duration': '',
+  'pain-freq': '',
+  'pain-loc': '',
+  'nut-screening': '',
+  'spiritual-asst': '',
+  'general-condition': '',
+  'support-exam': '',
+  'risk-fall': '',
+  bracelet: '',
+  'bracelet-alg': '',
+})
+
+const isLoading = reactive<DataTableLoader>({
+  isTableLoading: false,
+})
+
+function handleOpen(event: any) {
+  console.log('handleOpen', event.type)
+  const type = event.type
+  if (type === 'add-problem') {
+    listProblem.value = event.data
+  }
+}
+
+const entryRehabRef = ref()
+async function actionHandler(type: string) {
+  if (type === 'back') {
+    backToList()
+    return
+  }
+  const result = await entryRehabRef.value?.validate()
+  if (result?.valid) {
+    if (listProblem.value?.length > 0) {
+      result.data.listProblem = listProblem.value || []
+    }
+    console.log('data', result.data)
+    handleActionSave(
+      {
+        ...payload.value,
+        value: JSON.stringify(result.data),
+        encounter_id: +route.params.id,
+        time: new Date().toISOString(),
+      },
+      () => {},
+      () => {},
+      toast,
+    )
+
+    backToList()
+  } else {
+    console.log('Ada error di form', result)
+  }
+}
+
+const icdPreview = ref({
+  procedures: [],
+  diagnoses: [],
+})
+
+function actionDialogHandler(type: string) {
+  if (type === 'submit') {
+    icdPreview.value.procedures = selectedProcedure.value || []
+    icdPreview.value.diagnoses = selectedDiagnose.value || []
+  }
+  isOpenProcedure.value = false
+  isOpenDiagnose.value = false
+}
+
+provide('table_data_loader', isLoading)
+provide('icdPreview', icdPreview)
+</script>
+<template>
+  <Entry
+    ref="entryRehabRef"
+    v-model="model"
+    :schema="schema"
+    type="early-rehab"
+    @click="handleOpen"
+  />
+  <div class="my-2 flex justify-end py-2">
+    <Action @click="actionHandler" />
+  </div>
+  <Dialog
+    v-model:open="isOpenDiagnose"
+    title="Pilih Fungsional"
+    size="xl"
+    prevent-outside
+  >
+    <AppIcdMultiselectPicker
+      v-model:model-value="selectedDiagnose"
+      :data="diagnoses"
+    />
+    <div class="my-2 flex justify-end py-2">
+      <ActionDialog @click="actionDialogHandler" />
+    </div>
+  </Dialog>
+</template>
diff --git a/app/components/content/initial-nursing/list.vue b/app/components/content/initial-nursing/list.vue
new file mode 100644
index 00000000..0c867b96
--- /dev/null
+++ b/app/components/content/initial-nursing/list.vue
@@ -0,0 +1,210 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import List from '~/components/app/initial-nursing/list.vue'
+import Preview from '~/components/app/initial-nursing/preview.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+
+// Handlers
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/soapi-early.handler'
+
+// Services
+import { getList, getDetail } from '~/services/soapi-early.service'
+
+// Models
+import type { Encounter } from '~/models/encounter'
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const emits = defineEmits(['add', 'edit'])
+const route = useRoute()
+
+const { recordId } = useQueryCRUDRecordId()
+const { goToEntry, backToList } = useQueryCRUDMode('mode')
+
+let units = ref<{ value: string; label: string }[]>([])
+const encounterId = ref<number>(props?.encounter?.id || 0)
+const title = ref('')
+const id = route.params.id
+const descData = ref({})
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getMyList,
+} = usePaginatedList({
+  fetchFn: async ({ page, search }) => {
+    const result = await getList({
+      'encounter-id': id,
+      'type-code': 'early-nursery',
+      includes: 'encounter',
+      search,
+      page,
+    })
+    console.log('masukkk', result)
+    if (result.success) {
+      data.value = result.body.data
+    }
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'initial-nursing',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Kajian Awal Keperawatan',
+  icon: 'i-lucide-box',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (value: string) => {
+      searchInput.value = value
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+  addNav: {
+    label: 'Tambah',
+    icon: 'i-lucide-plus',
+    onClick: () => {
+      goToEntry()
+      emits('add')
+    },
+  },
+}
+
+const today = new Date()
+
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const getMyDetail = async (id: number | string) => {
+  const result = await getDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
+  }
+}
+
+const mappedData = computed(() => {
+  if (!data.value || data.value.length === 0) return []
+
+  const raw = data.value[0]
+
+  // Pastikan raw.value adalah string JSON
+  let parsed: any = {}
+  try {
+    parsed = JSON.parse(raw.value || '{}')
+  } catch (err) {
+    console.error('JSON parse error:', err)
+    return []
+  }
+
+  // Ambil listProblem
+  const list = parsed.listProblem || []
+  const textData = parsed
+
+  // Untuk keamanan: pastikan selalu array
+  if (!Array.isArray(list)) return []
+
+  return { list, textData }
+})
+
+// Watch for row actions when recId or recAction changes
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getMyDetail(recId.value)
+      title.value = 'Detail Konsultasi'
+      isReadonly.value = true
+      break
+    case ActionEvents.showEdit:
+      emits('edit')
+      recordId.value = recId.value
+      console.log('recordId', recId.value)
+      break
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+onMounted(async () => {
+  await getMyList()
+})
+</script>
+
+<template>
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
+
+  <Preview :preview="mappedData.textData" />
+
+  <h2 class="my-3 p-1 font-semibold">C. Daftar Masalah Keperawatan</h2>
+  <List :data="mappedData.list || []" />
+  <!-- :pagination-meta="paginationMeta" -->
+  <!-- @page-change="handlePageChange" -->
+
+  <!-- Record Confirmation Modal -->
+  <RecordConfirmation
+    v-model:open="isRecordConfirmationOpen"
+    action="delete"
+    :record="recItem"
+    @confirm="() => handleActionRemove(recId, getMyList, toast)"
+    @cancel=""
+  >
+    <template #default="{ record }">
+      <div class="text-sm">
+        <p>
+          <strong>ID:</strong>
+          {{ record?.id }}
+        </p>
+        <p v-if="record?.name">
+          <strong>Nama:</strong>
+          {{ record.name }}
+        </p>
+        <p v-if="record?.code">
+          <strong>Kode:</strong>
+          {{ record.code }}
+        </p>
+      </div>
+    </template>
+  </RecordConfirmation>
+</template>
diff --git a/app/components/content/sep/entry.vue b/app/components/content/sep/entry.vue
index 6e91f464..d1d6599a 100644
--- a/app/components/content/sep/entry.vue
+++ b/app/components/content/sep/entry.vue
@@ -8,7 +8,8 @@ import AppViewHistory from '~/components/app/sep/view-history.vue'
 import AppViewLetter from '~/components/app/sep/view-letter.vue'
 
 // Handler
-import useIntegrationSepEntry from '~/handlers/integration-sep-entry.handler'
+import { useIntegrationSepEntry } from '~/handlers/integration-sep-entry.handler'
+import { useIntegrationSepDetail } from '~/handlers/integration-sep-detail.handler'
 
 const {
   histories,
@@ -55,8 +56,18 @@ const {
   handleInit,
 } = useIntegrationSepEntry()
 
+const { valueObjects, getSepDetail } = useIntegrationSepDetail()
+
+const props = defineProps<{
+  mode: 'add' | 'edit' | 'detail' | 'link'
+}>()
+
 onMounted(async () => {
   await handleInit()
+  if (['detail', 'link'].includes(props.mode)) {
+    await getSepDetail()
+    selectedObjects.value = { ...selectedObjects.value, ...valueObjects.value }
+  }
 })
 </script>
 
@@ -66,12 +77,13 @@ onMounted(async () => {
       name="i-lucide-panel-bottom"
       class="me-2"
     />
-    <span class="font-semibold">Tambah</span>
-    SEP
+    <span class="font-semibold">{{ ['detail', 'link'].includes(props.mode) ? 'Detail' : 'Tambah' }} SEP</span>
   </div>
   <AppSepEntryForm
+    :mode="props.mode"
     :is-save-loading="isSaveLoading"
     :is-service="isServiceHidden"
+    :is-readonly="['detail', 'link'].includes(props.mode)"
     :doctors="doctors"
     :diagnoses="diagnoses"
     :facilities-from="facilitiesFrom"
diff --git a/app/components/content/sep/list.vue b/app/components/content/sep/list.vue
index 5850ea54..6b3b1e9b 100644
--- a/app/components/content/sep/list.vue
+++ b/app/components/content/sep/list.vue
@@ -13,8 +13,11 @@ import RangeCalendar from '~/components/pub/ui/range-calendar/RangeCalendar.vue'
 // Icons
 import { X, Check } from 'lucide-vue-next'
 
-// Libraries
-import useIntegrationSepList from '~/handlers/integration-sep-list.handler'
+// Handlers
+import { useIntegrationSepList } from '~/handlers/integration-sep-list.handler'
+
+// Helpers
+import { refDebounced } from '@vueuse/core'
 
 // use handler to provide state and functions
 const {
@@ -42,26 +45,42 @@ const {
   handleRemove,
 } = useIntegrationSepList()
 
+const dataFiltered = ref<any>([])
+const debouncedSearch = refDebounced(search, 500)
+
 // expose provides so component can also use provide/inject if needed
 provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
-watch(
-  [recId, recAction],
-  () => {
-    if (recAction.value === 'showConfirmDel') {
-      open.value = true
-    }
-  },
-)
+watch([recId, recAction], () => {
+  if (recAction.value === 'showConfirmDel') {
+    open.value = true
+  }
+  if (recAction.value === 'showDetail') {
+    navigateTo(`/integration/bpjs-vclaim/sep/${recItem.value?.letterNumber}/detail`)
+  }
+})
+
+watch(debouncedSearch, (newValue) => {
+  if (newValue && newValue !== '-' && newValue.length >= 3) {
+    dataFiltered.value = data.value.filter(
+      (item: any) =>
+        item.patientName.toLowerCase().includes(newValue.toLowerCase()) ||
+        item.letterNumber.toLowerCase().includes(newValue.toLowerCase()) ||
+        item.cardNumber.toLowerCase().includes(newValue.toLowerCase()),
+    )
+  }
+})
 
 watch(
   () => dateSelection.value,
-  (val) => {
+  async (val) => {
     if (!val) return
     setDateRange()
+    await getSepList()
+    dataFiltered.value = [...data.value]
   },
   { deep: true },
 )
@@ -73,9 +92,10 @@ watch(
   },
 )
 
-onMounted(() => {
+onMounted(async () => {
   setServiceTypes()
-  getSepList()
+  await getSepList()
+  dataFiltered.value = [...data.value]
 })
 </script>
 
@@ -85,20 +105,35 @@ onMounted(() => {
     <!-- Filter Bar -->
     <div class="my-2 flex flex-wrap items-center gap-2">
       <!-- Search -->
-      <Input v-model="search" placeholder="Cari No. SEP / No. Kartu BPJS..." class="w-72" />
+      <Input
+        v-model="search"
+        placeholder="Cari No. SEP / No. Kartu BPJS..."
+        class="w-72"
+      />
 
       <!-- Filter -->
       <div class="w-72">
-        <Select id="serviceType" icon-name="i-lucide-chevron-down" v-model="serviceType" :items="serviceTypesList"
-          placeholder="Pilih Pelayanan" />
+        <Select
+          id="serviceType"
+          icon-name="i-lucide-chevron-down"
+          v-model="serviceType"
+          :items="serviceTypesList"
+          placeholder="Pilih Pelayanan"
+        />
       </div>
 
       <!-- Date Range -->
       <Popover>
         <PopoverTrigger as-child>
-          <Button variant="outline" class="h-[40px] w-72 border-gray-400 bg-white text-right font-normal">
+          <Button
+            variant="outline"
+            class="h-[40px] w-72 border-gray-400 bg-white text-right font-normal"
+          >
             {{ dateRange }}
-            <Icon name="i-lucide-calendar" class="h-5 w-5" />
+            <Icon
+              name="i-lucide-calendar"
+              class="h-5 w-5"
+            />
           </Button>
         </PopoverTrigger>
         <PopoverContent class="p-2">
@@ -109,9 +144,14 @@ onMounted(() => {
       <!-- Export -->
       <DropdownMenu>
         <DropdownMenuTrigger as-child>
-          <Button variant="outline"
-            class="ml-auto h-[40px] w-[120px] rounded-md border-green-600 text-green-600 hover:bg-green-50">
-            <Icon name="i-lucide-download" class="h-5 w-5" />
+          <Button
+            variant="outline"
+            class="ml-auto h-[40px] w-[120px] rounded-md border-green-600 text-green-600 hover:bg-green-50"
+          >
+            <Icon
+              name="i-lucide-download"
+              class="h-5 w-5"
+            />
             Ekspor
           </Button>
         </DropdownMenuTrigger>
@@ -123,13 +163,20 @@ onMounted(() => {
     </div>
 
     <div class="mt-4">
-      <AppSepList v-if="!isLoading.dataListLoading" :data="data" @update:modelValue="handleRowSelected" />
+      <AppSepList
+        v-if="!isLoading.dataListLoading"
+        :data="dataFiltered"
+        @update:modelValue="handleRowSelected"
+      />
     </div>
 
     <!-- Pagination -->
     <template v-if="paginationMeta">
       <div v-if="paginationMeta.totalPage > 1">
-        <PubMyUiPagination :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+        <PubMyUiPagination
+          :pagination-meta="paginationMeta"
+          @page-change="handlePageChange"
+        />
       </div>
     </template>
 
@@ -142,20 +189,39 @@ onMounted(() => {
         </DialogHeader>
         <DialogDescription class="text-gray-700">Apakah anda yakin ingin menghapus SEP dengan data:</DialogDescription>
         <div class="mt-4 space-y-2 text-sm">
-          <p><strong>No. SEP:</strong> {{ sepData.sepNumber }}</p>
-          <p><strong>No. Kartu BPJS:</strong> {{ sepData.cardNumber }}</p>
-          <p><strong>Nama Pasien:</strong> {{ sepData.patientName }}</p>
+          <p>
+            <strong>No. SEP:</strong>
+            {{ sepData.sepNumber }}
+          </p>
+          <p>
+            <strong>No. Kartu BPJS:</strong>
+            {{ sepData.cardNumber }}
+          </p>
+          <p>
+            <strong>Nama Pasien:</strong>
+            {{ sepData.patientName }}
+          </p>
         </div>
         <DialogFooter class="mt-6 flex justify-end gap-3">
-          <Button variant="outline" class="border-green-600 text-green-600 hover:bg-green-50" @click="() => {
-            recId = 0
-            recAction = ''
-            open = false
-          }">
+          <Button
+            variant="outline"
+            class="border-green-600 text-green-600 hover:bg-green-50"
+            @click="
+              () => {
+                recId = 0
+                recAction = ''
+                open = false
+              }
+            "
+          >
             <X class="mr-1 h-4 w-4" />
             Tidak
           </Button>
-          <Button variant="destructive" class="bg-red-600 hover:bg-red-700" @click="handleRemove">
+          <Button
+            variant="destructive"
+            class="bg-red-600 hover:bg-red-700"
+            @click="handleRemove"
+          >
             <Check class="mr-1 h-4 w-4" />
             Ya
           </Button>
diff --git a/app/components/content/soapi/list.vue b/app/components/content/soapi/list.vue
index a23d8434..6980871c 100644
--- a/app/components/content/soapi/list.vue
+++ b/app/components/content/soapi/list.vue
@@ -71,7 +71,7 @@ onMounted(async () => {
 })
 
 async function getMyList() {
-  const url = `/api/v1/soapi?typeCode=${typeCode.value}&includes=encounter,employee&encounter-id=${route.params.id}`
+  const url = `/api/v1/soapi?type-code=${typeCode.value}&includes=encounter,employee&encounter-id=${route.params.id}`
   const resp = await xfetch(url)
   if (resp.success) {
     data.value = (resp.body as Record<string, any>).data
diff --git a/app/components/pub/my-ui/data-table/data-table.vue b/app/components/pub/my-ui/data-table/data-table.vue
index 408b6d9d..690ac75e 100644
--- a/app/components/pub/my-ui/data-table/data-table.vue
+++ b/app/components/pub/my-ui/data-table/data-table.vue
@@ -110,8 +110,8 @@ function handleActionCellClick(event: Event, _cellRef: string) {
     <TableBody v-else-if="rows.length === 0">
       <TableRow>
         <TableCell
-          :colspan="keys.length"
-          class="py-8 text-center"
+          :colspan="keys.length + 1"
+          class="py-5 text-center"
         >
           <div class="flex items-center justify-center">
             <Info class="size-5 text-muted-foreground" />
diff --git a/app/components/pub/my-ui/data/types.ts b/app/components/pub/my-ui/data/types.ts
index 6338667f..126c5d8d 100644
--- a/app/components/pub/my-ui/data/types.ts
+++ b/app/components/pub/my-ui/data/types.ts
@@ -75,6 +75,7 @@ export interface LinkItem {
   icon?: string
   href?: string // to cover the needs of stating full external origins full url
   action?: string // for local paths
+  groups?: string[]
   onClick?: (event: Event) => void
   headerStatus?: boolean
 }
@@ -89,7 +90,6 @@ export const ActionEvents = {
   showVerify: 'showVerify',
   showConfirmVerify: 'showConfirmVerify',
   showValidate: 'showValidate',
-  showConfirmVerify: 'showConfirmVerify',
   showPrint: 'showPrint',
 }
 
diff --git a/app/components/pub/my-ui/form/file-field.vue b/app/components/pub/my-ui/form/file-field.vue
index 31885a6f..b995ca56 100644
--- a/app/components/pub/my-ui/form/file-field.vue
+++ b/app/components/pub/my-ui/form/file-field.vue
@@ -8,7 +8,7 @@ import { cn } from '~/lib/utils'
 
 import * as DE from '~/components/pub/my-ui/doc-entry'
 
-const props = defineProps<{
+interface Props {
   fieldName: string
   label?: string
   placeholder?: string
@@ -21,6 +21,19 @@ const props = defineProps<{
   isRequired?: boolean
   isDisabled?: boolean
   icons?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  label: '',
+  placeholder: 'Choose file...',
+  maxSizeMb: 1,
+  isDisabled: false,
+  isRequired: false,
+})
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: File | null): void
+  (e: 'fileSelected', file: File | null): void
 }>()
 
 const hintMsg = computed(() => {
@@ -35,7 +48,26 @@ async function onFileChange(event: Event, handleChange: (value: any) => void) {
   const target = event.target as HTMLInputElement
   const file = target.files?.[0]
 
+  if (!file) {
+    handleChange(null)
+    emit('update:modelValue', null)
+    emit('fileSelected', null)
+    return
+  }
+
+  // Validate file size
+  const maxSizeBytes = props.maxSizeMb * 1024 * 1024
+  if (file.size > maxSizeBytes) {
+    console.warn(`File size exceeds ${props.maxSizeMb}MB limit`)
+    handleChange(null)
+    emit('update:modelValue', null)
+    emit('fileSelected', null)
+    return
+  }
+
   handleChange(file)
+  emit('update:modelValue', file)
+  emit('fileSelected', file)
 }
 </script>
 
@@ -62,7 +94,7 @@ async function onFileChange(event: Event, handleChange: (value: any) => void) {
               @change="onFileChange($event, handleChange)"
               type="file"
               :disabled="isDisabled"
-              v-bind="{ onBlur: componentField.onBlur }" 
+              v-bind="{ onBlur: componentField.onBlur }"
               :placeholder="placeholder"
               :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0')"
             />
diff --git a/app/components/pub/my-ui/nav-footer/ba.vue b/app/components/pub/my-ui/nav-footer/ba.vue
index 2b8e7767..c44ec5d1 100644
--- a/app/components/pub/my-ui/nav-footer/ba.vue
+++ b/app/components/pub/my-ui/nav-footer/ba.vue
@@ -1,25 +1,22 @@
 <script setup lang="ts">
+type ClickType = 'back'
+
 const emit = defineEmits<{
-  (e: 'click'): void
+  (e: 'click', type: ClickType): void
 }>()
 
-function onClick() {
-  emit('click')
+function onClick(type: ClickType) {
+  emit('click', type)
 }
 </script>
 
 <template>
   <div class="m-2 flex gap-2 px-2">
-    <Button
-      class="bg-gray-400"
-      type="button"
-      @click="onClick"
-    >
-      <Icon
-        name="i-lucide-arrow-left"
-        class="me-2 align-middle"
-      />
-      Back
-    </Button>
+    <div>
+      <Button variant="ghost"@click="onClick('back')" >
+        <Icon name="i-lucide-arrow-left" class="" />
+        Back
+      </Button>
+    </div>
   </div>
 </template>
diff --git a/app/composables/useQueryCRUD.ts b/app/composables/useQueryCRUD.ts
index f81649bd..655440f6 100644
--- a/app/composables/useQueryCRUD.ts
+++ b/app/composables/useQueryCRUD.ts
@@ -1,6 +1,58 @@
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
+export function useQueryCRUD(modeKey: string = 'mode', recordIdKey: string = 'record-id') {
+  type params = {
+    mode: string,
+    recordId: any
+  }
+
+  const route = useRoute()
+  const router = useRouter()
+
+  const crudQueryParams = computed<params> ({
+    get: () => {
+      return {
+        mode: route.query[modeKey] && route.query[modeKey] === 'entry' ? 'entry' : 'list',
+        recordId: route.query[recordIdKey]
+      }
+    },
+    set: (val) => {
+      router.push({
+        path: route.path,
+        query: {
+          ...route.query,
+          [modeKey]: val.mode,
+          [recordIdKey]: val.recordId,
+        },
+      })
+    },
+  })
+
+  const goToEntry = (myRecord_id?: any) => {
+    if(myRecord_id) {
+      crudQueryParams.value.mode = 'entry'
+      crudQueryParams.value.recordId = myRecord_id
+    } else {
+      crudQueryParams.value.mode = 'entry'
+      crudQueryParams.value.recordId = undefined
+    }
+  }
+
+  const backToList = () => {
+    delete route.query[recordIdKey]
+    router.push({
+      path: route.path,
+      query: {
+        ...route.query,
+        mode: 'list',
+      },
+    })
+  }
+
+  return { crudQueryParams, goToEntry, backToList }
+}
+
 export function useQueryCRUDMode(key: string = 'mode') {
   const route = useRoute()
   const router = useRouter()
diff --git a/app/handlers/encounter-entry.handler.ts b/app/handlers/encounter-entry.handler.ts
index 4d29defb..cc5eda23 100644
--- a/app/handlers/encounter-entry.handler.ts
+++ b/app/handlers/encounter-entry.handler.ts
@@ -8,6 +8,7 @@ import { toast } from '~/components/pub/ui/toast'
 import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
 import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
 import { paymentTypes, sepRefTypeCodes, participantGroups } from '~/lib/constants.vclaim'
+import { genDoctor, type Doctor } from '~/models/doctor'
 
 // Stores
 import { useUserStore } from '~/stores/user'
@@ -17,13 +18,15 @@ import {
   getList as getSpecialistList,
   getValueTreeItems as getSpecialistTreeItems,
 } from '~/services/specialist.service'
-import { getValueLabelList as getDoctorValueLabelList } from '~/services/doctor.service'
+import { getDetail as getDoctorDetail, getValueLabelList as getDoctorValueLabelList } from '~/services/doctor.service'
 import {
   create as createEncounter,
   getDetail as getEncounterDetail,
   update as updateEncounter,
 } 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 {
@@ -59,12 +62,14 @@ export function useEncounterEntry(props: {
   const encounterData = ref<any>(null)
   const formObjects = ref<any>({})
   const isSepValid = ref(false)
+  const isMemberValid = ref(false)
   const isCheckingSep = ref(false)
   const sepNumber = ref('')
   const vclaimReference = ref<any>(null)
-
+  const sepFile = ref<File | null>(null)
+  const sippFile = ref<File | null>(null)
+  const selectedDoctor = ref<Doctor>(genDoctor())
   const isEditMode = computed(() => props.id > 0)
-
   const isSaveDisabled = computed(() => {
     return !selectedPatient.value || !selectedPatientObject.value || isSaving.value || isLoadingDetail.value
   })
@@ -73,15 +78,12 @@ export function useEncounterEntry(props: {
     if (props.classCode === 'ambulatory') {
       return '/ambulatory/encounter'
     }
-    // if (props.classCode === 'ambulatory' && props.subClassCode === 'reg') {
-    //   return '/outpatient/encounter'
-    // }
-    // if (props.classCode === 'emergency') {
-    //   return '/emergency/encounter'
-    // }
-    // if (props.classCode === 'inpatient') {
-    //   return '/inpatient/encounter'
-    // }
+    if (props.classCode === 'emergency') {
+      return '/emergency/encounter'
+    }
+    if (props.classCode === 'inpatient') {
+      return '/inpatient/encounter'
+    }
     return '/encounter'
   }
 
@@ -201,6 +203,34 @@ export function useEncounterEntry(props: {
     return { specialist_id: null, subspecialist_id: null }
   }
 
+  async function getDoctorInfo(value: string) {
+    const resp = await getDoctorDetail(value, { includes: 'unit,specialist,subspecialist' })
+    if (resp.success) {
+      selectedDoctor.value = resp.body.data
+    }
+  }
+
+  async function getValidateMember(member: string) {
+    if (isCheckingSep.value) return
+    isMemberValid.value = false
+    try {
+      const result = await getMemberList({
+        mode: 'by-card',
+        number: member,
+        date: new Date().toISOString().split('T')[0],
+      })
+      if (result.success && result.body?.response !== null) {
+        const response = result.body?.response || {}
+        if (Object.keys(response).length > 0) {
+          formObjects.value.nationalIdentity = response.peserta?.nik || ''
+        }
+        isMemberValid.value = result.body?.metaData?.code === '200'
+      }
+    } catch (error) {
+      console.error('Error checking member:', error)
+    }
+  }
+
   async function getValidateSepNumber(sepNumberValue: string) {
     vclaimReference.value = null
     if (!sepNumberValue || sepNumberValue.trim() === '') {
@@ -220,19 +250,25 @@ export function useEncounterEntry(props: {
           formObjects.value.medicalRecordNumber = response.peserta?.noMr || '-'
           formObjects.value.cardNumber = response.peserta?.noKartu || '-'
           formObjects.value.registerDate = response.tglSep || null
+          formObjects.value.sepReference = response.noSep || '-'
+          formObjects.value.sepControlDate = response.tglSep || null
+          formObjects.value.sepTrafficStatus = response.nmstatusKecelakaan || '-'
+          formObjects.value.diagnosis = response.diagnosa || '-'
           vclaimReference.value = {
             noSep: response.noSep || sepNumberValue.trim(),
             tglRujukan: response.tglSep ? new Date(response.tglSep).toISOString() : null,
             ppkDirujuk: response.noRujukan || 'rssa',
-            jnsPelayanan: response.jnsPelayanan === 'Rawat Jalan' ? '2' : response.jnsPelayanan === 'Rawat Inap' ? '1' : null,
+            jnsPelayanan:
+              response.jnsPelayanan === 'Rawat Jalan' ? '2' : response.jnsPelayanan === 'Rawat Inap' ? '1' : null,
             catatan: response.catatan || '',
             diagRujukan: response.diagnosa || '',
             tipeRujukan: response.tujuanKunj?.kode ?? '0',
             poliRujukan: response.poli || '',
-            user: '',
+            user: userStore.user?.user_name || '',
           }
         }
         isSepValid.value = result.body?.metaData?.code === '200'
+        isMemberValid.value = isSepValid.value
       }
     } catch (error) {
       console.error('Error checking SEP:', error)
@@ -305,7 +341,7 @@ export function useEncounterEntry(props: {
     }
   }
 
-  async function loadEncounterDetail() {
+  async function getFetchEncounterDetail() {
     if (!isEditMode.value || props.id <= 0) {
       return
     }
@@ -313,22 +349,23 @@ export function useEncounterEntry(props: {
     try {
       isLoadingDetail.value = true
       const result = await getEncounterDetail(props.id, {
-        includes: 'patient,patient-person,specialist,subspecialist',
+        includes: 'patient,patient-person,specialist,subspecialist,Appointment_Doctor,EncounterDocuments',
       })
+
       if (result.success && result.body?.data) {
         encounterData.value = result.body.data
         await mapEncounterToForm(encounterData.value)
         isLoadingDetail.value = false
       } else {
+        const errorMsg = result.body?.message || 'Gagal memuat data kunjungan'
         toast({
           title: 'Gagal',
-          description: 'Gagal memuat data kunjungan',
+          description: errorMsg,
           variant: 'destructive',
         })
         await navigateTo(getListPath())
       }
     } catch (error: any) {
-      console.error('Error loading encounter detail:', error)
       toast({
         title: 'Gagal',
         description: error?.message || 'Gagal memuat data kunjungan',
@@ -362,9 +399,10 @@ export function useEncounterEntry(props: {
       formData.medicalRecordNumber = selectedPatientObject.value.number || ''
     }
 
-    const doctorId = encounter.appointment_doctor_id || encounter.responsible_doctor_id
-    if (doctorId) {
-      formData.doctorId = String(doctorId)
+    const doctorCode = encounter.appointment_doctor_code || encounter.responsible_doctor_code
+    if (doctorCode) {
+      formData.doctorCode = String(doctorCode)
+      await getDoctorInfo(doctorCode)
     }
 
     if (encounter.subspecialist_id) {
@@ -390,12 +428,14 @@ export function useEncounterEntry(props: {
     if (encounter.registeredAt) {
       const date = new Date(encounter.registeredAt)
       formData.registerDate = date.toISOString().split('T')[0]
-    } else if (encounter.visitDate) {
+    }
+    if (encounter.visitDate) {
       const date = new Date(encounter.visitDate)
       formData.registerDate = date.toISOString().split('T')[0]
     }
 
     if (encounter.paymentMethod_code) {
+      formData.paymentMethodCode = encounter.paymentMethod_code
       if (encounter.paymentMethod_code === 'insurance') {
         formData.paymentType = 'jkn'
       } else {
@@ -412,7 +452,15 @@ export function useEncounterEntry(props: {
 
     formData.cardNumber = encounter.member_number || ''
     formData.sepNumber = encounter.ref_number || ''
-    formObjects.value = formData
+    formData.sepType = encounter.sep_type || ''
+    formData.patientCategory = encounter.participant_group_code || ''
+
+    // Map BPJS reference data if available
+    if (encounter.vclaimReference) {
+      formData.sepReference = encounter.vclaimReference?.noSep || ''
+    } else if (encounter.ref_number) {
+      formData.sepReference = encounter.ref_number
+    }
 
     if (formData.sepNumber) {
       sepNumber.value = formData.sepNumber
@@ -420,6 +468,8 @@ export function useEncounterEntry(props: {
     if (formData.subSpecialistId) {
       await handleFetchDoctors(formData.subSpecialistId)
     }
+
+    formObjects.value = { ...formData }
   }
 
   async function handleSaveEncounter(formValues: any) {
@@ -434,7 +484,7 @@ export function useEncounterEntry(props: {
 
     try {
       isSaving.value = true
-
+      const isAdmin = false
       const employeeId = userStore.user?.employee_id || userStore.user?.employee?.id || 0
 
       const formatDate = (dateString: string): string => {
@@ -499,19 +549,17 @@ export function useEncounterEntry(props: {
       if (paymentMethodCode === 'insurance') {
         payload.insuranceCompany_id = formValues.insuranceCompany_id ?? null
         if (memberNumber) payload.member_number = memberNumber
-        if (refNumber) payload.ref_number = refNumber
+        // if (refNumber) payload.ref_number = refNumber
         if (formValues.refTypeCode) payload.refTypeCode = formValues.refTypeCode
         if (formValues.vclaimReference) payload.vclaimReference = formValues.vclaimReference
       } else {
         if (paymentMethodCode === 'membership' && memberNumber) {
           payload.member_number = memberNumber
         }
-        if (refNumber) {
-          payload.ref_number = refNumber
-        }
+        // if (refNumber) payload.ref_number = refNumber
       }
 
-      if (props.classCode === 'ambulatory') {
+      if (isAdmin && props.classCode === 'ambulatory') {
         payload.visitMode_code = 'adm'
         payload.allocatedVisitCount = 0
       }
@@ -520,19 +568,35 @@ export function useEncounterEntry(props: {
       if (isEditMode.value) {
         result = await updateEncounter(props.id, payload)
       } else {
+        console.log('💾 [ADD MODE] Sending POST request:', { payload })
         result = await createEncounter(payload)
       }
 
       if (result.success) {
+        console.log(result)
+        console.log(sepFile.value)
+        console.log(sippFile.value)
+        // const encounterId = isEditMode.value ? props.id : result.body?.data?.id
+        if (patientId) {
+          if (sepFile.value) {
+            await uploadAttachment(sepFile.value, patientId, 'vclaim-sep')
+          }
+          if (sippFile.value) {
+            await uploadAttachment(sippFile.value, patientId, 'vclaim-sipp')
+          }
+        }
+
         toast({
           title: 'Berhasil',
           description: isEditMode.value ? 'Kunjungan berhasil diperbarui' : 'Kunjungan berhasil dibuat',
           variant: 'default',
         })
+        console.log('✅ [SAVE] Success - Redirecting to list page')
         await navigateTo(getListPath())
       } else {
         const errorMessage =
           result.body?.message || (isEditMode.value ? 'Gagal memperbarui kunjungan' : 'Gagal membuat kunjungan')
+        console.error('❌ [SAVE] Failed:', errorMessage)
         toast({
           title: 'Gagal',
           description: errorMessage,
@@ -540,7 +604,7 @@ export function useEncounterEntry(props: {
         })
       }
     } catch (error: any) {
-      console.error('Error saving encounter:', error)
+      console.error('❌ [SAVE] Error saving encounter:', error)
       toast({
         title: 'Gagal',
         description: error?.message || (isEditMode.value ? 'Gagal memperbarui kunjungan' : 'Gagal membuat kunjungan'),
@@ -556,6 +620,8 @@ export function useEncounterEntry(props: {
     paymentsList,
     sepsList,
     sepNumber,
+    sepFile,
+    sippFile,
     participantGroupsList,
     specialistsTree,
     doctorsList,
@@ -565,15 +631,17 @@ export function useEncounterEntry(props: {
     encounterData,
     formObjects,
     openPatient,
+    isMemberValid,
     isSepValid,
     isCheckingSep,
     isEditMode,
     isSaveDisabled,
     isLoading,
+    selectedDoctor,
     selectedPatient,
     selectedPatientObject,
     paginationMeta,
-    loadEncounterDetail,
+    getFetchEncounterDetail,
     mapEncounterToForm,
     toKebabCase,
     toNavigateSep,
@@ -585,6 +653,8 @@ export function useEncounterEntry(props: {
     getPatientsList,
     getPatientCurrent,
     getPatientByIdentifierSearch,
+    getDoctorInfo,
+    getValidateMember,
     getValidateSepNumber,
     handleFetchSpecialists,
     handleFetchDoctors,
diff --git a/app/handlers/encounter-init.handler.ts b/app/handlers/encounter-init.handler.ts
index a7f5712d..7c6cc703 100644
--- a/app/handlers/encounter-init.handler.ts
+++ b/app/handlers/encounter-init.handler.ts
@@ -51,6 +51,7 @@ const KfrListAsync = defineAsyncComponent(() => import('~/components/content/kfr
 const PrbListAsync = defineAsyncComponent(() => import('~/components/content/prb/list.vue'))
 const SurgeryReportListAsync = defineAsyncComponent(() => import('~/components/content/surgery-report/list.vue'))
 const VaccineDataListAsync = defineAsyncComponent(() => import('~/components/content/vaccine-data/list.vue'))
+const InitialNursingStudyAsync = defineAsyncComponent(() => import('~/components/content/initial-nursing/entry.vue'))
 
 const defaultKeys: Record<string, any> = {
   status: {
@@ -225,7 +226,7 @@ const defaultKeys: Record<string, any> = {
     title: 'PRB',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
-  },  
+  },
   screening: {
     id: 'screening',
     title: 'Skrinning MPP',
@@ -256,6 +257,12 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  initialNursingStudy: {
+    id: 'initial-nursing-study',
+    title: 'Kajian Awal Keperawatan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
 }
 
 export function getItemsByClassCode(classCode: string, items: EncounterItem[]) {
@@ -432,6 +439,11 @@ export function injectComponents(id: string | number, data: EncounterListData, m
     currentKeys.priceList['props'] = { encounter_id: id }
   }
 
+  if (currentKeys?.initialNursingStudy) {
+    currentKeys.initialNursingStudy['component'] = InitialNursingStudyAsync
+    currentKeys.initialNursingStudy['props'] = { encounter: data?.encounter }
+  }
+
   return currentKeys
 }
 
diff --git a/app/handlers/integration-sep-detail.handler.ts b/app/handlers/integration-sep-detail.handler.ts
new file mode 100644
index 00000000..40e98c72
--- /dev/null
+++ b/app/handlers/integration-sep-detail.handler.ts
@@ -0,0 +1,127 @@
+import { ref, computed } from 'vue'
+import { useRoute } from 'vue-router'
+import { toast } from '~/components/pub/ui/toast'
+import { getList as getSepList } from '~/services/vclaim-sep.service'
+import { getList as getMemberList } from '~/services/vclaim-member.service'
+
+export function useIntegrationSepDetail() {
+  const route = useRoute()
+  const isLoading = ref(false)
+  const sepData = ref<any>(null)
+  const valueObjects = ref<any>({})
+
+  const noSep = computed(() => {
+    return typeof route.params.id === 'string' ? route.params.id : ''
+  })
+
+  async function getSepDetail() {
+    if (!noSep.value) {
+      toast({
+        title: 'Gagal',
+        description: 'No SEP tidak ditemukan di URL',
+        variant: 'destructive',
+      })
+      return
+    }
+
+    try {
+      isLoading.value = true
+      const result = await getSepList({ number: noSep.value })
+
+      if (result.success && result.body?.response) {
+        const response = result.body.response
+        sepData.value = response
+        valueObjects.value = {
+          sepNumber: response.noSep || noSep.value,
+          eSep: response.eSEP === 'True' ? 'yes' : 'no',
+          serviceType:
+            response.jnsPelayanan === 'Rawat Jalan' ? '2' : response.jnsPelayanan === 'Rawat Inap' ? '1' : null,
+          sepDate: response.tglSep ? new Date(response.tglSep).toISOString().split('T')[0] : '',
+          cardNumber: response.peserta?.noKartu || '-',
+          patientName: response.peserta?.nama || '-',
+          phoneNumber: response.peserta?.noTelp || '-',
+          medicalRecordNumber: response.peserta?.noMr || '-',
+          memberInsurance: response.peserta?.asuransi || '-',
+          memberClass: response.peserta?.hakKelas || '-',
+          memberGender: response.peserta?.kelamin || '-',
+          memberBirthDate: response.peserta?.tglLahir || '-',
+          memberType: response.peserta?.jnsPeserta || '-',
+          referralLetterNumber: response.noRujukan || '-',
+          diagnosisName: response.diagnosa || '-',
+          attendingDoctor: response.dpjp?.kdDPJP || '-',
+          attendingDoctorName: response.dpjp?.nmDPJP || '-',
+          polyName: response.poli || '-',
+          cob: response.cob === '1' ? 'yes' : 'no',
+          cataract: response.katarak === '1' ? 'yes' : 'no',
+          clinicExcecutive: response.poliEksekutif === '1' ? 'yes' : 'no',
+          procedureType: response.flagProcedure?.kode || '-',
+          procedureTypeName: response.flagProcedure?.nama || '-',
+          supportCode: response.kdPenunjang?.kode || '-',
+          supportCodeName: response.kdPenunjang?.nama || '-',
+          note: response.catatan || response.informasi || '-',
+          classLevel: response.kelasRawat || '-',
+          classLevelUpgrade: response.klsRawat?.klsRawatNaik || '-',
+          classPaySource: response.klsRawat?.pembiayaan || '-',
+          responsiblePerson: response.klsRawat?.penanggungJawab || response.penjamin || '-',
+          purposeOfVisit: response.tujuanKunj?.kode || '-',
+          purposeOfVisitName: response.tujuanKunj?.nama || '-',
+          serviceAssessment: response.assestmenPel?.kode || '-',
+          serviceAssessmentName: response.assestmenPel?.nama || '-',
+          trafficAccident: response.kdStatusKecelakaan || '',
+          trafficAccidentName: response.nmstatusKecelakaan || '',
+          lpNumber: response.kontrol?.noSurat || '-',
+          accidentDate: response.lokasiKejadian?.tglKejadian || '-',
+          accidentNote: response.lokasiKejadian?.ketKejadian || '-',
+          accidentProvince: response.lokasiKejadian?.kdProp || '-',
+          accidentCity: response.lokasiKejadian?.kdKab || '-',
+          accidentDistrict: response.lokasiKejadian?.kdKec || '-',
+          accidentLocation: response.lokasiKejadian?.lokasi || '-',
+          suplesi: response.jnsPelayanan === 'Rawat Jalan' ? 'yes' : 'no',
+          suplesiNumber: response.jnsPelayanan === 'Rawat Jalan' ? response.noRujukan || '-' : '-',
+          controlLetterNumber: response.kontrol?.noSurat || '-',
+          controlLetterDoctor: response.kontrol?.kdDokter || '-',
+          controlLetterDoctorName: response.kontrol?.nmDokter || '-',
+        }
+        if (valueObjects.value?.cardNumber !== '-') {
+          const resultMember = await getMemberList({
+            mode: 'by-card',
+            number: valueObjects.value.cardNumber,
+            date: new Date().toISOString().substring(0, 10),
+          })
+          if (resultMember && resultMember.success && resultMember.body) {
+            const memberRaws = resultMember.body?.response || null
+            valueObjects.value['nationalIdentity'] = memberRaws?.peserta?.nik || ''
+            valueObjects.value['phoneNumber'] = memberRaws?.peserta?.mr?.noTelepon || ''
+            valueObjects.value['classLevel'] = memberRaws?.peserta?.hakKelas?.kode || ''
+            valueObjects.value['status'] = memberRaws?.statusPeserta?.kode || ''
+          }
+        }
+      } else {
+        toast({
+          title: 'Gagal',
+          description: 'Data SEP tidak ditemukan',
+          variant: 'destructive',
+        })
+        await navigateTo('/integration/bpjs-vclaim/sep')
+      }
+    } catch (error: any) {
+      console.error('Error loading SEP detail:', error)
+      toast({
+        title: 'Gagal',
+        description: error?.message || 'Gagal memuat data SEP',
+        variant: 'destructive',
+      })
+      await navigateTo('/integration/bpjs-vclaim/sep')
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  return {
+    isLoading,
+    noSep,
+    sepData,
+    valueObjects,
+    getSepDetail,
+  }
+}
diff --git a/app/handlers/integration-sep-entry.handler.ts b/app/handlers/integration-sep-entry.handler.ts
index ad267bef..7569980a 100644
--- a/app/handlers/integration-sep-entry.handler.ts
+++ b/app/handlers/integration-sep-entry.handler.ts
@@ -54,6 +54,7 @@ export function useIntegrationSepEntry() {
   const userStore = useUserStore()
   const route = useRoute()
 
+  const recSepId = ref<number | null>(null)
   const openPatient = ref(false)
   const openLetter = ref(false)
   const openHistory = ref(false)
@@ -87,6 +88,7 @@ export function useIntegrationSepEntry() {
   const specialistsTree = ref<TreeItem[]>([])
   const resourceType = ref('')
   const resourcePath = ref('')
+  const encounterId = ref<number | string | null>(null)
 
   /**
    * Map letter data to form fields for save-sep
@@ -176,17 +178,17 @@ export function useIntegrationSepEntry() {
     return mappedValues
   }
 
-  async function getMonitoringHistoryMappers() {
+  async function getMonitoringHistoryMappers(number: string | null = null) {
     histories.value = []
     const dateFirst = new Date()
     const dateLast = new Date()
-    dateLast.setMonth(dateFirst.getMonth() - 3)
+    dateLast.setMonth(dateFirst.getMonth() - 2) // max 90 days
     const cardNumber =
-      selectedPatientObject.value?.person?.residentIdentityNumber || selectedPatientObject.value?.number || ''
+      selectedPatientObject.value?.person?.residentIdentityNumber || selectedPatientObject.value?.number || number || ''
     const result = await getMonitoringHistoryList({
       cardNumber: cardNumber,
-      startDate: dateFirst.toISOString().substring(0, 10),
-      endDate: dateLast.toISOString().substring(0, 10),
+      startDate: dateLast.toISOString().substring(0, 10),
+      endDate: dateFirst.toISOString().substring(0, 10),
     })
     if (result && result.success && result.body) {
       const historiesRaw = result.body?.response?.histori || []
@@ -441,6 +443,10 @@ export function useIntegrationSepEntry() {
     if (menu === 'back') {
       navigateTo('/integration/bpjs-vclaim/sep')
     }
+    if (menu === 'save-sep-number') {
+      const sourcePath = route.query['source-path'] || ('' as any)
+      navigateTo({ path: sourcePath, query: { 'sep-number': value.sepNumber || '' } })
+    }
     if (menu === 'save-sep') {
       isSaveLoading.value = true
 
@@ -481,22 +487,33 @@ export function useIntegrationSepEntry() {
       }
 
       mappedValues.userName = userStore.user?.user_name || ''
+      const payload = { ...makeSepData(mappedValues), encounterId: encounterId.value || null }
 
-      createSep(makeSepData(mappedValues))
+      createSep(payload)
         .then((res) => {
-          const body = res?.body
-          const code = body?.metaData?.code
-          const message = body?.metaData?.message
-          if (code && code !== '200') {
-            toast({ title: 'Gagal', description: message || 'Gagal membuat SEP', variant: 'destructive' })
+          const success = res?.success
+          if (success) {
+            const body = res?.body
+            const code = body?.metaData?.code
+            const message = body?.metaData?.message
+            if (code && code !== '200') {
+              toast({ title: 'Gagal', description: message || 'Gagal membuat SEP', variant: 'destructive' })
+              return
+            }
+            toast({ title: 'Berhasil', description: 'SEP berhasil dibuat', variant: 'default' })
+            if (!!resourcePath.value) {
+              navigateTo({ path: resourcePath.value, query: { 'sep-number': body?.response?.sep?.noSep || '-' } })
+              return
+            }
+            navigateTo('/integration/bpjs-vclaim/sep')
             return
           }
-          toast({ title: 'Berhasil', description: 'SEP berhasil dibuat', variant: 'default' })
-          if (!!resourcePath.value) {
-            navigateTo({ path: resourcePath.value, query: { 'sep-number': body?.response?.sep?.noSep || '-' } })
+          const error = res?.error
+          if (error) {
+            const errorMessage = error?.message ? `${error?.message}` : 'Sep gagal dibuat'
+            toast({ title: 'Gagal', description: errorMessage, variant: 'destructive' })
             return
           }
-          navigateTo('/integration/bpjs-vclaim/sep')
         })
         .catch((err) => {
           console.error('Failed to save SEP:', err)
@@ -609,6 +626,7 @@ export function useIntegrationSepEntry() {
       const queries = route.query as any
       isServiceHidden.value = queries['is-service'] === 'true'
       selectedObjects.value = {}
+      if (queries['encounter-id']) encounterId.value = queries['encounter-id']
       if (queries['resource']) resourceType.value = queries['resource']
       if (queries['source-path']) resourcePath.value = queries['source-path']
       if (queries['doctor-code']) selectedObjects.value['doctorCode'] = queries['doctor-code']
@@ -624,18 +642,18 @@ export function useIntegrationSepEntry() {
         await getPatientInternalMappers(queries['patient-id'])
       }
       if (queries['card-number']) {
-        const resultMember = await getMemberList({
+        await getMemberList({
           mode: 'by-card',
           number: queries['card-number'],
           date: new Date().toISOString().substring(0, 10),
         })
-        console.log(resultMember)
       }
       delete selectedObjects.value['is-service']
     }
   }
 
   return {
+    recSepId,
     openPatient,
     openLetter,
     openHistory,
@@ -669,6 +687,7 @@ export function useIntegrationSepEntry() {
     specialistsTree,
     resourceType,
     resourcePath,
+    encounterId,
     patients,
     selectedPatient,
     paginationMeta,
@@ -687,5 +706,3 @@ export function useIntegrationSepEntry() {
     handleInit,
   }
 }
-
-export default useIntegrationSepEntry
diff --git a/app/handlers/integration-sep-list.handler.ts b/app/handlers/integration-sep-list.handler.ts
index 94cdccce..5deedccd 100644
--- a/app/handlers/integration-sep-list.handler.ts
+++ b/app/handlers/integration-sep-list.handler.ts
@@ -14,7 +14,7 @@ import { getFormatDateId } from '~/lib/date'
 import { downloadCsv, downloadXls } from '~/lib/download'
 import { serviceTypes } from '~/lib/constants.vclaim'
 import { getList as geMonitoringVisitList } from '~/services/vclaim-monitoring-visit.service'
-import { remove as removeSepData, makeSepDataForRemove } from '~/services/vclaim-sep.service'
+import { remove as removeSepData, removeOld as removeSepDataOld, makeSepDataForRemove } from '~/services/vclaim-sep.service'
 
 const headerKeys = [
   'letterDate',
@@ -224,10 +224,11 @@ export function useIntegrationSepList() {
   }
 
   const handleRemove = async () => {
+    const isNew = true;
     try {
-      const result = await removeSepData(
+      const result = !isNew ? await removeSepDataOld(
         makeSepDataForRemove({ ...sepData.value, userName: userStore.user?.user_name }),
-      )
+      ) : await removeSepData(sepData.value.sepNumber || '')
       const backendMessage = result?.body?.message || result?.message || null
       const backendStatus = result?.body?.status || result?.status || null
 
@@ -280,5 +281,3 @@ export function useIntegrationSepList() {
     handleRemove,
   }
 }
-
-export default useIntegrationSepList
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index a1b0ff01..b827ef40 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -344,6 +344,8 @@ export const uploadCode: Record<string, string> = {
   kk: 'person-family-card',
   paspor: 'person-passport',
   'mcu-report': 'mcu-item-result',
+  'vclaim-sep': 'vclaim-sep',
+  'vclaim-sipp': 'vclaim-sipp',
 } as const
 
 export type UploadCodeKey = keyof typeof uploadCode
diff --git a/app/lib/page-checker.ts b/app/lib/page-checker.ts
new file mode 100644
index 00000000..f346f34a
--- /dev/null
+++ b/app/lib/page-checker.ts
@@ -0,0 +1,56 @@
+import type { Permission } from '~/models/role'
+
+export function usePageChecker() {
+  const route = useRoute()
+  const { checkRole, hasCreateAccess, hasReadAccess, hasUpdateAccess, hasDeleteAccess } = useRBAC()
+
+  function getRouteTitle() {
+    return route.meta.title as string
+  }
+
+  function getParamsId() {
+    const id = route.params.id
+    return typeof id === 'string' ? parseInt(id) : 0
+  }
+
+  function getPageAccess(
+    roleAccess: Record<string, Permission[]>,
+    type: 'create' | 'read' | 'update' | 'delete',
+  ) {
+    // Check if user has access to this page, need to use try - catch for proper handling
+    const hasAccess = checkRole(roleAccess)
+    if (!hasAccess) {
+      navigateTo('/403')
+    }
+
+    // Define permission-based computed properties
+    const canCreate = hasCreateAccess(roleAccess)
+    const canRead = hasReadAccess(roleAccess)
+    const canUpdate = hasUpdateAccess(roleAccess)
+    const canDelete = hasDeleteAccess(roleAccess)
+
+    switch (type) {
+      case 'create':
+        return canCreate
+      case 'read':
+        return canRead
+      case 'update':
+        return canUpdate
+      case 'delete':
+        return canDelete
+      default:
+        return false
+    }
+  }
+
+  return {
+    checkRole,
+    hasCreateAccess,
+    hasReadAccess,
+    hasUpdateAccess,
+    hasDeleteAccess,
+    getRouteTitle,
+    getParamsId,
+    getPageAccess
+  }
+}
diff --git a/app/pages/(features)/outpatient/encounter/[id]/detail.vue b/app/pages/(features)/ambulatory/encounter/[id]/detail.vue
similarity index 56%
rename from app/pages/(features)/outpatient/encounter/[id]/detail.vue
rename to app/pages/(features)/ambulatory/encounter/[id]/detail.vue
index 39bc5e13..49a92919 100644
--- a/app/pages/(features)/outpatient/encounter/[id]/detail.vue
+++ b/app/pages/(features)/ambulatory/encounter/[id]/detail.vue
@@ -1,9 +1,19 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/ambulatory'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
+
+// Apps
 import Content from '~/components/content/encounter/detail.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|doc', 'emp|nur', 'emp|reg', 'emp|pha', 'emp|pay', 'emp|mng'],
@@ -11,28 +21,17 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => `${route.meta.title}`,
+  title: () => `${getRouteTitle()}`,
 })
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
 </script>
 
 <template>
-  <div v-if="canRead">
+  <div v-if="hasAccess">
     <Content />
   </div>
   <Error v-else :status-code="403" />
diff --git a/app/pages/(features)/ambulatory/encounter/[id]/edit.vue b/app/pages/(features)/ambulatory/encounter/[id]/edit.vue
index 3c402f32..22e24f52 100644
--- a/app/pages/(features)/ambulatory/encounter/[id]/edit.vue
+++ b/app/pages/(features)/ambulatory/encounter/[id]/edit.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
-// Pubs
-import Error from '~/components/pub/my-ui/error/error.vue'
-
-// Models & Consts
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/ambulatory'
 
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
+import Error from '~/components/pub/my-ui/error/error.vue'
+
 // Apps
 import Content from '~/components/content/encounter/entry.vue'
 
-// Page meta
+const { getParamsId, getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|reg'],
@@ -17,42 +21,25 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
 useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+  title: () => `${getRouteTitle()}`,
 })
 
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]/edit'] || {}
-const { checkRole, hasUpdateAccess } = useRBAC()
-
-// Check if user has access to this page, need to use try - catch for proper handling
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
-
-// Get encounter ID from route params
-const encounter_id = computed(() => {
-  const id = route.params.id
-  return typeof id === 'string' ? parseInt(id) : 0
-})
-
-// User info
+const hasAccess = getPageAccess(roleAccess, 'update')
+const encounterId = getParamsId()
 const { user } = useUserStore()
 const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
 </script>
 
 <template>
-  <div v-if="canUpdate">
+  <div v-if="hasAccess">
     <Content
-      :id="encounter_id"
+      :id="encounterId"
       class-code="ambulatory"
       :sub-class-code="subClassCode"
-      form-type="Edit"
+      form-type="edit"
     />
   </div>
   <Error
@@ -60,4 +47,3 @@ const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
     :status-code="403"
   />
 </template>
-
diff --git a/app/pages/(features)/ambulatory/encounter/[id]/index.vue b/app/pages/(features)/ambulatory/encounter/[id]/index.vue
deleted file mode 100644
index d9609b24..00000000
--- a/app/pages/(features)/ambulatory/encounter/[id]/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<script setup lang="ts">
-// Pubs
-import Error from '~/components/pub/my-ui/error/error.vue'
-
-// Models & Consts
-import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/ambulatory'
-import { medicalRoles } from '~/const/common/role'
-
-// Page meta
-definePageMeta({
-  middleware: ['rbac'],
-  roles: medicalRoles,
-  title: 'Detail Kunjungan',
-  contentFrame: 'cf-container-md',
-})
-
-// Define common things
-const route = useRoute()
-
-// Prep role checking
-const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-useHead({
-  title: () => route.meta.title as string,
-})
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentOutpatientEncounterDetail :patient-id="Number(route.params.id)" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/ambulatory/encounter/[id]/process.vue b/app/pages/(features)/ambulatory/encounter/[id]/process.vue
index cf905f9f..0efe207d 100644
--- a/app/pages/(features)/ambulatory/encounter/[id]/process.vue
+++ b/app/pages/(features)/ambulatory/encounter/[id]/process.vue
@@ -1,45 +1,43 @@
 <script setup lang="ts">
+// Types & Consts
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/ambulatory'
+
+// Helpers
+import { usePageChecker } from '~/lib/page-checker'
+
 // Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
 
-// AppS
-import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/ambulatory'
+// Apps
 import Content from '~/components/content/encounter/process.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|doc', 'emp|nur', 'emp|miw', 'emp|nut', 'emp|lab', 'emp|pha', 'emp|thr'],
   title: 'Proses Kunjungan',
   contentFrame: 'cf-full-width',
   contentPadding: 'p-0',
-  contentUseCard: false
+  contentUseCard: false,
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
 })
 
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]/process'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
-useHead({
-  title: () => `${route.meta.title}`,
-})
-
+const hasAccess = getPageAccess(roleAccess, 'read')
 </script>
 
 <template>
-  <div v-if="canRead">
+  <div v-if="hasAccess">
     <Content class-code="ambulatory" />
   </div>
-  <Error v-else :status-code="403" />
+  <Error
+    v-else
+    :status-code="403"
+  />
 </template>
diff --git a/app/pages/(features)/ambulatory/encounter/add.vue b/app/pages/(features)/ambulatory/encounter/add.vue
index 0831723f..89b9e6fb 100644
--- a/app/pages/(features)/ambulatory/encounter/add.vue
+++ b/app/pages/(features)/ambulatory/encounter/add.vue
@@ -1,10 +1,19 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/ambulatory'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
 
+// Apps
 import Content from '~/components/content/encounter/entry.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|reg'],
@@ -12,36 +21,22 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/add'] || {}
-const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/add'] || {}
+const hasAccess = getPageAccess(roleAccess, 'create')
 </script>
 
 <template>
-  <div v-if="canCreate">
+  <div v-if="hasAccess">
     <Content
       :id="0"
       class-code="ambulatory"
       sub-class-code="reg"
-      form-type="Tambah"
+      form-type="add"
     />
   </div>
   <Error
diff --git a/app/pages/(features)/ambulatory/encounter/index.vue b/app/pages/(features)/ambulatory/encounter/index.vue
index 99f3db06..6f7df89c 100644
--- a/app/pages/(features)/ambulatory/encounter/index.vue
+++ b/app/pages/(features)/ambulatory/encounter/index.vue
@@ -1,41 +1,39 @@
 <script setup lang="ts">
-// Pubs
-import Error from '~/components/pub/my-ui/error/error.vue'
-
-// Models & Consts
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/ambulatory'
 
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
+import Error from '~/components/pub/my-ui/error/error.vue'
+
 // Apps
 import Content from '~/components/content/encounter/list.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 // Page meta
 definePageMeta({
-  // middleware: ['rbac'],
-  // roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
+  middleware: ['rbac'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
 // Define common things
 const route = useRoute()
 
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions[route.path] || {}
-const { checkRole, hasCreateAccess, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-const canRead = hasReadAccess(roleAccess)
-if (!hasAccess || !canRead) {
-  navigateTo('/403')
-}
-const canCreate = hasCreateAccess(roleAccess)
-
-// Page needs
-useHead({
-  title: () => route.meta.title as string,
-})
+const hasAccess = getPageAccess(roleAccess, 'read')
+const canCreate = getPageAccess(roleAccess, 'create')
+const canRemove = getPageAccess(roleAccess, 'delete')
 
 // User info
 const { user } = useUserStore()
@@ -44,11 +42,12 @@ const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
 
 <template>
   <div>
-    <div v-if="canRead">
+    <div v-if="hasAccess">
       <Content
         class-code="ambulatory"
         :sub-class-code="subClassCode"
         :can-create="canCreate"
+        :can-delete="canRemove"
       />
     </div>
     <Error
diff --git a/app/pages/(features)/emergency/encounter/[id]/detail.vue b/app/pages/(features)/emergency/encounter/[id]/detail.vue
index 77babf09..70a111c9 100644
--- a/app/pages/(features)/emergency/encounter/[id]/detail.vue
+++ b/app/pages/(features)/emergency/encounter/[id]/detail.vue
@@ -1,9 +1,19 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/emergency'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
+
+// Apps
 import Content from '~/components/content/encounter/detail.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|doc', 'emp|nur', 'emp|reg', 'emp|pha', 'emp|pay', 'emp|mng'],
@@ -11,28 +21,17 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => `${route.meta.title}`,
+  title: () => `${getRouteTitle()}`,
 })
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter/[id]'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
 </script>
 
 <template>
-  <div v-if="canRead">
+  <div v-if="hasAccess">
     <Content />
   </div>
   <Error v-else :status-code="403" />
diff --git a/app/pages/(features)/emergency/encounter/[id]/edit.vue b/app/pages/(features)/emergency/encounter/[id]/edit.vue
index 92d263d7..721be7f8 100644
--- a/app/pages/(features)/emergency/encounter/[id]/edit.vue
+++ b/app/pages/(features)/emergency/encounter/[id]/edit.vue
@@ -1,51 +1,43 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+// Types & Consts
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/emergency'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+// Apps
+import Content from '~/components/content/encounter/entry.vue'
+
+const { getParamsId, getRouteTitle, getPageAccess } = usePageChecker()
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Edit Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
 useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+  title: () => `${getRouteTitle()}`,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/emergency/encounter']
-
-const { checkRole, hasUpdateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
-
-// Get encounter ID from route params
-const encounterId = computed(() => {
-  const id = route.params.id
-  return typeof id === 'string' ? parseInt(id) : 0
-})
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter/[id]/edit'] || {}
+const hasAccess = getPageAccess(roleAccess, 'update')
+const encounterId = getParamsId()
 </script>
 
 <template>
-  <div v-if="canUpdate">
-    <ContentEncounterEntry
+  <div v-if="hasAccess">
+    <Content
       :id="encounterId"
       class-code="emergency"
       sub-class-code="emg"
-      form-type="Edit"
+      form-type="edit"
     />
   </div>
   <Error
@@ -53,4 +45,3 @@ const encounterId = computed(() => {
     :status-code="403"
   />
 </template>
-
diff --git a/app/pages/(features)/emergency/encounter/[id]/process.vue b/app/pages/(features)/emergency/encounter/[id]/process.vue
index 31065c11..927ea20e 100644
--- a/app/pages/(features)/emergency/encounter/[id]/process.vue
+++ b/app/pages/(features)/emergency/encounter/[id]/process.vue
@@ -1,39 +1,43 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/emergency'
+
+// Helpers
+import { usePageChecker } from '~/lib/page-checker'
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
+
+// Apps
 import Content from '~/components/content/encounter/process.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Kunjungan',
+  roles: ['emp|doc', 'emp|nur', 'emp|miw', 'emp|nut', 'emp|lab', 'emp|pha', 'emp|thr'],
+  title: 'Proses Kunjungan',
   contentFrame: 'cf-full-width',
+  contentPadding: 'p-0',
+  contentUseCard: false,
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
 })
 
 // Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
-useHead({
-  title: () => `${route.meta.title}`,
-})
+const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter/[id]/process'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
 </script>
 
 <template>
-  <div v-if="canRead">
-    <Content class-code="emergency" sub-class-code="emg" />
+  <div v-if="hasAccess">
+    <Content class-code="emergency" />
   </div>
-  <Error v-else :status-code="403" />
+  <Error
+    v-else
+    :status-code="403"
+  />
 </template>
diff --git a/app/pages/(features)/emergency/encounter/add.vue b/app/pages/(features)/emergency/encounter/add.vue
index d3ac86b7..234bc8a4 100644
--- a/app/pages/(features)/emergency/encounter/add.vue
+++ b/app/pages/(features)/emergency/encounter/add.vue
@@ -1,10 +1,19 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/ambulatory'
+import { permissions } from '~/const/page-permission/emergency'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
 
+// Apps
 import Content from '~/components/content/encounter/entry.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|reg'],
@@ -12,36 +21,22 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter/add'] || {}
+const hasAccess = getPageAccess(roleAccess, 'create')
 </script>
 
 <template>
-  <div v-if="canCreate">
+  <div v-if="hasAccess">
     <Content
       :id="0"
       class-code="emergency"
-      sub-class-code="reg"
-      form-type="Tambah"
+      sub-class-code="emg"
+      form-type="add"
     />
   </div>
   <Error
diff --git a/app/pages/(features)/emergency/encounter/index.vue b/app/pages/(features)/emergency/encounter/index.vue
index bc83f3f2..197a305e 100644
--- a/app/pages/(features)/emergency/encounter/index.vue
+++ b/app/pages/(features)/emergency/encounter/index.vue
@@ -1,10 +1,20 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/emergency'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
 
+// Apps
 import Content from '~/components/content/encounter/list.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
+// Page meta
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
@@ -12,36 +22,28 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const route = useRoute()
-const roleAccess: Record<string, Permission[]> = permissions[route.path] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-const { user } = useUserStore()
-const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+// Define common things
+const route = useRoute()
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions[route.path] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+const canCreate = getPageAccess(roleAccess, 'create')
+const canRemove = getPageAccess(roleAccess, 'delete')
 </script>
 
 <template>
   <div>
-    <div v-if="canRead">
+    <div v-if="hasAccess">
       <Content
         class-code="emergency"
-        :sub-class-code="subClassCode"
-        type="encounter"
+        sub-class-code="emg"
+        :can-create="canCreate"
+        :can-delete="canRemove"
       />
     </div>
     <Error
diff --git a/app/pages/(features)/inpatient/encounter/[id]/detail.vue b/app/pages/(features)/inpatient/encounter/[id]/detail.vue
index 45751701..c68961a6 100644
--- a/app/pages/(features)/inpatient/encounter/[id]/detail.vue
+++ b/app/pages/(features)/inpatient/encounter/[id]/detail.vue
@@ -1,9 +1,19 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/inpatient'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
+
+// Apps
 import Content from '~/components/content/encounter/detail.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|doc', 'emp|nur', 'emp|reg', 'emp|pha', 'emp|pay', 'emp|mng'],
@@ -11,28 +21,17 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => `${route.meta.title}`,
+  title: () => `${getRouteTitle()}`,
 })
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter/[id]'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
 </script>
 
 <template>
-  <div v-if="canRead">
+  <div v-if="hasAccess">
     <Content />
   </div>
   <Error v-else :status-code="403" />
diff --git a/app/pages/(features)/inpatient/encounter/[id]/edit.vue b/app/pages/(features)/inpatient/encounter/[id]/edit.vue
index 2df3d4f6..4957d480 100644
--- a/app/pages/(features)/inpatient/encounter/[id]/edit.vue
+++ b/app/pages/(features)/inpatient/encounter/[id]/edit.vue
@@ -1,51 +1,43 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+// Types & Consts
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/inpatient'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+// Apps
+import Content from '~/components/content/encounter/entry.vue'
+
+const { getParamsId, getRouteTitle, getPageAccess } = usePageChecker()
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Edit Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
 useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+  title: () => `${getRouteTitle()}`,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/inpatient/encounter']
-
-const { checkRole, hasUpdateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
-}
-
-// Define permission-based computed properties
-const canUpdate = hasUpdateAccess(roleAccess)
-
-// Get encounter ID from route params
-const encounterId = computed(() => {
-  const id = route.params.id
-  return typeof id === 'string' ? parseInt(id) : 0
-})
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter/[id]/edit'] || {}
+const hasAccess = getPageAccess(roleAccess, 'update')
+const encounterId = getParamsId()
 </script>
 
 <template>
-  <div v-if="canUpdate">
-    <ContentEncounterEntry
+  <div v-if="hasAccess">
+    <Content
       :id="encounterId"
       class-code="inpatient"
-      sub-class-code="icu"
-      form-type="Edit"
+      sub-class-code="vk"
+      form-type="edit"
     />
   </div>
   <Error
@@ -53,4 +45,3 @@ const encounterId = computed(() => {
     :status-code="403"
   />
 </template>
-
diff --git a/app/pages/(features)/inpatient/encounter/[id]/process.vue b/app/pages/(features)/inpatient/encounter/[id]/process.vue
index 7a59f42b..4f985765 100644
--- a/app/pages/(features)/inpatient/encounter/[id]/process.vue
+++ b/app/pages/(features)/inpatient/encounter/[id]/process.vue
@@ -1,39 +1,43 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/inpatient'
+
+// Helpers
+import { usePageChecker } from '~/lib/page-checker'
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
+
+// Apps
 import Content from '~/components/content/encounter/process.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Kunjungan',
+  roles: ['emp|doc', 'emp|nur', 'emp|miw', 'emp|nut', 'emp|lab', 'emp|pha', 'emp|thr'],
+  title: 'Proses Kunjungan',
   contentFrame: 'cf-full-width',
+  contentPadding: 'p-0',
+  contentUseCard: false,
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
 })
 
 // Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
-useHead({
-  title: () => `${route.meta.title}`,
-})
+const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter/[id]/process'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
 </script>
 
 <template>
-  <div v-if="canRead">
-    <Content class-code="inpatient" sub-class-code="vk" />
+  <div v-if="hasAccess">
+    <Content class-code="inpatient" />
   </div>
-  <Error v-else :status-code="403" />
+  <Error
+    v-else
+    :status-code="403"
+  />
 </template>
diff --git a/app/pages/(features)/inpatient/encounter/add.vue b/app/pages/(features)/inpatient/encounter/add.vue
index e2812253..2d75d7d6 100644
--- a/app/pages/(features)/inpatient/encounter/add.vue
+++ b/app/pages/(features)/inpatient/encounter/add.vue
@@ -1,10 +1,19 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/ambulatory'
+import { permissions } from '~/const/page-permission/inpatient'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
 
+// Apps
 import Content from '~/components/content/encounter/entry.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|reg'],
@@ -12,36 +21,22 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
-const { checkRole, hasReadAccess, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-// Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter/add'] || {}
+const hasAccess = getPageAccess(roleAccess, 'create')
 </script>
 
 <template>
-  <div v-if="canCreate">
+  <div v-if="hasAccess">
     <Content
       :id="0"
-      class-code="ambulatory"
-      sub-class-code="reg"
-      form-type="Tambah"
+      class-code="inpatient"
+      sub-class-code="vk"
+      form-type="add"
     />
   </div>
   <Error
diff --git a/app/pages/(features)/inpatient/encounter/index.vue b/app/pages/(features)/inpatient/encounter/index.vue
index ad73d029..189b2611 100644
--- a/app/pages/(features)/inpatient/encounter/index.vue
+++ b/app/pages/(features)/inpatient/encounter/index.vue
@@ -1,10 +1,20 @@
 <script setup lang="ts">
+// Types & Consts
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/inpatient'
+
+// Helpers
+import { usePageChecker } from "~/lib/page-checker"
+
+// Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
 
+// Apps
 import Content from '~/components/content/encounter/list.vue'
 
+const { getRouteTitle, getPageAccess } = usePageChecker()
+
+// Page meta
 definePageMeta({
   middleware: ['rbac'],
   roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
@@ -12,37 +22,28 @@ definePageMeta({
   contentFrame: 'cf-full-width',
 })
 
-// Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter'] || {}
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-
-// Page needs
-const route = useRoute()
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-const { user } = useUserStore()
-const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+// Define common things
+const route = useRoute()
 
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions[route.path] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+const canCreate = getPageAccess(roleAccess, 'create')
+const canRemove = getPageAccess(roleAccess, 'delete')
 </script>
 
 <template>
   <div>
-    <div v-if="canRead">
+    <div v-if="hasAccess">
       <Content
         class-code="inpatient"
-        :sub-class-code="subClassCode"
-        type="encounter"
+        sub-class-code="vk"
+        :can-create="canCreate"
+        :can-delete="canRemove"
       />
     </div>
     <Error
diff --git a/app/pages/(features)/integration/bpjs-vclaim/sep/[id]/detail.vue b/app/pages/(features)/integration/bpjs-vclaim/sep/[id]/detail.vue
new file mode 100644
index 00000000..7e9f4bcf
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs-vclaim/sep/[id]/detail.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import Error from '~/components/pub/my-ui/error/error.vue'
+import Content from '~/components/content/sep/entry.vue'
+
+definePageMeta({
+  middleware: [],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail SEP',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const canCreate = true 
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <Content mode="detail" />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
diff --git a/app/pages/(features)/integration/bpjs-vclaim/sep/[id]/link.vue b/app/pages/(features)/integration/bpjs-vclaim/sep/[id]/link.vue
new file mode 100644
index 00000000..c2f28e7b
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs-vclaim/sep/[id]/link.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import Error from '~/components/pub/my-ui/error/error.vue'
+import Content from '~/components/content/sep/entry.vue'
+
+definePageMeta({
+  middleware: [],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail SEP',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const canCreate = true 
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <Content mode="link" />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
diff --git a/app/pages/(features)/integration/bpjs-vclaim/sep/add.vue b/app/pages/(features)/integration/bpjs-vclaim/sep/add.vue
index 0658780b..0adf6527 100644
--- a/app/pages/(features)/integration/bpjs-vclaim/sep/add.vue
+++ b/app/pages/(features)/integration/bpjs-vclaim/sep/add.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import Content from '~/components/content/sep/entry.vue'
 
 definePageMeta({
   middleware: [],
@@ -16,26 +15,12 @@ useHead({
   title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
+const canCreate = true 
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentSepEntry />
+    <Content mode="add" />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/integration/bpjs-vclaim/sep/index.vue b/app/pages/(features)/integration/bpjs-vclaim/sep/index.vue
index d99dbb5d..d5faaa8a 100644
--- a/app/pages/(features)/integration/bpjs-vclaim/sep/index.vue
+++ b/app/pages/(features)/integration/bpjs-vclaim/sep/index.vue
@@ -1,12 +1,11 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import Content from '~/components/content/sep/list.vue'
 
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar User',
+  title: 'Daftar SEP',
   contentFrame: 'cf-full-width',
 })
 
@@ -16,24 +15,13 @@ useHead({
   title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
+const canRead = true
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentSepList />
+      <Content />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/schemas/integration-encounter.schema.ts b/app/schemas/integration-encounter.schema.ts
index b141f912..f2c8dfce 100644
--- a/app/schemas/integration-encounter.schema.ts
+++ b/app/schemas/integration-encounter.schema.ts
@@ -53,8 +53,7 @@ const IntegrationEncounterSchema = z
       .min(1, ERROR_MESSAGES.required.sepType)
       .optional(),
     sepNumber: z
-      .string()
-      .min(1, ERROR_MESSAGES.required.sepNumber)
+      .string({ required_error: ERROR_MESSAGES.required.sepNumber })
       .optional(),
 
     // File uploads
diff --git a/app/schemas/soapi.schema.ts b/app/schemas/soapi.schema.ts
index 2f5f8667..1d4faaba 100644
--- a/app/schemas/soapi.schema.ts
+++ b/app/schemas/soapi.schema.ts
@@ -153,6 +153,32 @@ export const ObjectSchema = z.object({
   'head-to-toe': z.record(z.string()).default({}),
 })
 
+export const InitialNursingSchema = z.object({
+  'pri-complain': z.string().default(''),
+  'med-type': z.string().default(''),
+  'med-name': z.string().default(''),
+  'med-reaction': z.string().default(''),
+  'food-type': z.string().default(''),
+  'food-name': z.string().default(''),
+  'food-reaction': z.string().default(''),
+  'other-type': z.string().default(''),
+  'other-name': z.string().default(''),
+  'other-reaction': z.string().default(''),
+  'pain-asst': z.string().default(''),
+  'pain-scale': z.string().default(''),
+  'pain-time': z.string().default(''),
+  'pain-duration': z.string().default(''),
+  'pain-freq': z.string().default(''),
+  'pain-loc': z.string().default(''),
+  'nut-screening': z.string().default(''),
+  'spiritual-asst': z.string().default(''),
+  'general-condition': z.string().default(''),
+  'support-exam': z.string().default(''),
+  'risk-fall': z.string().default(''),
+  bracelet: z.string().default(''),
+  'bracelet-alg': z.string().default(''),
+})
+
 const AssessmentSchema = z.object({
   'early-diag': AssessmentSectionSchema,
   'late-diag': AssessmentSectionSchema,
diff --git a/app/services/_crud-base.ts b/app/services/_crud-base.ts
index c9a0f013..8adb4a60 100644
--- a/app/services/_crud-base.ts
+++ b/app/services/_crud-base.ts
@@ -5,6 +5,9 @@ export async function create(path: string, data: any, name: string = 'item') {
     const resp = await xfetch(path, 'POST', data)
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
@@ -29,6 +32,9 @@ export async function getList(path: string, params: any = null, name: string = '
     const resp = await xfetch(url, 'GET')
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
@@ -53,6 +59,9 @@ export async function getDetail(path: string, id: number | string, name: string
     const resp = await xfetch(`${path}/${id}${paramStr}`, 'GET')
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
@@ -66,6 +75,9 @@ export async function update(path: string, id: number | string, data: any, name:
     const resp = await xfetch(`${path}/${id}`, 'PATCH', data)
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
@@ -79,6 +91,9 @@ export async function updateCustom(path: string, data: any, name: string = 'item
     const resp = await xfetch(`${path}`, 'PATCH', data)
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
@@ -92,6 +107,9 @@ export async function remove(path: string, id: number | string, name: string = '
     const resp = await xfetch(`${path}/${id}`, 'DELETE')
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
@@ -105,6 +123,9 @@ export async function removeCustom(path: string, data: any, name: string = 'item
     const resp = await xfetch(`${path}`, 'DELETE', data)
     const result: any = {}
     result.success = resp.success
+    if (resp.status_code !== 200) {
+      result.error = { ...resp.error }
+    }
     result.body = (resp.body as Record<string, any>) || {}
     return result
   } catch (error) {
diff --git a/app/services/vclaim-control-letter.service.ts b/app/services/vclaim-control-letter.service.ts
index 2c638c2e..5ab16811 100644
--- a/app/services/vclaim-control-letter.service.ts
+++ b/app/services/vclaim-control-letter.service.ts
@@ -1,11 +1,12 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim-swagger/RencanaKontrol'
-const name = 'rencana-kontrol'
+const path = '/api/v1/control-plan'
+const pathOld = '/api/v1/rencana-kontrol'
+const name = 'control-plan' // 'rencana-kontrol'
 
-export function getList(params: any = null) {
-  let url = path
+export function getListOld(params: any = null) {
+  let url = pathOld
   if (params?.letterNumber && params.mode === 'by-control') {
     url += `/noSuratKontrol/${params.letterNumber}`
   }
@@ -26,4 +27,19 @@ export function getList(params: any = null) {
     delete params.mode
   }
   return base.getList(url, params, name)
-}
\ No newline at end of file
+}
+
+export function getList(params: any = null) {
+  let url = path
+  if (params?.controlDate && params.mode === 'by-schedule') {
+    url += `/${params.controlType}/${params.polyCode}/${params.controlDate}`
+    delete params.controlType
+    delete params.controlDate
+    delete params.polyCode
+  }
+  if (params) {
+    delete params.letterNumber
+    delete params.mode
+  }
+  return base.getList(url, params, name)
+}
diff --git a/app/services/vclaim-diagnose-referral.service.ts b/app/services/vclaim-diagnose-referral.service.ts
index 34b94780..a878c288 100644
--- a/app/services/vclaim-diagnose-referral.service.ts
+++ b/app/services/vclaim-diagnose-referral.service.ts
@@ -1,9 +1,10 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/diagnose-prb'
+const path = '/api/v1/reference/diagnose-prb'
 const name = 'diagnose-referral'
 
 export function getList(params: any = null) {
-  return base.getList(path, params, name)
+  const url = path
+  return base.getList(url, params, name)
 }
diff --git a/app/services/vclaim-diagnose.service.ts b/app/services/vclaim-diagnose.service.ts
index a676f516..ad510ebd 100644
--- a/app/services/vclaim-diagnose.service.ts
+++ b/app/services/vclaim-diagnose.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/diagnose'
+const path = '/api/v1/reference/diagnose'
 const name = 'diagnose'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-doctor.service.ts b/app/services/vclaim-doctor.service.ts
index 0d5ec9dc..7f470862 100644
--- a/app/services/vclaim-doctor.service.ts
+++ b/app/services/vclaim-doctor.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/responsible-doctor'
+const path = '/api/v1/reference/responsible-doctor'
 const name = 'responsible-doctor'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-healthcare.service.ts b/app/services/vclaim-healthcare.service.ts
index 09cc0089..48474715 100644
--- a/app/services/vclaim-healthcare.service.ts
+++ b/app/services/vclaim-healthcare.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/healthcare'
+const path = '/api/v1/reference/healthcare'
 const name = 'healthcare'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-medicine.service.ts b/app/services/vclaim-medicine.service.ts
index 15a42050..ec91c503 100644
--- a/app/services/vclaim-medicine.service.ts
+++ b/app/services/vclaim-medicine.service.ts
@@ -1,11 +1,12 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/medicine'
+const path = '/api/v1/reference/medicine'
 const name = 'medicine'
 
 export function getList(params: any = null) {
-  return base.getList(path, params, name)
+  const url = path
+  return base.getList(url, params, name)
 }
 
 export async function getValueLabelList(params: any = null): Promise<{ value: string; label: string }[]> {
diff --git a/app/services/vclaim-member.service.ts b/app/services/vclaim-member.service.ts
index bbe054ec..f5b78bb5 100644
--- a/app/services/vclaim-member.service.ts
+++ b/app/services/vclaim-member.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/member'
+const path = '/api/v1/member'
 const name = 'member'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-monitoring-history.service.ts b/app/services/vclaim-monitoring-history.service.ts
index ac9f2113..bc66f7f6 100644
--- a/app/services/vclaim-monitoring-history.service.ts
+++ b/app/services/vclaim-monitoring-history.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/monitoring/hist'
+const path = '/api/v1/monitoring/hist'
 const name = 'monitoring-history'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-monitoring-visit.service.ts b/app/services/vclaim-monitoring-visit.service.ts
index 6004673e..ea1807e2 100644
--- a/app/services/vclaim-monitoring-visit.service.ts
+++ b/app/services/vclaim-monitoring-visit.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/monitoring/visit'
+const path = '/api/v1/monitoring/visit'
 const name = 'monitoring-visit'
 
 export async function getList(params: any = null) {
diff --git a/app/services/vclaim-reference-hospital-letter.service.ts b/app/services/vclaim-reference-hospital-letter.service.ts
index 115f6558..4e0b01ad 100644
--- a/app/services/vclaim-reference-hospital-letter.service.ts
+++ b/app/services/vclaim-reference-hospital-letter.service.ts
@@ -1,8 +1,8 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim-swagger/Rujukan/RS'
-const name = 'rujukan-rumah-sakit'
+const path = '/api/v1/referral'
+const name = 'reference-hospital-letter' // 'rujukan-rumah-sakit'
 
 export function getList(params: any = null) {
   let url = path
@@ -13,4 +13,4 @@ export function getList(params: any = null) {
     delete params.letterNumber
   }
   return base.getList(url, params, name)
-}
\ No newline at end of file
+}
diff --git a/app/services/vclaim-reference-letter.service.ts b/app/services/vclaim-reference-letter.service.ts
index 0a721d19..55aa8102 100644
--- a/app/services/vclaim-reference-letter.service.ts
+++ b/app/services/vclaim-reference-letter.service.ts
@@ -13,4 +13,4 @@ export function getList(params: any = null) {
     delete params.letterNumber
   }
   return base.getList(url, params, name)
-}
\ No newline at end of file
+}
diff --git a/app/services/vclaim-region-city.service.ts b/app/services/vclaim-region-city.service.ts
index 4ebfca20..78ed090c 100644
--- a/app/services/vclaim-region-city.service.ts
+++ b/app/services/vclaim-region-city.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/regency'
+const path = '/api/v1/reference/regency'
 const name = 'cities'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-region-district.service.ts b/app/services/vclaim-region-district.service.ts
index 0b0585a8..7bf33891 100644
--- a/app/services/vclaim-region-district.service.ts
+++ b/app/services/vclaim-region-district.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/district'
+const path = '/api/v1/reference/district'
 const name = 'districts'
 
 export function getList(params: any = null) {
diff --git a/app/services/vclaim-region-province.service.ts b/app/services/vclaim-region-province.service.ts
index 5d58bb26..f72f26cc 100644
--- a/app/services/vclaim-region-province.service.ts
+++ b/app/services/vclaim-region-province.service.ts
@@ -1,11 +1,12 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/province'
+const path = '/api/v1/reference/province'
 const name = 'provinces'
 
 export function getList(params: any = null) {
-  return base.getList(path, params, name)
+  const url = path
+  return base.getList(url, params, name)
 }
 
 export async function getValueLabelList(params: any = null): Promise<{ value: string; label: string }[]> {
diff --git a/app/services/vclaim-sep.service.ts b/app/services/vclaim-sep.service.ts
index 93224a4a..d432cdfd 100644
--- a/app/services/vclaim-sep.service.ts
+++ b/app/services/vclaim-sep.service.ts
@@ -4,18 +4,32 @@ import * as base from './_crud-base'
 // Types
 import type { IntegrationBpjsFormData } from '~/schemas/integration-bpjs.schema'
 
-const path = '/api/vclaim-swagger/sep'
+const path = '/api/v1/vclaim-sep'
+const pathOld = '/api/vclaim-swagger/sep'
 const name = 'sep'
 
 // TODO: temporary destinationClinic
 const destinationClinic = '1323R001'
 
 export function create(data: any) {
-  return base.create(path, data, name)
+  const isNew = true
+  let url = !isNew ? pathOld : path
+  let payload: any = data
+  if (isNew && data?.encounterId) {
+    payload = {
+      encounter_id: Number(data.encounterId) || 0,
+      requestPayload: data?.request ? JSON.stringify({ request: data.request }) : null,
+    }
+  } else {
+    url = pathOld
+    delete payload.encounterId
+  }
+  return base.create(url, payload, name)
 }
 
 export function getList(params: any = null) {
-  let url = path
+  const isNew = true
+  let url = !isNew ? pathOld : path
   if (params?.number) {
     url += `/${params.number}`
     delete params.number
@@ -24,12 +38,18 @@ export function getList(params: any = null) {
 }
 
 export function getDetail(id: number | string) {
-  return base.getDetail(path, id, name)
+  const isNew = true
+  const url = !isNew ? pathOld : path
+  return base.getDetail(url, id, name)
 }
 
-export function remove(payload: any) {
-  const url = `${path}`
-  return base.removeCustom(url, payload, name)
+export function remove(id: string) {
+  const url = `${path}/${id}`
+  return base.removeCustom(url, {}, name)
+}
+
+export function removeOld(payload: any) {
+  return base.removeCustom(pathOld, payload, name)
 }
 
 export function makeSepData(
diff --git a/app/services/vclaim-unit.service.ts b/app/services/vclaim-unit.service.ts
index 970a3f00..dac4c109 100644
--- a/app/services/vclaim-unit.service.ts
+++ b/app/services/vclaim-unit.service.ts
@@ -1,7 +1,7 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/reference/unit'
+const path = '/api/v1/reference/unit'
 const name = 'unit'
 
 export function getList(params: any = null) {
diff --git a/nuxt.config.ts b/nuxt.config.ts
index f4f0b231..2e34b780 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -5,11 +5,9 @@ export default defineNuxtConfig({
   devtools: { enabled: true },
   runtimeConfig: {
     API_ORIGIN: process.env.NUXT_API_ORIGIN || 'http://localhost:3000',
-    VCLAIM: process.env.NUXT_API_VCLAIM || 'http://localhost:3000',
     VCLAIM_SWAGGER: process.env.NUXT_API_VCLAIM_SWAGGER || 'http://localhost:3000',
     public: {
       API_ORIGIN: process.env.NUXT_API_ORIGIN || 'http://localhost:3000',
-      VCLAIM: process.env.NUXT_API_VCLAIM || 'http://localhost:3000',
       VCLAIM_SWAGGER: process.env.NUXT_API_VCLAIM_SWAGGER || 'http://localhost:3000',
     },
   },
diff --git a/server/api/[...req].ts b/server/api/[...req].ts
index c58bf7d6..79f90d1d 100644
--- a/server/api/[...req].ts
+++ b/server/api/[...req].ts
@@ -7,15 +7,11 @@ export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig()
 
   const apiOrigin = config.public.API_ORIGIN
-  const apiVclaim = config.public.VCLAIM
   const apiVclaimSwagger = config.public.VCLAIM_SWAGGER
   const pathname = url.pathname.replace(/^\/api/, '')
-  const isVclaim = pathname.includes('/vclaim')
+  const isVclaim = pathname.includes('/vclaim') && !pathname.includes('/vclaim-sep')
 
   let targetUrl = apiOrigin + pathname + (url.search || '')
-  if (pathname.includes('/vclaim')) {
-    targetUrl = apiVclaim + pathname.replace('/vclaim', '') + (url.search || '')
-  }
   if (pathname.includes('/vclaim-swagger')) {
     targetUrl = apiVclaimSwagger + pathname.replace('/vclaim-swagger', '') + (url.search || '')
   }