diff --git a/app/components/app/antibiotic-in-use/entry.vue b/app/components/app/antibiotic-in-use/entry.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/app/components/app/antibiotic-in-use/list.cfg.ts b/app/components/app/antibiotic-in-use/list.cfg.ts
new file mode 100644
index 00000000..429e2dd8
--- /dev/null
+++ b/app/components/app/antibiotic-in-use/list.cfg.ts
@@ -0,0 +1,28 @@
+import type { Config, RecComponent } 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-dud.vue'))
+
+export const config: Config = {
+  cols: [{}, {}],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama' }]],
+
+  keys: ['code', 'name'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+  },
+
+  components: {
+  },
+
+  htmls: {
+  },
+}
diff --git a/app/components/app/antibiotic-in-use/list.vue b/app/components/app/antibiotic-in-use/list.vue
new file mode 100644
index 00000000..fac15e5c
--- /dev/null
+++ b/app/components/app/antibiotic-in-use/list.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+// Pub components
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
+
+// Configs
+import { config } from './list.cfg'
+
+defineProps<{
+  data: any[]
+}>()
+</script>
+
+<template>
+  <div class="space-y-4">
+    <DataTable v-bind="config" :rows="data" />
+  </div>
+</template>
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..9950a3dd 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -23,22 +23,25 @@ import { paymentMethodCodes } from '~/const/key-val/common'
 
 // App things
 import { genEncounter, type Encounter } from '~/models/encounter'
+import { se } from 'date-fns/locale'
 
 // Props
 const props = defineProps<{
+  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
@@ -46,7 +49,7 @@ const model = defineModel<Encounter>()
 model.value = genEncounter()
 
 // Common preparation
-const defaultCBItems = [{ label: 'Pilih', value: '' }];
+const defaultCBItems = [{ label: 'Pilih', value: '' }]
 const paymentMethodItems = CB.recStrToItem(paymentMethodCodes)
 
 // Emit preparation
@@ -73,86 +76,75 @@ 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 sepFileReview = ref<any>(null)
+const sippFileReview = ref<any>(null)
+const unitFullName = ref('') // Unit, specialist, subspecialist
+const formRef = ref<HTMLFormElement | null>(null) // Expose submit method for parent component
 
-// Unit, specialist, subspecialist
-const unitFullName = ref('')
-watch(() => props.selectedDoctor, (doctor) => {
-    unitFullName.value = doctor.subspecialist?.name ??
-      doctor.specialist?.name ??
-      doctor.unit?.name ??
-      'tidak diketahui'
+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}`
+}
+
+watch(
+  () => props.selectedDoctor,
+  (doctor) => {
+    unitFullName.value = doctor.subspecialist?.name ?? doctor.specialist?.name ?? doctor.unit?.name ?? 'tidak diketahui'
     model.value!.unit_code = doctor.unit_code || ''
     model.value!.specialist_code = doctor.specialist_code || ''
     model.value!.subspecialist_code = doctor.subspecialist_code || ''
   },
 )
-// 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 || ''
+      paymentMethodCode.value = objects?.paymentMethodCode || ''
+      patientCategory.value = objects?.patientCategory || ''
+      cardNumber.value = objects?.cardNumber || ''
+      sepType.value = objects?.sepType || ''
+      sepNumber.value = objects?.sepNumber || ''
+      sepFileReview.value = objects?.sepFileReview || ''
+      sippFileReview.value = objects?.sippFileReview || ''
+      isDateLoading.value = true
+      setTimeout(() => {
+        registerDate.value = objects?.registerDate || ''
+        isDateLoading.value = false
+      }, 100)
+    }
+  },
+  { deep: true, immediate: true },
+)
 
 watch(
   () => props.patient,
@@ -167,46 +159,69 @@ 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 || '',
     doctorCode: doctorCode.value,
-    // subSpecialistCode: subSpecialistCode.value,
     registerDate: registerDate.value,
     cardNumber: cardNumber.value,
     paymentMethodCode: paymentMethodCode.value,
-    sepType: sepType.value
+    sepFile: sepFile.value,
+    sippFile: sippFile.value,
+    sepType: sepType.value,
   }
   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))
-  emit('event', 'save', values)
+  let payload: any = values
+  if (props.mode === 'edit') {
+    payload = {
+      ...payload,
+      sepFileReview: sepFileReview.value,
+      sippFileReview: sippFileReview.value,
+    }
+  }
+  emit('event', 'save', payload)
 })
 
-// Expose submit method for parent component
-const formRef = ref<HTMLFormElement | null>(null)
+function openFile(path: string) {
+  window.open(path, '_blank')
+}
 
 function submitForm() {
-  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 +230,6 @@ function submitForm() {
     } as SubmitEvent
 
     // Call onSubmit directly
-    console.log('🔵 Calling onSubmit with mock event')
     onSubmit(mockEvent)
   }
 }
@@ -345,14 +359,26 @@ 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 +389,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 +408,7 @@ defineExpose({
       </DE.Block>
 
       <!-- BPJS Fields (conditional) -->
-      <template v-if="isJKNPayment">
+      <template v-if="isInsurancePayment">
         <DE.Block
           labelSize="thin"
           class="!pt-0"
@@ -419,6 +430,9 @@ defineExpose({
                 placeholder="Pilih Kelompok Peserta"
               />
             </DE.Field>
+            <span class="text-sm text-gray-500">
+              {{ noteReference }}
+            </span>
           </DE.Cell>
 
           <DE.Cell>
@@ -435,6 +449,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 +508,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 +524,170 @@ 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="() => {}"
+            />
+            <span class="mt-1 text-sm text-gray-500">
+              {{ noteFile }}
+            </span>
+            <p v-if="sepFileReview">
+              <a
+                class="mt-1 text-sm text-blue-500 capitalize"
+                href="#"
+                @click="openFile(sepFileReview.filePath)"
+              >
+                {{ sepFileReview?.fileName }}
+              </a>
+            </p>
+          </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="() => {}"
+            />
+            <span class="mt-1 text-sm text-gray-500">
+              {{ noteFile }}
+            </span>
+            <p v-if="sippFileReview">
+              <a
+                class="mt-1 text-sm text-blue-500 capitalize"
+                href="#"
+                @click="openFile(sippFileReview.filePath)"
+              >
+                {{ sippFileReview?.fileName }}
+              </a>
+            </p>
+          </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>
+            <DE.Field>
+              <Input
+                id="sepReference"
+                v-model="sepReference"
+                :disabled="true"
+              />
+            </DE.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>
+            <DE.Field>
+              <Input
+                id="diagnosis"
+                v-model="diagnosis"
+                :disabled="true"
+              />
+            </DE.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..8f4c850e 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
@@ -17,23 +18,13 @@ const props = defineProps<{
   onExportCsv?: () => void
 }>()
 
-// function emitSearchNavClick() {
-//   props.refSearchNav?.onClick()
-// }
-//
-// function onInput(event: Event) {
-//   props.refSearchNav?.onInput((event.target as HTMLInputElement).value)
-// }
-//
-// function btnClick() {
-//   props.prep?.addNav?.onClick?.()
-// }
+const emit = defineEmits<{
+  apply: [filters: { personName: string; startDate: string; endDate: string }]
+}>()
 
 const searchQuery = ref('')
-const dateRange = ref<{ from: Date | null; to: Date | null }>({
-  from: new Date(),
-  to: new Date(),
-})
+const isRoleRegistration = props.activePositon === 'registration'
+const isRoleMedical = props.activePositon === 'medical'
 
 const df = new DateFormatter('en-US', {
   dateStyle: 'medium',
@@ -46,31 +37,47 @@ const todayCalendar = new CalendarDate(today.getFullYear(), today.getMonth() + 1
 // Get date 1 month ago
 const oneMonthAgo = new Date(today)
 oneMonthAgo.setMonth(today.getMonth() - 1)
-const oneMonthAgoCalendar = new CalendarDate(oneMonthAgo.getFullYear(), oneMonthAgo.getMonth() + 1, oneMonthAgo.getDate())
+const oneMonthAgoCalendar = new CalendarDate(
+  oneMonthAgo.getFullYear(),
+  oneMonthAgo.getMonth() + 1,
+  oneMonthAgo.getDate(),
+)
 
 const value = ref({
   start: oneMonthAgoCalendar,
   end: todayCalendar,
 }) as Ref<DateRange>
 
-// function onFilterClick() {
-//   console.log('Search:', searchQuery.value)
-//   console.log('Date Range:', dateRange.value)
-//   props.refSearchNav?.onClick()
-// }
+function onFilterClick() {
+  const startDate = value.value.start ? value.value.start.toString() : ''
+  const endDate = value.value.end ? value.value.end.toString() : startDate
+
+  emit('apply', {
+    personName: searchQuery.value,
+    startDate,
+    endDate,
+  })
+}
 </script>
 
 <template>
   <div class="relative w-64">
     <Search class="absolute left-3 top-1/2 size-4 -translate-y-1/2 text-gray-400" />
-    <Input v-model="searchQuery" type="text" placeholder="Cari Nama /No.RM" class="pl-9" />
+    <Input
+      v-model="searchQuery"
+      type="text"
+      placeholder="Cari Nama /No.RM"
+      class="pl-9"
+    />
   </div>
 
   <Popover>
     <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">
@@ -83,7 +90,7 @@ const value = ref({
             {{ df.format(value.start.toDate(getLocalTimeZone())) }}
           </template>
         </template>
-        <template v-else> Pick a date </template>
+        <template v-else>Pick a date</template>
       </Button>
     </PopoverTrigger>
     <PopoverContent class="w-auto p-0">
@@ -96,28 +103,32 @@ const value = ref({
     </PopoverContent>
   </Popover>
 
-  <Button variant="outline" class="border-orange-500 text-orange-600 hover:bg-orange-50" @click="onFilterClick">
+  <Button
+    variant="outline"
+    class="border-orange-500 text-orange-600 hover:bg-orange-50"
+    @click="onFilterClick"
+  >
     <FilterIcon class="mr-2 size-4" />
     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" />
+      <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"
+        />
         Ekspor
       </Button>
     </DropdownMenuTrigger>
     <DropdownMenuContent>
-      <DropdownMenuItem @click="onExportPdf">
-        Ekspor PDF
-      </DropdownMenuItem>
-      <DropdownMenuItem @click="onExportCsv">
-        Ekspor CSV
-      </DropdownMenuItem>
-      <DropdownMenuItem @click="onExportExcel">
-        Ekspor Excel
-      </DropdownMenuItem>
+      <DropdownMenuItem @click="onExportPdf">Ekspor PDF</DropdownMenuItem>
+      <DropdownMenuItem @click="onExportCsv">Ekspor CSV</DropdownMenuItem>
+      <DropdownMenuItem @click="onExportExcel">Ekspor Excel</DropdownMenuItem>
     </DropdownMenuContent>
   </DropdownMenu>
 </template>
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/material-package-item/quick-list.cfg.ts b/app/components/app/material-package-item/quick-list.cfg.ts
new file mode 100644
index 00000000..90caf510
--- /dev/null
+++ b/app/components/app/material-package-item/quick-list.cfg.ts
@@ -0,0 +1,23 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+
+type SmallDetailDto = any
+
+export const config: Config = {
+  cols: [ { width: 150 }, {}, { width: 150 }],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Name' },
+      { label: 'Jumlah' },
+    ],
+  ],
+
+  keys: ['number', 'material.name', 'count'],
+
+  parses: {
+    number: (rec: unknown): unknown => {
+      return (rec as SmallDetailDto).medicineGroup?.name || '-'
+    },
+  },
+}
diff --git a/app/components/app/material-package-item/quick-list.vue b/app/components/app/material-package-item/quick-list.vue
new file mode 100644
index 00000000..2ff50a73
--- /dev/null
+++ b/app/components/app/material-package-item/quick-list.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+//
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
+
+// Configs
+import { config } from './quick-list.cfg'
+import type { MaterialPackageItem } from '~/models/material-package-item';
+
+interface Props {
+  data: MaterialPackageItem[]
+}
+
+defineProps<Props>()
+</script>
+
+<template>
+  <div class="mb-4">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+        Daftar Item BMHP
+    </div>
+    <DataTable v-bind="config" :rows="data" class="border"/>
+  </div>
+</template>
diff --git a/app/components/app/material-package/switcher.vue b/app/components/app/material-package/switcher.vue
new file mode 100644
index 00000000..2709ff5e
--- /dev/null
+++ b/app/components/app/material-package/switcher.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+//
+import * as CB from '~/components/pub/my-ui/combobox'
+import type { MaterialPackage } from '~/models/material-package';
+
+//
+const props =defineProps<{
+  data: MaterialPackage[]
+}>()
+
+const model = defineModel()
+
+const items = computed(() => {
+  return props.data.map((item) => {
+    return {
+      label: item.name,
+      value: item.code,
+    }
+  })
+})
+
+</script>
+
+<template>
+  <div class="mb-4 2xl:mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Paket BMHP
+    </div>
+    <div class="max-w-[600px]">
+      <CB.Combobox :items="items" v-model="model" />
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/mcu-order-item/list-entry.cfg.ts b/app/components/app/mcu-order-item/list-entry.cfg.ts
index 89d85dce..841b77a0 100644
--- a/app/components/app/mcu-order-item/list-entry.cfg.ts
+++ b/app/components/app/mcu-order-item/list-entry.cfg.ts
@@ -1,18 +1,20 @@
 import type { Config } from '~/components/pub/my-ui/data-table'
 import { defineAsyncComponent } from 'vue'
+import type { McuOrderItem } from '~/models/mcu-order-item'
 
 const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
+// const input = defineAsyncComponent(() => import('~/components/pub/my-ui/data/editable-div.vue'))
 const input = defineAsyncComponent(() => import('~/components/pub/ui/input/Input.vue'))
 
 export const config: Config = {
-  cols: [{}, {}, { classVal: '!p-0.5' }, { width: 50 }],
+  cols: [{}, {}, { classVal: '!p-0.5' }],
 
   headers: [
     [
       { label: 'Nama' },
       { label: 'Jenis' },
-      { label: 'Catatan' },
-      { label: '' },
+      { label: 'Catatan', classVal: '!w-[40%]' },
+      // { label: '' },
     ],
   ],
 
@@ -27,16 +29,17 @@ export const config: Config = {
       return {
         idx,
         rec: rec as object,
+        props: { data: (rec as McuOrderItem).note },
         component: input,
       }
     },
-    action(rec, idx) {
-      return {
-        idx,
-        rec: rec as object,
-        component: action,
-      }
-    },
+    // action(rec, idx) {
+    //   return {
+    //     idx,
+    //     rec: rec as object,
+    //     component: action,
+    //   }
+    // },
   },
 
   htmls: {},
diff --git a/app/components/app/mcu-order-item/list-entry.vue b/app/components/app/mcu-order-item/list-entry.vue
index 6c93c5ac..4fd8edb8 100644
--- a/app/components/app/mcu-order-item/list-entry.vue
+++ b/app/components/app/mcu-order-item/list-entry.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
+
 import { config } from './list-entry.cfg'
 import type { McuOrderItem } from '~/models/mcu-order-item';
 
@@ -13,7 +15,7 @@ const emit = defineEmits<{
 </script>
 
 <template>
-  <PubMyUiDataTable class="border mb-3 2xl:mb-4"
+  <DataTable class="border mb-3 2xl:mb-4"
     v-bind="config"
     :rows="data"
   />
diff --git a/app/components/app/mcu-order-item/list.cfg.ts b/app/components/app/mcu-order-item/list.cfg.ts
index 2b054379..28441165 100644
--- a/app/components/app/mcu-order-item/list.cfg.ts
+++ b/app/components/app/mcu-order-item/list.cfg.ts
@@ -1,16 +1,18 @@
 import type { Config } from '~/components/pub/my-ui/data-table'
 
 export const config: Config = {
-  cols: [{}, {}],
+  cols: [{}, { width: 150 }, {}],
 
   headers: [
     [
       { label: 'Nama' },
-      { label: 'Jenis' },
+      { label: 'Jadwal Pemeriksaan' },
+      { label: 'Status' },
+      { label: 'Catatan' },
     ],
   ],
 
-  keys: ['mcuSrc.name', 'mcuSrcCategory.name'],
+  keys: ['mcuSrc.name', 'examinationDate', 'status_code', 'note'],
 
   delKeyNames: [
     { key: 'mcuSrc.name', label: 'Nama' },
diff --git a/app/components/app/mcu-order/confirmation-info.vue b/app/components/app/mcu-order/confirmation-info.vue
new file mode 100644
index 00000000..4f7c9a9d
--- /dev/null
+++ b/app/components/app/mcu-order/confirmation-info.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import type { McuOrder } from '~/models/mcu-order';
+
+defineProps<{
+  recItem: McuOrder
+}>()
+</script>
+
+<template>
+    <div class="flex mb-2">
+      <div class="w-20">Tanggal</div>
+      <div class="w-4">:</div>
+      <div class="">{{ recItem.createdAt?.substring(0, 10) }}</div>
+    </div>
+    <div class="flex">
+      <div class="w-20">DPJP</div>
+      <div class="w-4">:</div>
+      <div class="">{{ recItem.doctor?.employee?.person?.name }}</div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/mcu-order/detail.vue b/app/components/app/mcu-order/detail.vue
index fe161595..8d86a98b 100644
--- a/app/components/app/mcu-order/detail.vue
+++ b/app/components/app/mcu-order/detail.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
 
 <template>
     <div class="text-sm 2xl:text-base font-semibold mb-3">
-      Order {{ data?.createdAt?.substring(0, 10) }} - {{ data.status_code }}
+      Order {{ data?.createdAt?.substring(0, 10) }} - {{ data?.status_code }}
     </div>
     <div class="max-w-[1000px]">
       <DE.Block mode="preview" :col-count=5 class="!mb-3">
diff --git a/app/components/app/mcu-order/list.vue b/app/components/app/mcu-order/list.vue
index df296419..4c749dc9 100644
--- a/app/components/app/mcu-order/list.vue
+++ b/app/components/app/mcu-order/list.vue
@@ -34,7 +34,7 @@ function navClick(type: 'cancel' | 'edit' | 'submit', data: McuOrder): void {
     <div class="mb-4 xl:mb-5">Belum Ada Data</div>
   </div>
   <template v-for="item, idx in data">
-    <div :class="'text-sm 2xl:text-base font-semibold ' + (item.status_code == 'new' ? 'mb-2' : 'mb-2')">
+    <div :class="'text-sm 2xl:text-base font-semibold ' + (item.status_code == 'new' ? 'mb-0' : 'mb-2')">
       Order #{{ data.length - idx }} - {{ item.createdAt?.substring(0, 10) }} - {{ item.status_code }}
     </div>
     <DE.Block mode="preview" :col-count=7 class="!mb-3">
diff --git a/app/components/app/mcu-order/micro-list.vue b/app/components/app/mcu-order/micro-list.vue
new file mode 100644
index 00000000..e63ad40b
--- /dev/null
+++ b/app/components/app/mcu-order/micro-list.vue
@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import * as DE from '~/components/pub/my-ui/doc-entry';
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import Nav from '~/components/pub/my-ui/nav-footer/ca-ed-su.vue'
+
+import type { McuOrder } from '~/models/mcu-order';
+import AntibioticInUseList from '~/components/app/antibiotic-in-use/list.vue';
+import McuOrderItems from '~/components/app/mcu-order-item/list.vue';
+import type { AntibioticInUse } from '~/models/antibiotic-in-use';
+
+interface Props {
+  data: McuOrder[]
+  antibioticInUses: AntibioticInUse[]
+  paginationMeta: PaginationMeta
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  cancel: [data: any]
+  edit: [data: any],
+  submit: [data: any]
+}>()
+
+function navClick(type: 'cancel' | 'edit' | 'submit', data: McuOrder): void {
+  if (type === 'cancel') {
+    emit('cancel', data)
+  } else if (type === 'edit') {
+    emit('edit', data)
+  } else if (type === 'submit') {
+    emit('submit', data)
+  }
+}
+</script>
+
+<template>
+  <div v-if="data.length == 0" class="p-10 text-center">
+    <div class="mb-4 xl:mb-5">Belum Ada Data</div>
+  </div>
+  <template v-for="item, idx in data">
+    <div :class="'text-sm 2xl:text-base font-semibold ' + (item.status_code == 'new' ? 'mb-0' : 'mb-2')">
+      Order #{{ data.length - idx }} - {{ item.createdAt?.substring(0, 10) }} - {{ item.status_code }}
+    </div>
+    <DE.Block mode="preview" :col-count=7 class="!mb-3">
+      <DE.Cell :col-span="3">
+        <DE.Label :class="'font-semibold ' + (item.status_code == 'new' ? 'pt-2' : '')">DPJP</DE.Label>
+        <DE.Field :class="item.status_code == 'new' ? 'pt-2' : ''">
+          {{ item.doctor?.employee?.person?.name || '........' }}
+        </DE.Field>
+      </DE.Cell>
+      <DE.Cell :col-span="3">
+        <DE.Label :class="'font-semibold ' + (item.status_code == 'new' ? 'pt-2' : '')">PPDS</DE.Label>
+        <DE.Field :class="item.status_code == 'new' ? 'pt-2' : ''">
+          ...........
+        </DE.Field>
+      </DE.Cell>
+      <div class="flex justify-end" >
+        <Nav
+          v-if="item.status_code == 'new'"
+          :small-mode="true"
+          :default-class="'flex gap-1'"
+          @click="(type) => { navClick(type, item) }"
+        />
+      </div>
+    </DE.Block>
+    <AntibioticInUseList v-if="item.antibioticInUseItems?.length > 0" :data="[]" class="!mb-5" />
+    <McuOrderItems :data="item.items || []" @click="console.log('click')" class="!mb-5" />
+  </template>
+</template>
diff --git a/app/components/app/mcu-src/picker-accordion.vue b/app/components/app/mcu-src/picker-accordion.vue
index a42834f9..79429e9d 100644
--- a/app/components/app/mcu-src/picker-accordion.vue
+++ b/app/components/app/mcu-src/picker-accordion.vue
@@ -37,7 +37,7 @@ function pick(item: McuSrc) {
     <div class="grid lg:grid-cols-4 2xl:grid-cols-5 gap-2 [&_button]:w-full">
       <div v-for="item, idx in dataSource" :key="idx" class="flex gap-2">
         <Button 
-          :variant="data.some(e => e.mcuSrc_id === item.id) ? 'default' : 'outline'"
+          :variant="data.some(e => e.mcuSrc_code === item.code) ? 'default' : 'outline'"
           type="button"
           @click="pick(item)"
         > 
diff --git a/app/components/app/prb/_common/btn-history.vue b/app/components/app/prb/_common/btn-history.vue
new file mode 100644
index 00000000..972eab8e
--- /dev/null
+++ b/app/components/app/prb/_common/btn-history.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+import Button from '~/components/pub/ui/button/Button.vue';
+
+const props = defineProps<{
+  
+}>()
+const isModalOpen = inject<Ref<boolean>>('isHistoryDialogOpen')!
+
+function openDialog() {
+  isModalOpen.value = true
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="openDialog">
+        <Icon name="i-lucide-history" class="h-4 w-4 align-middle transition-colors" />
+        History
+    </Button>
+</template>
\ No newline at end of file
diff --git a/app/components/app/prb/_common/filter.vue b/app/components/app/prb/_common/filter.vue
new file mode 100644
index 00000000..d5e99b30
--- /dev/null
+++ b/app/components/app/prb/_common/filter.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import { cn } from '~/lib/utils'
+
+interface InstallationFormData {
+  name: string
+  code: string
+  encounterClassCode: string
+}
+
+const props = defineProps<{
+  schema: any
+  initialValues?: Partial<InstallationFormData>
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  reset: [resetForm: () => void]
+}>()
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  emit('submit', values, resetForm)
+}
+
+// Form cancel handler
+function onResetForm({ resetForm }: { resetForm: () => void }) {
+  emit('reset', resetForm)
+}
+</script>
+
+<template>
+  <Form
+    v-slot="{ handleSubmit, resetForm }"
+    as=""
+    keep-values
+    :initial-values="initialValues"
+  >
+    <form id="entry-form" @submit="handleSubmit($event, (values) => onSubmitForm(values, { resetForm }))">
+      <div class="mb-5 border-b border-b-slate-300 pb-7 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+          <InputBase
+            field-name="patientName"
+            label="Nama Pasien"
+            placeholder="Nama Pasien"
+          />
+          <InputBase
+            field-name="cardNumber"
+            label="Nomor Kartu"
+            placeholder="Nomor Kartu"
+          />
+          <InputBase
+            field-name="sepNumber"
+            label="Nomor SEP"
+            placeholder="Nomor SEP"
+          />
+        </div>
+      </div>
+     
+      <div class="my-2 flex items-center gap-3 justify-end">
+        <Button @click="onResetForm" variant="secondary">Reset</Button>
+        <Button @click="onSubmitForm">Terapkan</Button>
+      </div>
+    </form>
+  </Form>
+</template>
diff --git a/app/components/app/prb/_common/select-date.vue b/app/components/app/prb/_common/select-date.vue
new file mode 100644
index 00000000..d94d04eb
--- /dev/null
+++ b/app/components/app/prb/_common/select-date.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+  isDisabled?: boolean
+  isWithTime?: boolean
+}>()
+
+const {
+  fieldName = 'birthDate',
+  label = 'Tanggal Lahir',
+  placeholder = 'Pilih tanggal lahir',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+// Function to calculate age with years, months, and days
+function calculateAge(birthDate: string | Date | undefined): string {
+  if (!birthDate) {
+    return 'Masukkan tanggal lahir'
+  }
+
+  try {
+    let dateObj: Date
+
+    if (typeof birthDate === 'string') {
+      dateObj = parseISO(birthDate)
+    } else {
+      dateObj = birthDate
+    }
+
+    const today = new Date()
+
+    // Calculate years, months, and days
+    const totalYears = differenceInYears(today, dateObj)
+
+    // Calculate remaining months after years
+    const yearsPassed = new Date(dateObj)
+    yearsPassed.setFullYear(yearsPassed.getFullYear() + totalYears)
+    const remainingMonths = differenceInMonths(today, yearsPassed)
+
+    // Calculate remaining days after years and months
+    const monthsPassed = new Date(yearsPassed)
+    monthsPassed.setMonth(monthsPassed.getMonth() + remainingMonths)
+    const remainingDays = differenceInDays(today, monthsPassed)
+
+    // Format the result
+    const parts = []
+    if (totalYears > 0) parts.push(`${totalYears} Tahun`)
+    if (remainingMonths > 0) parts.push(`${remainingMonths} Bulan`)
+    if (remainingDays > 0) parts.push(`${remainingDays} Hari`)
+
+    return parts.length > 0 ? parts.join(' ') : '0 Hari'
+  } catch {
+    return 'Masukkan tanggal lahir'
+  }
+}
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired && !isDisabled"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              :type="props.isWithTime ? 'datetime-local' : 'date'"
+              min="1900-01-01"
+              v-bind="componentField"
+              :placeholder="placeholder"
+              :disabled="isDisabled"
+              @update:model-value="
+                (value: string | number) => {
+                  const dateStr = typeof value === 'number' ? String(value) : value
+                  patientAge = calculateAge(dateStr)
+                }
+              "
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/prb/_common/select-dpjp.vue b/app/components/app/prb/_common/select-dpjp.vue
new file mode 100644
index 00000000..9e83e64f
--- /dev/null
+++ b/app/components/app/prb/_common/select-dpjp.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn } from '~/lib/utils'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const doctors = ref<Array<Item>>([])
+
+async function fetchDpjp() {
+  doctors.value = await getDoctorLabelList({
+    serviceType: 1,
+    serviceDate: new Date().toISOString().substring(0, 10),
+    includes: 'employee-person',
+  }, true)
+}
+
+onMounted(() => {
+  fetchDpjp()
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="doctors"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/prb/_common/select-medicine-form.vue b/app/components/app/prb/_common/select-medicine-form.vue
new file mode 100644
index 00000000..9e83e64f
--- /dev/null
+++ b/app/components/app/prb/_common/select-medicine-form.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn } from '~/lib/utils'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const doctors = ref<Array<Item>>([])
+
+async function fetchDpjp() {
+  doctors.value = await getDoctorLabelList({
+    serviceType: 1,
+    serviceDate: new Date().toISOString().substring(0, 10),
+    includes: 'employee-person',
+  }, true)
+}
+
+onMounted(() => {
+  fetchDpjp()
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="doctors"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/prb/_common/select-medicine.vue b/app/components/app/prb/_common/select-medicine.vue
new file mode 100644
index 00000000..9e83e64f
--- /dev/null
+++ b/app/components/app/prb/_common/select-medicine.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn } from '~/lib/utils'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const doctors = ref<Array<Item>>([])
+
+async function fetchDpjp() {
+  doctors.value = await getDoctorLabelList({
+    serviceType: 1,
+    serviceDate: new Date().toISOString().substring(0, 10),
+    includes: 'employee-person',
+  }, true)
+}
+
+onMounted(() => {
+  fetchDpjp()
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="doctors"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/prb/_common/select-program.vue b/app/components/app/prb/_common/select-program.vue
new file mode 100644
index 00000000..cde3fb66
--- /dev/null
+++ b/app/components/app/prb/_common/select-program.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { PrbProgramTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+onMounted(() => {
+  
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="PrbProgramTypeOptList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/prb/bpjs-list.cfg.ts b/app/components/app/prb/bpjs-list.cfg.ts
new file mode 100644
index 00000000..92d68f73
--- /dev/null
+++ b/app/components/app/prb/bpjs-list.cfg.ts
@@ -0,0 +1,60 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+import { educationCodes, genderCodes } from '~/lib/constants'
+import { calculateAge } from '~/lib/utils'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-upd.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {width: 50}, ],
+
+  headers: [
+    [
+      { label: 'No. PRB' },
+      { label: 'No. RM' },
+      { label: 'Nama Pasien' },
+      { label: 'Jenis Kelamin' },
+      { label: 'Alamat' },
+      { label: 'Klinik' },
+      { label: 'Nama Dokter' },
+      { label: 'Tanggal' },
+      { label: 'Program PRB' },
+      { label: 'No. SEP' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'name1', 'name2', 'name3', 'name4', 'name5', 'name6', 'name7', 'name8', 'name9', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+
+  },
+}
diff --git a/app/components/app/prb/detail.vue b/app/components/app/prb/detail.vue
new file mode 100644
index 00000000..7e40366d
--- /dev/null
+++ b/app/components/app/prb/detail.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import { type Variants, Badge } from '~/components/pub/ui/badge'
+import { cn, } from '~/lib/utils'
+import type { Prb } from '~/models/prb'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+// #region Props & Emits
+const props = defineProps<{
+  instance: Prb | null
+}>()
+
+// const emit = defineEmits<{
+//   (e: 'click'): void
+// }>()
+
+const dummy = [
+  {
+    id: 1,
+    number: 1,
+    name: 'Operasi',
+    code: 'OP-001'
+  }
+]
+
+// #endregion
+
+// #region State & Computed
+// #endregion
+
+// Computed addresses from nested data
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+
+// #endregion region
+
+// #region Utilities & event handlers
+// function onClick() {
+//   emit('click')
+// }
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <article :class="cn('mb-5 space-y-1',)">
+    <DetailRow label="No. PRB">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Waktu dan Tanggal">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Program PRB">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="DPJP">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Keterangan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Saran">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+  </article>
+</template>
+
+<style scoped></style>
diff --git a/app/components/app/prb/entry.vue b/app/components/app/prb/entry.vue
new file mode 100644
index 00000000..4658578a
--- /dev/null
+++ b/app/components/app/prb/entry.vue
@@ -0,0 +1,102 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import ObatPicker from './obat-picker/picker-dialog.vue'
+import SepPicker from './sep-picker/picker-dialog.vue'
+import SelectDpjp from './_common/select-dpjp.vue'
+import SelectProgram from './_common/select-program.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+
+const props = withDefaults(defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+const isSepDialogOpen = ref(false)
+provide("isSepDialogOpen", isSepDialogOpen);
+const handleToggleSepDialog = () => isSepDialogOpen.value = !isSepDialogOpen.value
+const setNoSep = (inputValue: string) => formRef.value?.setValues({ a0: inputValue }, false)
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues ? initialValues : {}"
+  >
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2" v-if="isBpjs">
+        <div class="w-1/2 flex items-end gap-3">
+          <InputBase :errors="errors"
+            field-name="a0"
+            label="No. RM/Kartu BPJS" placeholder="Masukkan No. RM/Kartu BPJS"
+          />
+          <Button @click="handleToggleSepDialog" size="icon" variant="outline"
+            class="text-orange-400 border-orange-400 bg-transparent">
+            <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+          </Button>
+        </div>
+      </DE.Cell>     
+      <InputBase :errors="errors"
+        field-name="a1"
+        label="No. PRB" placeholder="Akan terisi otomatis"
+        is-disabled
+      />      
+      <SelectDate
+        field-name="a2"
+        label="Waktu & Tanggal"
+        :errors="errors"
+        is-disabled
+        is-with-time
+      />
+      <SelectProgram :errors="errors"
+        field-name="a3"
+        label="Program PRB" placeholder="Pilih Program PRB"
+        is-required
+      />
+      <SelectDpjp :errors="errors"
+        field-name="a4"
+        label="DPJP" placeholder="Pilih DPJP"
+        is-required
+      />    
+      <TextAreaInput :errors="errors"
+        field-name="a5"
+        label="Keterangan" placeholder="Isi Keterangan"
+      />
+      <TextAreaInput :errors="errors"
+        field-name="a6"
+        label="Saran" placeholder="Isi Saran"
+      />
+    </DE.Block>
+        
+    <!-- PICKER -->
+    <DE.Block :col-count="1" :cell-flex="false">
+      <ObatPicker field-name="a7" title="Obat" />
+    </DE.Block>
+    <SepPicker title="SEP" :choose-fn="setNoSep" />
+    <!-- -->
+  </Form>
+</template>
diff --git a/app/components/app/prb/history-list.cfg.ts b/app/components/app/prb/history-list.cfg.ts
new file mode 100644
index 00000000..6f571af3
--- /dev/null
+++ b/app/components/app/prb/history-list.cfg.ts
@@ -0,0 +1,62 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-print.vue'))
+const statusBadge = defineAsyncComponent(() => import('~/components/pub/my-ui/badge/status-badge.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {width: 100}, {width: 50}, ],
+
+  headers: [
+    [
+      { label: 'Tgl Diterbitkan' },
+      { label: 'Kode Obat' },
+      { label: 'Nama Obat' },
+      { label: 'Signa' },
+      { label: 'Jumlah' },
+      { label: 'Durasi Pemberian' },
+      { label: 'status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'name1', 'name2', 'name3', 'name4', 'name5', 'status', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+
+  htmls: {
+
+  },
+}
diff --git a/app/components/app/prb/history-list.vue b/app/components/app/prb/history-list.vue
new file mode 100644
index 00000000..20cc7eaf
--- /dev/null
+++ b/app/components/app/prb/history-list.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './history-list.cfg'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import { cn } from '~/lib/utils'
+
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+  'update:dateValue': [value: DateRange]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/prb/list.cfg.ts b/app/components/app/prb/list.cfg.ts
new file mode 100644
index 00000000..4da07cdd
--- /dev/null
+++ b/app/components/app/prb/list.cfg.ts
@@ -0,0 +1,56 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+import { educationCodes, genderCodes } from '~/lib/constants'
+import { calculateAge } from '~/lib/utils'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-upd.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {width: 50}, ],
+
+  headers: [
+    [
+      { label: 'Tgl Diterbitkan' },
+      { label: 'Kode Obat' },
+      { label: 'Nama Obat' },
+      { label: 'Signa' },
+      { label: 'Jumlah' },
+      { label: 'Durasi Pemberian' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'name1', 'name2', 'name3', 'name4', 'name5', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+
+  },
+}
diff --git a/app/components/app/prb/list.vue b/app/components/app/prb/list.vue
new file mode 100644
index 00000000..5e51b50f
--- /dev/null
+++ b/app/components/app/prb/list.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './list.cfg'
+import { config as bpjsConfig } from './bpjs-list.cfg'
+
+const props = withDefaults(defineProps<{
+  data: any[]
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+
+const tableConfig = computed(() => {
+  return props.isBpjs ? bpjsConfig : config
+})
+// const emit = defineEmits<{
+//   pageChange: [page: number]
+// }>()
+
+// function handlePageChange(page: number) {
+//   emit('pageChange', page)
+// }
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="tableConfig"
+      :rows="data"
+    />
+    <!-- <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" /> -->
+  </div>
+</template>
diff --git a/app/components/app/prb/obat-picker/form.vue b/app/components/app/prb/obat-picker/form.vue
new file mode 100644
index 00000000..510cae69
--- /dev/null
+++ b/app/components/app/prb/obat-picker/form.vue
@@ -0,0 +1,114 @@
+<script setup lang="ts">
+// Components
+import type { FormErrors } from '~/types/error'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+// Helpers
+
+// Types
+import { toTypedSchema } from '@vee-validate/zod'
+
+// Handlers
+import {
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/procedure-src.handler'
+
+// Services
+import { getList, getDetail } from '~/services/procedure-src.service'
+import SelectMedicine from '../_common/select-medicine.vue'
+import SelectMedicineForm from '../_common/select-medicine-form.vue'
+
+interface Props {
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+  medicineData: any[]
+  medicineFormsData: any[]
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  toggleDialog: []
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues ? initialValues : {}"
+  >
+    <DE.Block :col-count="6" :cell-flex="false">      
+      <DE.Cell :col-span="6">   
+        <SelectMedicine :errors="errors"
+          field-name="a1"
+          label="Obat" placeholder="Pilih Obat"
+        />
+      </DE.Cell>
+      <DE.Cell :col-span="4" class="mt-1.5">
+        <h1 class="mb-1">Signa</h1>
+        <div class="flex items-start gap-3">
+          <InputBase :errors="errors"
+            field-name="a2"
+            label="" placeholder="0"
+            right-label="Frekuensi"
+            numeric-only
+          /> 
+          <p class="text-3xl text-gray-400">X</p>
+          <InputBase :errors="errors"
+            field-name="a3"
+            label="" placeholder="0"
+            right-label="Dosis"
+            numeric-only
+          />
+        </div>
+      </DE.Cell>  
+      <DE.Cell :col-span="2">   
+        <SelectMedicineForm :errors="errors"
+          field-name="a4"
+          label="Satuan" placeholder="Pilih Satuan"
+        />
+      </DE.Cell>  
+      <DE.Cell :col-span="3">   
+        <InputBase :errors="errors"
+          field-name="a5"
+          label="Jumlah" placeholder="Masukkan Jumlah"
+        /> 
+      </DE.Cell> 
+      <DE.Cell :col-span="3">  
+        <InputBase :errors="errors"
+          field-name="a6"
+          label="Durasi Pemberian" placeholder="Masukkan Durasi Pemberian"
+          right-label="Hari"
+          numeric-only
+        /> 
+      </DE.Cell>  
+    </DE.Block>
+  </Form>
+</template>
\ No newline at end of file
diff --git a/app/components/app/prb/obat-picker/picker-dialog.vue b/app/components/app/prb/obat-picker/picker-dialog.vue
new file mode 100644
index 00000000..69ea3b90
--- /dev/null
+++ b/app/components/app/prb/obat-picker/picker-dialog.vue
@@ -0,0 +1,140 @@
+<script setup lang="ts">
+import ProcedureListDialog from './form.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import List from './form.vue'
+import { getValueLabelList as getMedicineFormList } from '~/services/medicine-form.service'
+import { getValueLabelList as getMedicineList } from '~/services/medicine.service'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import FormEntry from './form.vue'
+import { PrbSchema } from '~/schemas/prb.schema'
+import type { ExposedForm } from '~/types/form'
+import type { Prb } from '~/models/prb'
+import { PrbMedicineSchema } from '~/schemas/prb-medicine.schema'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+const isOperativeActionDialogOpen = ref(false)
+provide("isOperativeActionDialogOpen", isOperativeActionDialogOpen);
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const medicine = ref<{ value: string; label: string }[]>([])
+const medicineForms = ref<{ value: string; label: string }[]>([])
+
+const handleToggleOperativeActionDialog = () => {
+  isOperativeActionDialogOpen.value = !isOperativeActionDialogOpen.value
+}
+
+async function init(){
+  const [medicineRes, medicineFormRes] = await Promise.all([
+    getMedicineList({ sort: 'createdAt:asc', }),
+    getMedicineFormList({ sort: 'createdAt:asc', })
+  ])
+  medicine.value = medicineRes 
+  medicineForms.value = medicineFormRes 
+}
+
+onMounted(()=>{
+  init()
+})
+
+async function handleAdd(psuhFn: (input: unknown) => void) {
+  const validated = await composeFormData()
+  psuhFn({
+    code: validated.a1,
+    name: validated.a2,
+    signa: validated.a3,
+    total: validated.a5,
+    duration: validated.a6,
+  })
+  handleToggleOperativeActionDialog()
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  return new Promise((resolve) => resolve(formData))
+}
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center gap-3">
+      <h1 class="font-medium text-base">{{ title }}</h1>
+      <Button @click="isOperativeActionDialogOpen = true" size="xs" variant="outline"
+        class="rounded-lg text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih {{ title }}
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="props.fieldName">
+      <Dialog
+        v-model:open="isOperativeActionDialogOpen"
+        title="" size="xl">
+        <FormEntry
+          ref="inputForm"
+          :schema="PrbMedicineSchema"
+          :medicine-data="medicine"
+          :medicine-forms-data="medicineForms"
+          @toggle-dialog="handleToggleOperativeActionDialog"
+        />
+        <div class="mt-2 flex justify-end">
+          <Button @click="handleAdd(push)" class="">
+            <Icon name="i-lucide-save" class="h-4 w-4 align-middle transition-colors" />
+            Simpan
+          </Button>
+        </div>
+      </Dialog>
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="">Code</TableHead>
+              <TableHead class="">Name</TableHead>
+              <TableHead class="">Signa</TableHead>
+              <TableHead class="">Jumlah</TableHead>
+              <TableHead class="">Durasi Pemberian</TableHead>
+              <TableHead class="w-24">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="2xl:pl-4">{{ field.value?.code }}</TableCell>
+              <TableCell class="2xl:pl-4">{{ field.value?.name }}</TableCell>
+              <TableCell class="2xl:pl-4">{{ field.value?.signa }}</TableCell>
+              <TableCell class="2xl:pl-4">{{ field.value?.total }}</TableCell>
+              <TableCell class="2xl:pl-4">{{ field.value?.duration }}</TableCell>
+              <TableCell class="2xl:pl-4">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/prb/sep-picker/list.cfg.ts b/app/components/app/prb/sep-picker/list.cfg.ts
new file mode 100644
index 00000000..5a928e2d
--- /dev/null
+++ b/app/components/app/prb/sep-picker/list.cfg.ts
@@ -0,0 +1,83 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-choose.vue'))
+const statusBadge = defineAsyncComponent(() => import('~/components/pub/my-ui/badge/status-badge.vue'))
+
+export const config: Config = {
+  cols: [
+    { width: 120 }, // TGL. SEP
+    { width: 150 }, // NO. SEP
+    { width: 120 }, // PELAYANAN
+    { width: 100 }, // JALUR
+    { width: 150 }, // NO. RM
+    { width: 200 }, // NAMA PASIEN
+    { width: 150 }, // NO. KARTU BPJS
+    { width: 150 }, // NO. SURAT KONTROL
+    { width: 150 }, // TGL SURAT KONTROL
+    { width: 150 }, // KLINIK TUJUAN
+    { width: 200 }, // DPJP
+    { width: 200 }, // DIAGNOSIS AWAL
+    { width: 100 }, // AKSI
+  ],
+
+  headers: [
+    [
+      { label: 'TGL. SEP' },
+      { label: 'NO. SEP' },
+      { label: 'PELAYANAN' },
+      { label: 'JALUR' },
+      { label: 'NO. RM' },
+      { label: 'NAMA PASIEN' },
+      { label: 'NO. KARTU BPJS' },
+      { label: 'NO. SURAT KONTROL' },
+      { label: 'TGL SURAT KONTROL' },
+      { label: 'KLINIK TUJUAN' },
+      { label: 'DPJP' },
+      { label: 'DIAGNOSIS AWAL' },
+      { label: 'AKSI' },
+    ],
+  ],
+
+  keys: [
+    'letterDate',
+    'letterNumber',
+    'serviceType',
+    'flow',
+    'medicalRecordNumber',
+    'patientName',
+    'cardNumber',
+    'controlLetterNumber',
+    'controlLetterDate',
+    'clinicDestination',
+    'attendingDoctor',
+    'diagnosis',
+    'action',
+  ],
+
+  delKeyNames: [
+    { key: 'letterNumber', label: 'NO. SEP' },
+    { key: 'patientName', label: 'Nama Pasien' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+
+  htmls: {},
+}
\ No newline at end of file
diff --git a/app/components/app/prb/sep-picker/list.vue b/app/components/app/prb/sep-picker/list.vue
new file mode 100644
index 00000000..9c8aa593
--- /dev/null
+++ b/app/components/app/prb/sep-picker/list.vue
@@ -0,0 +1,53 @@
+<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 type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './list.cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { ProcedureSrcSchema, type ProcedureSrcFormData } from '~/schemas/procedure-src.schema'
+
+// Handlers
+import {
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/procedure-src.handler'
+
+// Services
+import { getList, getDetail } from '~/services/procedure-src.service'
+
+const title = ref('')
+
+interface Props {
+  data: any[]
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  toggleDialog: []
+}>()
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+    />
+  </div>
+</template>
diff --git a/app/components/app/prb/sep-picker/picker-dialog.vue b/app/components/app/prb/sep-picker/picker-dialog.vue
new file mode 100644
index 00000000..efb32023
--- /dev/null
+++ b/app/components/app/prb/sep-picker/picker-dialog.vue
@@ -0,0 +1,141 @@
+<script setup lang="ts">
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import List from './list.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { ActionEvents, type HeaderPrep, type RefSearchNav } from '~/components/pub/my-ui/data/types'
+import { getList } from '~/services/vclaim-monitoring-visit.service'
+import type { VclaimSepData } from '~/models/vclaim'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import { defaultQuerySchema, defaultQueryParams } from '~/composables/usePaginatedList'
+
+interface Props {
+  title: string
+  chooseFn: (inputValue: string) => void
+}
+const props = defineProps<Props>()
+const isSepDialogOpen = inject('isSepDialogOpen') as Ref<boolean>;
+const handleToggleSepDialog = () => isSepDialogOpen.value = !isSepDialogOpen.value
+
+const data = ref<VclaimSepData[]>([])// Search model with debounce
+  const searchInput = ref('')
+  const debouncedSearch = refDebounced(searchInput, 500) // 500ms debounce
+// const paginationMeta = reactive<PaginationMeta>({
+//   recordCount: 0,
+//   page: 1,
+//   pageSize: 10,
+//   totalPage: 5,
+//   hasNext: false,
+//   hasPrev: false,
+// })
+// // URL state management
+// const queryParams = useUrlSearchParams('history', {
+//   initialValue: defaultQueryParams,
+//   removeFalsyValues: true,
+// })
+// const params = computed(() => {
+//   const result = defaultQuerySchema.safeParse(queryParams)
+//   return result.data || defaultQueryParams
+// })
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+const timestamp = ref<any>({})
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+
+const headerPrep: HeaderPrep = {
+  title: props.title,
+  icon: 'i-lucide-clipboard-list',
+}
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    // open filter modal
+  },
+  onInput: (val: string) => {
+    searchInput.value = val
+  },
+  onClear: () => {
+    searchInput.value = ''
+  },
+}
+
+
+async function getMonitoringVisitMappers() {
+  data.value = []
+  const tempArr: VclaimSepData[] = []
+
+  const result = await getList({
+    serviceType: 1,
+    search: debouncedSearch.value,
+  })
+
+  if (result && result.success && result.body) {
+    const visitsRaw = result.body?.response?.sep || []
+
+    visitsRaw.forEach((result: any) => {
+      // Format pelayanan: "R.Inap" -> "Rawat Inap", "1" -> "Rawat Jalan", dll
+      let serviceType = result.jnsPelayanan || '-'
+      if (serviceType === 'R.Inap') {
+        serviceType = 'Rawat Inap'
+      } else if (serviceType === '1' || serviceType === 'R.Jalan') {
+        serviceType = 'Rawat Jalan'
+      }
+
+      tempArr.push({
+        letterDate: result.tglSep || '-',
+        letterNumber: result.noSep || '-',
+        serviceType: serviceType,
+        flow: '-',
+        medicalRecordNumber: '-',
+        patientName: result.nama || '-',
+        cardNumber: result.noKartu || '-',
+        controlLetterNumber: result.noRujukan || '-',
+        controlLetterDate: result.tglPlgSep || '-',
+        clinicDestination: result.poli || '-',
+        attendingDoctor: '-',
+        diagnosis: result.diagnosa || '-',
+        careClass: result.kelasRawat || '-',
+      })
+    })
+    data.value = tempArr
+  }
+}
+// Handle pagination page change
+// function handlePageChange(page: number) {
+//   // Update URL params - this will trigger watcher
+//   queryParams['page-number'] = page
+// }
+
+onMounted(async () => {
+  await getMonitoringVisitMappers()
+})
+
+
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.chooseFn(recItem.value.cardNumber)
+      handleToggleSepDialog()
+      break
+  }
+})
+
+watch(debouncedSearch, () => {
+  getMonitoringVisitMappers()
+})
+</script>
+
+<template>
+  <div class="">
+    <Dialog v-model:open="isSepDialogOpen" title="" size="full">
+      <Header 
+        v-model="searchInput"
+        :prep="headerPrep"
+        :ref-search-nav="refSearchNav" />
+      <List :data="data" />
+    </Dialog>
+  </div>
+</template>
diff --git a/app/components/app/procedure-room-order-item/list-detail.cfg.ts b/app/components/app/procedure-room-order-item/list-detail.cfg.ts
new file mode 100644
index 00000000..cf0f6dab
--- /dev/null
+++ b/app/components/app/procedure-room-order-item/list-detail.cfg.ts
@@ -0,0 +1,16 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+export const config: Config = {
+  cols: [{}, {}, { classVal: '!p-0.5' }],
+
+  headers: [
+    [
+      { label: 'Kode' },
+      { label: 'Nama' },
+      { label: 'Catatan' },
+    ],
+  ],
+
+  keys: ['procedureRoom.code', 'procedureRoom.infra.name', 'note'],
+}
diff --git a/app/components/app/procedure-room-order-item/list-detail.vue b/app/components/app/procedure-room-order-item/list-detail.vue
new file mode 100644
index 00000000..75727a72
--- /dev/null
+++ b/app/components/app/procedure-room-order-item/list-detail.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
+
+import { config } from './list-detail.cfg'
+import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item';
+
+defineProps<{
+  data: ProcedureRoomOrderItem[]
+}>()
+</script>
+
+<template>
+  <div class="mb-4 2xl:mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Daftar Order Ruang
+    </div>
+    <DataTable class="border mb-3 2xl:mb-4"
+      v-bind="config"
+      :rows="data"
+    />
+  </div>
+</template>
diff --git a/app/components/app/procedure-room-order-item/list-entry.cfg.ts b/app/components/app/procedure-room-order-item/list-entry.cfg.ts
new file mode 100644
index 00000000..2afcd855
--- /dev/null
+++ b/app/components/app/procedure-room-order-item/list-entry.cfg.ts
@@ -0,0 +1,43 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
+const input = defineAsyncComponent(() => import('~/components/pub/ui/input/Input.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, { classVal: '!p-0.5' }, { width: 50 }],
+
+  headers: [
+    [
+      { label: 'Kode' },
+      { label: 'Nama' },
+      { label: 'Catatan' },
+      { label: '' },
+    ],
+  ],
+
+  keys: ['procedureRoom.code', 'procedureRoom.infra.name', 'note'],
+
+  delKeyNames: [
+    { key: 'mcuSrc.name', label: 'Nama' },
+  ],
+
+  components: {
+    note(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: input,
+      }
+    },
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/procedure-room-order-item/list-entry.vue b/app/components/app/procedure-room-order-item/list-entry.vue
new file mode 100644
index 00000000..f86a0b8e
--- /dev/null
+++ b/app/components/app/procedure-room-order-item/list-entry.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
+
+import { config } from './list-entry.cfg'
+import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item';
+
+defineProps<{
+  data: ProcedureRoomOrderItem[]
+}>()
+
+const emit = defineEmits<{
+  requestItem: []
+}>()
+
+</script>
+
+<template>
+  <div class="mb-4 2xl:mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Daftar Order Ruang
+    </div>
+    <DataTable class="border mb-3 2xl:mb-4"
+      v-bind="config"
+      :rows="data"
+    />
+    <div class="-mx-1 [&_button]:mx-1">
+      <Button @click="emit('requestItem')">
+        <Icon name="i-lucide-plus" />
+        Pilih Item
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/procedure-room-order/detail.vue b/app/components/app/procedure-room-order/detail.vue
new file mode 100644
index 00000000..23d0dc75
--- /dev/null
+++ b/app/components/app/procedure-room-order/detail.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { ProcedureRoom } from '~/models/procedure-room';
+
+defineProps<{
+  data: ProcedureRoom
+}>()
+</script>
+
+<template>
+  <div class="mb-4 2xl:mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Detail Order
+    </div>
+    <DE.Block :col-count="2" mode="preview">
+      <DE.Cell>
+        <DE.Label>No. Order</DE.Label>
+        <DE.Colon />
+        <DE.Field>ORT-{{ data.id }}</DE.Field>
+      </DE.Cell>
+      <DE.Cell>
+        <DE.Label>Tgl. Order</DE.Label>
+        <DE.Colon />
+        <DE.Field>{{ data.createdAt?.substring(0, 10) }}</DE.Field>
+      </DE.Cell>
+    </DE.Block>
+  </div>
+</template>
diff --git a/app/components/app/procedure-room-order/form.vue b/app/components/app/procedure-room-order/form.vue
new file mode 100644
index 00000000..ff6c3835
--- /dev/null
+++ b/app/components/app/procedure-room-order/form.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts">
+</script>
+
+<template>
+
+</template>
diff --git a/app/components/app/procedure-room-order/list.cfg.ts b/app/components/app/procedure-room-order/list.cfg.ts
new file mode 100644
index 00000000..e415e26f
--- /dev/null
+++ b/app/components/app/procedure-room-order/list.cfg.ts
@@ -0,0 +1,61 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+import type { ProcedureRoomOrder } from '~/models/procedure-room-order'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dsd.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, { width: 50 }],
+
+  headers: [[
+    { label: 'Tgl. Order' },
+    { label: 'No. Order' },
+    { label: 'Ruangan' },
+    { label: 'Status' },
+    { label: 'Resume' },
+    { label: '' },
+  ]],
+
+  keys: ['date', 'number', 'room', 'status_code', 'resume', 'action'],
+
+  delKeyNames: [
+    { key: 'createdAt', label: 'Tgl. Order' },
+    { key: 'id', label: 'No. Order' },
+  ],
+
+  parses: {
+    date: (rec: any) => {
+      const recX = rec as ProcedureRoomOrder
+      return recX.createdAt ? recX.createdAt.substring(0, 10) : ''
+
+    },
+    number: (rec: any) => {
+      const recX = rec as ProcedureRoomOrder
+      return `ORT-${recX.id}`
+    },
+    room: (rec: any) => {
+      const recX = rec as ProcedureRoomOrder
+      let result = ''
+      if (recX.items && recX.items.length > 0) {
+        recX.items.forEach((item, idx) => {
+          result += item.infra?.name ? `<div>${item.infra.name}</div>` : ''
+        })
+      }
+      // recX.ite
+      return ''
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/procedure-room-order/list.vue b/app/components/app/procedure-room-order/list.vue
new file mode 100644
index 00000000..bdbfe1be
--- /dev/null
+++ b/app/components/app/procedure-room-order/list.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+// Components
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+
+// Types
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+
+// Configs
+import { config } from './list.cfg'
+
+defineProps<{
+  data: any[]
+  paginationMeta: PaginationMeta
+}>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <DataTable
+    v-bind="config"
+    :rows="data"
+    :skeleton-size="paginationMeta?.pageSize"
+    class="mb-4 border"
+  />
+  <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+</template>
diff --git a/app/components/app/procedure-room/multi-opt-picker.vue b/app/components/app/procedure-room/multi-opt-picker.vue
new file mode 100644
index 00000000..ecdd945a
--- /dev/null
+++ b/app/components/app/procedure-room/multi-opt-picker.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { ProcedureRoom } from '~/models/procedure-room';
+import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item';
+
+const dataModel = defineModel({ type: Array as PropType<ProcedureRoomOrderItem[]>, required: true })
+defineProps<{
+  data: ProcedureRoom[]
+}>()
+
+const emit = defineEmits<{
+  pick: [item: ProcedureRoom]
+}>()
+
+function pick(item: ProcedureRoom) {
+  emit('pick', item)
+}
+</script>
+
+<template>
+  <div class="mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Daftar Pilihan Ruang Tindakan
+    </div>
+    <div class="grid grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-2 2xl:gap-2">
+      <!-- <div v-for="item, idx in data" :key="idx" class="flex gap-2"> -->
+      <div v-if="data.length > 0" v-for="item, idx in data">
+        <Button
+          :variant="dataModel.some(e => e.procedureRoom.code === item.code) ? 'default' : 'outline'"
+          class="w-full"
+          type="button"
+          @click="pick(item)"
+        >
+          {{ item.infra?.name }}
+        </Button>
+      </div>
+      <div v-else  class="col-span-full text-center text-sm text-gray-500">
+        <div>Tidak ada data ruang tindakan.</div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/procedure-room/picker.vue b/app/components/app/procedure-room/picker.vue
new file mode 100644
index 00000000..3660e0cb
--- /dev/null
+++ b/app/components/app/procedure-room/picker.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import type { ProcedureRoom } from '~/models/procedure-room';
+import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item';
+
+const dataModel = defineModel({ type: Array as PropType<ProcedureRoomOrderItem[]>, required: true })
+defineProps<{
+  data: ProcedureRoom[]
+  pickMode: 'single' | 'multi'
+}>()
+
+const emit = defineEmits<{
+  pick: [item: ProcedureRoom]
+}>()
+
+function pick(item: ProcedureRoom) {
+  emit('pick', item)
+}
+</script>
+
+<template>
+  <div class="mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Daftar Pilihan Ruang Tindakan
+    </div>
+    <div class="grid grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-2 2xl:gap-2">
+      <!-- <div v-for="item, idx in data" :key="idx" class="flex gap-2"> -->
+      <div v-if="data.length > 0" v-for="item, idx in data">
+        <Button
+          :variant="dataModel.some(e => e.procedureRoom.code === item.code) ? 'default' : 'outline'"
+          class="w-full"
+          type="button"
+          @click="pick(item)"
+        >
+          {{ item.infra?.name }}
+        </Button>
+      </div>
+      <div v-else  class="col-span-full text-center text-sm text-gray-500">
+        <div>Tidak ada data ruang tindakan.</div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/procedure-room/single-opt-picker.vue b/app/components/app/procedure-room/single-opt-picker.vue
new file mode 100644
index 00000000..ecdd945a
--- /dev/null
+++ b/app/components/app/procedure-room/single-opt-picker.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { ProcedureRoom } from '~/models/procedure-room';
+import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item';
+
+const dataModel = defineModel({ type: Array as PropType<ProcedureRoomOrderItem[]>, required: true })
+defineProps<{
+  data: ProcedureRoom[]
+}>()
+
+const emit = defineEmits<{
+  pick: [item: ProcedureRoom]
+}>()
+
+function pick(item: ProcedureRoom) {
+  emit('pick', item)
+}
+</script>
+
+<template>
+  <div class="mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Daftar Pilihan Ruang Tindakan
+    </div>
+    <div class="grid grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-2 2xl:gap-2">
+      <!-- <div v-for="item, idx in data" :key="idx" class="flex gap-2"> -->
+      <div v-if="data.length > 0" v-for="item, idx in data">
+        <Button
+          :variant="dataModel.some(e => e.procedureRoom.code === item.code) ? 'default' : 'outline'"
+          class="w-full"
+          type="button"
+          @click="pick(item)"
+        >
+          {{ item.infra?.name }}
+        </Button>
+      </div>
+      <div v-else  class="col-span-full text-center text-sm text-gray-500">
+        <div>Tidak ada data ruang tindakan.</div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/procedure-room/switcher.vue b/app/components/app/procedure-room/switcher.vue
new file mode 100644
index 00000000..fdd80e7d
--- /dev/null
+++ b/app/components/app/procedure-room/switcher.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { procedureRoomTypeCodes } from '~/const/key-val/clinical'
+
+const model = defineModel()
+model.value = 'procedure'
+
+const emit = defineEmits<{
+  pick: [type_code: string]
+}>()
+
+function pick(type_code: string) {
+  model.value = type_code
+  emit('pick', type_code)
+}
+
+</script>
+
+<template>
+  <div class="mb-5">
+    <div class="font-semibold text-sm 2xl:text-base mb-2">
+      Jenis Ruang Tindakan
+    </div>
+    <div class="-mx-1 [&_button]:mx-1 ">
+      <Button v-for="item, key in procedureRoomTypeCodes" :variant="model === key ? 'default' : 'outline'" @click="pick(key)">
+        {{ item }}
+      </Button>
+    </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..594d2f02 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,138 @@ 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 +315,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 +394,7 @@ onMounted(() => {
               id="cardNumber"
               v-model="cardNumber"
               v-bind="cardNumberAttrs"
-              :disabled="false"
+              :disabled="isLoading || isReadonly"
             />
           </Field>
         </Cell>
@@ -299,7 +409,7 @@ onMounted(() => {
               id="nationalId"
               v-model="nationalId"
               v-bind="nationalIdAttrs"
-              :disabled="false"
+              :disabled="isLoading || isReadonly"
             />
           </Field>
         </Cell>
@@ -378,6 +488,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 +517,7 @@ onMounted(() => {
               id="referralLetterDate"
               v-model="referralLetterDate"
               v-bind="referralLetterDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal surat"
             />
           </Field>
@@ -417,11 +528,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 +593,7 @@ onMounted(() => {
           </Field>
         </Cell>
 
-         <Cell>
+        <Cell v-if="!isReadonly && isShowSpecialist">
           <Label height="compact">
             Spesialis / Subspesialis
             <span class="text-red-500">*</span>
@@ -504,6 +616,7 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.attendingDoctor">
             <Combobox
+              v-if="!isReadonly"
               id="attendingDoctor"
               v-model="attendingDoctor"
               v-bind="attendingDoctorAttrs"
@@ -514,6 +627,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 +643,7 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.initialDiagnosis">
             <Combobox
+              v-if="!isReadonly"
               id="initialDiagnosis"
               v-model="initialDiagnosis"
               v-bind="initialDiagnosisAttrs"
@@ -534,6 +654,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 +784,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 +795,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 +814,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 +884,7 @@ onMounted(() => {
               id="accidentDate"
               v-model="accidentDate"
               v-bind="accidentDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal kejadian"
             />
           </Field>
@@ -966,6 +1094,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 +1107,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 +1119,7 @@ onMounted(() => {
           Preview
         </Button>
         <Button
+          v-if="props.mode === 'add'"
           type="button"
           class="h-[40px] min-w-[120px] text-white"
           :disabled="isLoading"
@@ -1000,6 +1131,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/app/vaccine-data/_common/select-date.vue b/app/components/app/vaccine-data/_common/select-date.vue
new file mode 100644
index 00000000..d94d04eb
--- /dev/null
+++ b/app/components/app/vaccine-data/_common/select-date.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+  isDisabled?: boolean
+  isWithTime?: boolean
+}>()
+
+const {
+  fieldName = 'birthDate',
+  label = 'Tanggal Lahir',
+  placeholder = 'Pilih tanggal lahir',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+// Function to calculate age with years, months, and days
+function calculateAge(birthDate: string | Date | undefined): string {
+  if (!birthDate) {
+    return 'Masukkan tanggal lahir'
+  }
+
+  try {
+    let dateObj: Date
+
+    if (typeof birthDate === 'string') {
+      dateObj = parseISO(birthDate)
+    } else {
+      dateObj = birthDate
+    }
+
+    const today = new Date()
+
+    // Calculate years, months, and days
+    const totalYears = differenceInYears(today, dateObj)
+
+    // Calculate remaining months after years
+    const yearsPassed = new Date(dateObj)
+    yearsPassed.setFullYear(yearsPassed.getFullYear() + totalYears)
+    const remainingMonths = differenceInMonths(today, yearsPassed)
+
+    // Calculate remaining days after years and months
+    const monthsPassed = new Date(yearsPassed)
+    monthsPassed.setMonth(monthsPassed.getMonth() + remainingMonths)
+    const remainingDays = differenceInDays(today, monthsPassed)
+
+    // Format the result
+    const parts = []
+    if (totalYears > 0) parts.push(`${totalYears} Tahun`)
+    if (remainingMonths > 0) parts.push(`${remainingMonths} Bulan`)
+    if (remainingDays > 0) parts.push(`${remainingDays} Hari`)
+
+    return parts.length > 0 ? parts.join(' ') : '0 Hari'
+  } catch {
+    return 'Masukkan tanggal lahir'
+  }
+}
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired && !isDisabled"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              :type="props.isWithTime ? 'datetime-local' : 'date'"
+              min="1900-01-01"
+              v-bind="componentField"
+              :placeholder="placeholder"
+              :disabled="isDisabled"
+              @update:model-value="
+                (value: string | number) => {
+                  const dateStr = typeof value === 'number' ? String(value) : value
+                  patientAge = calculateAge(dateStr)
+                }
+              "
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/vaccine-data/_common/select-vaccine-type.vue b/app/components/app/vaccine-data/_common/select-vaccine-type.vue
new file mode 100644
index 00000000..cde3fb66
--- /dev/null
+++ b/app/components/app/vaccine-data/_common/select-vaccine-type.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { PrbProgramTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+onMounted(() => {
+  
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="PrbProgramTypeOptList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/vaccine-data/detail.vue b/app/components/app/vaccine-data/detail.vue
new file mode 100644
index 00000000..2c79e461
--- /dev/null
+++ b/app/components/app/vaccine-data/detail.vue
@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import { type Variants, Badge } from '~/components/pub/ui/badge'
+import { cn, } from '~/lib/utils'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { VaccineData } from '~/models/vaccine-data';
+
+// #region Props & Emits
+const props = defineProps<{
+  instance: VaccineData | null
+}>()
+
+const emit = defineEmits<{
+  (e: 'click'): void
+}>()
+
+const dummy = [
+  {
+    id: 1,
+    number: 1,
+    name: 'Operasi',
+    code: 'OP-001'
+  }
+]
+
+// #endregion
+
+// #region State & Computed
+// #endregion
+
+// Computed addresses from nested data
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+
+// #endregion region
+
+// #region Utilities & event handlers
+function onClick() {
+  emit('click')
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <article :class="cn('mb-5 space-y-1',)">
+    <DetailRow label="Jenis Vaksin">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Tanggal Pemberian Vaksin">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Tanggal Kedaluwarsa Vaksin">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Nomor Batch Vaksin">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Dosis Vaksin">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Dosis Ke">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Lokasi Injeksi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    <DetailRow label="Tanggal Terlaksana">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+  </article>  
+
+    <div class="border-t-1 py-2 flex justify-end border-t-slate-300">
+      <PubMyUiNavFooterBa @click="onClick" />
+    </div>
+</template>
+
+<style scoped></style>
diff --git a/app/components/app/vaccine-data/entry.vue b/app/components/app/vaccine-data/entry.vue
new file mode 100644
index 00000000..4b8f291b
--- /dev/null
+++ b/app/components/app/vaccine-data/entry.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import SelectVaccineType from './_common/select-vaccine-type.vue'
+
+const props = withDefaults(defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>(), {
+
+})
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues ? initialValues : {}"
+  >
+    <DE.Block :col-count="3" :cell-flex="false">
+      <SelectVaccineType :errors="errors"
+        field-name="a1"
+        label="Jenis Vaksin" placeholder="Pilih Jenis Vaksin"
+        is-required
+      />
+      <SelectDate
+        field-name="a2"
+        label="Tanggal Pemberian Vaksin"
+        :errors="errors"
+        is-with-time
+      />
+      <SelectDate
+        field-name="a3"
+        label="Tanggal Kedaluwarsa Vaksin"
+        :errors="errors"
+        is-with-time
+      />
+    </DE.Block>
+    
+    <DE.Block :col-count="2" :cell-flex="false">
+      <InputBase :errors="errors"
+        field-name="a4"
+        label="Nomor Batch Vaksin" placeholder="Isi Nomor Batch Vaksin"
+      />
+      <InputBase :errors="errors"
+        field-name="a5"
+        label="Dosis Vaksin" placeholder="Isi Dosis Vaksin"
+        right-label="ml"
+        numeric-only
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Dosis Ke" placeholder="Isi Dosis Ke"
+        numeric-only
+      />
+      <InputBase :errors="errors"
+        field-name="a7"
+        label="Lokasi Injeksi" placeholder="Isi Lokasi Injeksi"
+      />
+    </DE.Block>
+  </Form>
+</template>
diff --git a/app/components/app/vaccine-data/list-doctor.cfg.ts b/app/components/app/vaccine-data/list-doctor.cfg.ts
new file mode 100644
index 00000000..be938aa5
--- /dev/null
+++ b/app/components/app/vaccine-data/list-doctor.cfg.ts
@@ -0,0 +1,53 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+import actionDoctor from '~/components/pub/my-ui/data/dropdown-action-dd.vue'
+import actionNursePhysio from '~/components/pub/my-ui/data/dropdown-action-detail.vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dd.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 50}, ],
+
+  headers: [
+    [
+      { label: 'Jenis Vaksin' },
+      { label: 'Tanggal Pemberian Vaksin' },
+      { label: 'Tanggal Kedaluwarsa Vaksin' },
+      { label: 'Dosis Ke' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['name1', 'date', 'date', 'name2', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+
+  },
+}
diff --git a/app/components/app/vaccine-data/list-nurse-physio.cfg.ts b/app/components/app/vaccine-data/list-nurse-physio.cfg.ts
new file mode 100644
index 00000000..acfc698c
--- /dev/null
+++ b/app/components/app/vaccine-data/list-nurse-physio.cfg.ts
@@ -0,0 +1,53 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+import actionDoctor from '~/components/pub/my-ui/data/dropdown-action-dd.vue'
+import actionNursePhysio from '~/components/pub/my-ui/data/dropdown-action-detail.vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-detail.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 50}, ],
+
+  headers: [
+    [
+      { label: 'Jenis Vaksin' },
+      { label: 'Tanggal Pemberian Vaksin' },
+      { label: 'Tanggal Kedaluwarsa Vaksin' },
+      { label: 'Dosis Ke' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['name1', 'date', 'date', 'name2', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+
+  },
+}
diff --git a/app/components/app/vaccine-data/list.vue b/app/components/app/vaccine-data/list.vue
new file mode 100644
index 00000000..7960112b
--- /dev/null
+++ b/app/components/app/vaccine-data/list.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config as configDoctor } from './list-doctor.cfg'
+import { config as configNursePhysio } from './list-nurse-physio.cfg'
+
+const props = withDefaults(defineProps<{
+  data: any[]
+  paginationMeta: PaginationMeta
+}>(), {
+  
+})
+
+const { user, } = useUserStore()
+const tableConfig = computed(() => {
+  if(user.activeRole === 'emp|doc' || user.activeRole === 'system') {
+    return configDoctor
+  } else {
+    return configNursePhysio
+  }
+})
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="tableConfig"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
diff --git a/app/components/content/control-letter/list.vue b/app/components/content/control-letter/list.vue
index 9be22012..5a879eb4 100644
--- a/app/components/content/control-letter/list.vue
+++ b/app/components/content/control-letter/list.vue
@@ -143,7 +143,7 @@ watch([recId, recAction, timestamp], () => {
       break
 
     case ActionEvents.showEdit:
-      if(pagePermission.canUpdate){
+      if(pagePermission.canUpdate){ 
         navigateTo({
           name: 'rehab-encounter-id-control-letter-control_letter_id-edit',
           params: { id: encounterId, "control_letter_id": recId.value },
@@ -186,7 +186,7 @@ watch([recId, recAction, timestamp], () => {
         @click="isHistoryDialogOpen = true">
         <Icon name="i-lucide-history" class="h-4 w-4" /> Riwayat Program Nasional</Button>
     </div>
-
+    
     <AppControlLetterList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
     <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
@@ -212,7 +212,7 @@ watch([recId, recAction, timestamp], () => {
         </div>
       </template>
     </RecordConfirmation>
-
+    
       <HistoryDialog
         v-model:is-modal-open="isHistoryDialogOpen"
         :data="historyData.data.value"
diff --git a/app/components/content/cp-lab-order/list.vue b/app/components/content/cp-lab-order/list.vue
index 73b9361c..8bb06569 100644
--- a/app/components/content/cp-lab-order/list.vue
+++ b/app/components/content/cp-lab-order/list.vue
@@ -21,7 +21,7 @@ import {
 
 // Apps
 import { getList, getDetail } from '~/services/mcu-order.service'
-import List from '~/components/app/mcu-order/list.vue'
+import List from '~/components/app/mcu-order/micro-list.vue'
 import type { McuOrder } from '~/models/mcu-order'
 
 const route = useRoute()
@@ -55,7 +55,7 @@ const {
 })
 
 const headerPrep: HeaderPrep = {
-  title: 'Order Lab PK',
+  title: 'Order Lab Mikro',
   icon: 'i-lucide-box',
   refSearchNav: {
     placeholder: 'Cari (min. 3 karakter)...',
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..3aeb1254 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -13,7 +13,11 @@ import { useSidebar } from '~/components/pub/ui/sidebar/utils'
 import { getServicePosition } from '~/lib/roles' // previously getPositionAs
 
 // Services
-import { getList as getEncounterList, remove as removeEncounter, cancel as cancelEncounter } from '~/services/encounter.service'
+import {
+  getList as getEncounterList,
+  remove as removeEncounter,
+  cancel as cancelEncounter,
+} from '~/services/encounter.service'
 
 // Apps
 import Content from '~/components/app/encounter/list.vue'
@@ -34,8 +38,14 @@ const props = defineProps<{
 const { setOpen } = useSidebar()
 setOpen(true)
 
+// Role reactivities
+const { getActiveRole } = useUserStore()
+
 // Main data
 const data = ref([])
+const dataFiltered = ref([])
+const filterParams = ref<any>({})
+const activeServicePosition = ref(getServicePosition(getActiveRole()))
 const isLoading = reactive<DataTableLoader>({
   summary: false,
   isTableLoading: false,
@@ -87,39 +97,38 @@ 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(() => 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}`)
-  } else if (recAction.value === ActionEvents.showEdit) {
-    navigateTo(`${basePath}/${recId.value}/edit`)
-  } else if (recAction.value === ActionEvents.showProcess) {
-    navigateTo(`${basePath}/${recId.value}/process`)
-  } else if (recAction.value === ActionEvents.showConfirmDelete) {
-    isRecordConfirmationOpen.value = true
-  }
-  recAction.value = '' // reset
+
+watch(getActiveRole, (role?: string) => {
+  activeServicePosition.value = getServicePosition(role)
 })
 
+watch(
+  () => recAction.value,
+  () => {
+    const basePath = `/${props.classCode}/encounter`
+    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}/detail`)
+    } else if (recAction.value === ActionEvents.showEdit) {
+      navigateTo(`${basePath}/${recId.value}/edit`)
+    } else if (recAction.value === ActionEvents.showProcess) {
+      navigateTo(`${basePath}/${recId.value}/process`)
+    } else if (recAction.value === ActionEvents.showConfirmDelete) {
+      isRecordConfirmationOpen.value = true
+    }
+    recAction.value = '' // reset
+  },
+)
+
 onMounted(() => {
   getPatientList()
 })
@@ -127,17 +136,21 @@ onMounted(() => {
 /////// Functions
 async function getPatientList() {
   isLoading.isTableLoading = true
+  const includesParams =
+    'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person,Responsible_Doctor,Responsible_Doctor-employee,Responsible_Doctor-employee-person'
+  data.value = []
   try {
-    const params: any = { includes: 'patient,patient-person' }
+    const params: any = { includes: includesParams, ...filterParams.value }
     if (props.classCode) {
-      params['class-code'] = props.classCode
+      params.class_code = props.classCode
     }
     if (props.subClassCode) {
-      params['sub-class-code'] = props.subClassCode
+      params.sub_class_code = props.subClassCode
     }
     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)
@@ -146,6 +159,15 @@ async function getPatientList() {
   }
 }
 
+function handleFilterApply(filters: { personName: string; startDate: string; endDate: string }) {
+  filterParams.value = {
+    'person-name': filters.personName,
+    'start-date': filters.startDate,
+    'end-date': filters.endDate,
+  }
+  getPatientList()
+}
+
 // Handle confirmation result
 async function handleConfirmCancel(record: any, action: string) {
   if (action === 'deactivate' && record?.id) {
@@ -240,7 +262,8 @@ function handleRemoveConfirmation() {
 <template>
   <CH.ContentHeader v-bind="hreaderPrep">
     <FilterNav
-      @onFilterClick="() => isFilterFormDialogOpen = true"
+      :active-positon="activeServicePosition"
+      @apply="handleFilterApply"
       @onExportPdf="() => {}"
       @onExportExcel="() => {}"
       @nExportCsv="() => {}"
@@ -256,11 +279,12 @@ function handleRemoveConfirmation() {
     size="lg"
     prevent-outside
   >
-    <FilterForm v-bind="filter"  />
+    <FilterForm v-bind="filter" />
   </Dialog>
 
   <!-- 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-bu.vue b/app/components/content/encounter/process-bu.vue
index 02fc7495..8285d5e6 100644
--- a/app/components/content/encounter/process-bu.vue
+++ b/app/components/content/encounter/process-bu.vue
@@ -26,6 +26,7 @@ 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 VaccineDataList from '~/components/content/vaccine-data/list.vue'
 
 const route = useRoute()
 const router = useRouter()
@@ -96,6 +97,7 @@ const tabs: TabItem[] = [
     component: DocUploadList,
     props: { encounter: data },
   },
+  { value: 'vaccine-data', label: 'Data Vaksin', component: VaccineDataList, props: { encounter: data } },
 ]
 </script>
 
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index f27a11fd..b97197d4 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -34,6 +34,7 @@ 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'
@@ -98,11 +99,17 @@ const protocolRows = [
   { 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-radiology', label: 'Order Radiologi', component: Radiology, props: { encounter_id: data.value.id } },
+  { value: 'mcu-lab-cp', label: 'Order Lab PK', component: CpLabOrder, props: { encounter_id: data.value.id } },
   { value: 'mcu-lab-micro', label: 'Order Lab Mikro' },
   { value: 'mcu-lab-pa', label: 'Order Lab PA' },
   { value: 'medical-action', label: 'Order Ruang Tindakan' },
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/mcu-order/entry.vue b/app/components/content/mcu-order/entry.vue
new file mode 100644
index 00000000..f07310b3
--- /dev/null
+++ b/app/components/content/mcu-order/entry.vue
@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import Nav from '~/components/pub/my-ui/nav-footer/ba-de-su.vue'
+import NavOk from '~/components/pub/my-ui/nav-footer/ok.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+
+import { useQueryCRUDMode } from '~/composables/useQueryCRUD'
+import { type HeaderPrep } from '~/components/pub/my-ui/data/types'
+
+// mcu src category
+import ScrCategorySwitcher from '~/components/app/mcu-src-category/switcher.vue'
+import { getList as getMcuCategoryList } from '~/services/mcu-src-category.service'
+
+// mcu src
+import { type McuSrc } from '~/models/mcu-src'
+import { getList as getMcuSrcList } from '~/services/mcu-src.service'
+import McuSrcPicker from '~/components/app/mcu-src/picker-accordion.vue'
+
+// mcu order
+import { getDetail } from '~/services/mcu-order.service'
+import Detail from '~/components/app/mcu-order/detail.vue'
+
+// mcu order item, manually not using composable
+import {
+  getList as getMcuOrderItemList,
+  create as createMcuOrderItem,
+  remove as removeMcuOrderItem,
+} from '~/services/mcu-order-item.service'
+import { type McuOrderItem } from '~/models/mcu-order-item'
+import ItemListEntry from '~/components/app/mcu-order-item/list-entry.vue'
+
+// props
+const props = defineProps<{
+  encounter_id: number
+  scopeCode: string
+}>()
+
+// declaration & flows
+
+// MCU Order
+const { backToList, crudQueryParams } = useQueryCRUD()
+const id = crudQueryParams.value.recordId
+const dataRes = await getDetail(
+  typeof id === 'string' ? parseInt(id) : 0,
+  { includes: 'encounter,doctor,doctor-employee,doctor-employee-person' }
+)
+const data = dataRes.body?.data
+
+// MCU items
+const items = ref<McuOrderItem[]>([])
+
+// MCU Categories
+const mcuSrcCategoryRes = await getMcuCategoryList({ 'scope-code': props.scopeCode })
+const mcuSrcCategories = mcuSrcCategoryRes.body?.data
+const selectedMcuSrcCategory_code = ref('')
+
+// MCU Sources
+const mcuSrcs = ref<McuSrc[]>([])
+
+// const {
+//   data: items,
+//   fetchData: getItems,
+// } = usePaginatedList<McuOrderItem> ({
+//   fetchFn: async ({ page, search }) => {
+//     const result = await getMcuOrderItemList({ 'mcu-order-id': id, search, page })
+//     if (result.success) {
+//       items.value = result.body.data
+//     }
+//     return { success: result.success || false, body: result.body || {} }
+//   },
+//   entityName: 'mcu-order-item',
+// })
+
+const headerPrep: HeaderPrep = {
+  title: 'Detail dan List Item Order Radiologi ',
+  icon: 'i-lucide-box',
+}
+
+const pickerDialogOpen = ref(false)
+
+onMounted(async () => {
+  await getItems()
+})
+
+watch(selectedMcuSrcCategory_code, async () => {
+  const res = await getMcuSrcList({ 'mcu-src-category-code': selectedMcuSrcCategory_code.value })
+  mcuSrcs.value = res.body?.data
+})
+
+function navClick(type: 'back' | 'delete' | 'draft' | 'submit') {
+  if (type === 'back') {
+    backToList()
+  }
+}
+
+function requestItem() {
+  pickerDialogOpen.value = true
+}
+
+async function pickItem(item: McuSrc) {
+  const exItem = items.value.find(e => e.mcuSrc_code === item.code)
+  if (exItem) {
+    await removeMcuOrderItem(exItem.id)
+    await getItems()
+  } else {
+    const intId = parseInt(id?.toString() || '0')
+    await createMcuOrderItem({
+      mcuOrder_id: intId,
+      mcuSrc_code: item.code,
+    })
+    await getItems()
+  }
+}
+
+async function getItems() {
+  const itemsRes = await getMcuOrderItemList({ 'mcu-order-id': id, includes: 'mcuSrc,mcuSrc-mcuSrcCategory' })
+  if (itemsRes.success) {
+      items.value = itemsRes.body.data
+  } else {
+    items.value = []
+  }
+}
+</script>
+
+<template>
+  <Header
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    class="mb-4 xl:mb-5"
+  />
+
+  <Detail :data="data" />
+
+  <ItemListEntry
+    :data="items"
+    @requestItem="requestItem"/>
+  <Separator class="my-5" />
+
+  <div class="w-full flex justify-center">
+    <Nav @click="navClick" />
+  </div>
+
+  <Dialog
+    v-model:open="pickerDialogOpen"
+    title="Pilih Item"
+    size="2xl"
+    prevent-outside
+  >
+    <ScrCategorySwitcher :data="mcuSrcCategories" v-model="selectedMcuSrcCategory_code" />
+    <McuSrcPicker v-model="items" :data-source="mcuSrcs" @pick="pickItem" />
+    <Separator />
+    <NavOk @click="() => pickerDialogOpen = false" class="justify-center" />
+  </Dialog>
+</template>
diff --git a/app/components/content/mcu-order/list.vue b/app/components/content/mcu-order/list.vue
new file mode 100644
index 00000000..6fcff867
--- /dev/null
+++ b/app/components/content/mcu-order/list.vue
@@ -0,0 +1,198 @@
+<script setup lang="ts">
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+
+// Handlers
+import type { ToastFn } from '~/handlers/_handler'
+
+// Apps
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  handleActionSave,
+  handleActionRemove,
+} from '~/handlers/mcu-order.handler'
+import { getList, getDetail, submit } from '~/services/mcu-order.service'
+import type { McuOrder } from '~/models/mcu-order'
+// import List from '~/components/app/mcu-order/micro-list.vue'
+import ConfirmationInfo from '~/components/app/mcu-order/confirmation-info.vue'
+
+// Props
+const props = defineProps<{
+  scopeCode: string
+}>()
+
+// Common preparations
+const route = useRoute()
+const { crudQueryParams } = useQueryCRUD()
+
+const title = ref('')
+const plainEid = route.params.id
+const encounter_id = (plainEid && typeof plainEid == 'string') ? parseInt(plainEid) : 0 // here the
+const isSubmitConfirmationOpen = ref(false)
+
+// Data
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  fetchData: getMyList,
+} = usePaginatedList<McuOrder>({
+  fetchFn: async ({ page, search }) => {
+    const result = await getList({
+      search,
+      page,
+      'scope-code': props.scopeCode,
+      'encounter-id': encounter_id,
+      includes: 'doctor,doctor-employee,doctor-employee-person,items,items-mcuSrc',
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'mcu-order'
+})
+
+// Header
+const headerPrep: HeaderPrep = {
+  title: 'Order Lab Mikro',
+  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: async () => {
+      const saveResp = await handleActionSave({ encounter_id, scope_code: props.scopeCode }, () => {}, () =>{}, toast)
+      if (saveResp.success) {
+        crudQueryParams.value = { mode: 'entry', recordId: saveResp.body?.data?.id.toString() }
+      }
+    },
+  },
+}
+
+// List component
+let List: Component
+if(props.scopeCode == 'radiology') {
+  List = defineAsyncComponent(() => import('~/components/content/encounter/status.vue'))
+} else if(props.scopeCode == 'cp-lab') {
+  List = defineAsyncComponent(() => import('~/components/content/encounter/status.vue'))
+} else if (props.scopeCode == 'micro-lab') {
+  List = defineAsyncComponent(() => import('~/components/app/mcu-order/micro-list.vue'))
+} else {
+  List = defineAsyncComponent(() => import('~/components/content/encounter/status.vue'))
+}
+
+// Reactivities
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getMyDetail(recId.value)
+      title.value = 'Detail Order Lab PK'
+      isReadonly.value = true
+      break
+    case ActionEvents.showEdit:
+      getMyDetail(recId.value)
+      title.value = 'Edit Order Lab PK'
+      isReadonly.value = false
+      break
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+///// Functions
+async function getMyDetail (id: number | string) {
+  const result = await getDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
+  }
+}
+
+function cancel(data: McuOrder) {
+  recId.value = data.id
+  recItem.value = data
+  isRecordConfirmationOpen.value = true
+}
+
+function edit(data: McuOrder) {
+  crudQueryParams.value = { mode: 'entry', recordId: data.id.toString() }
+}
+
+function confirmSubmit(data: McuOrder) {
+  recId.value = data.id
+  recItem.value = data
+  isSubmitConfirmationOpen.value = true
+}
+
+async function handleActionSubmit(id: number, refresh: () => void, toast: ToastFn) {
+  const result = await submit(id)
+  if (result.success) {
+    toast({ title: 'Berhasil', description: 'Resep telah di ajukan', variant: 'default' })
+    setTimeout(refresh, 300)
+  } else {
+    toast({ title: 'Gagal', description: 'Gagal menjalankan perintah', variant: 'destructive' })
+  }
+}
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <List
+    v-if="!isLoading.dataListLoading"
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @cancel="cancel"
+    @edit="edit"
+    @submit="confirmSubmit"
+  />
+
+  <RecordConfirmation
+    v-model:open="isRecordConfirmationOpen"
+    action="delete"
+    :record="recItem"
+    @confirm="() => handleActionRemove(recId, getMyList, toast)"
+    @cancel=""
+  >
+    <ConfirmationInfo :rec-item="recItem" />
+  </RecordConfirmation>
+
+  <RecordConfirmation
+    v-model:open="isSubmitConfirmationOpen"
+    action="delete"
+    customTitle="Ajukan Resep"
+    customMessage="Proses akan mengajukan resep ini untuk diproses lebih lanjut. Lanjutkan?"
+    customConfirmText="Ajukan"
+    :record="recItem"
+    @confirm="() => handleActionSubmit(recId, getMyList, toast)"
+    @cancel=""
+  >
+    <ConfirmationInfo :rec-item="recItem" />
+  </RecordConfirmation>
+</template>
diff --git a/app/components/content/mcu-order/main.vue b/app/components/content/mcu-order/main.vue
new file mode 100644
index 00000000..033d093f
--- /dev/null
+++ b/app/components/content/mcu-order/main.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+//
+import List from './list.vue'
+import Entry from './entry.vue'
+
+const props = defineProps<{
+  encounter_id: number
+}>()
+
+const { mode } = useQueryCRUDMode()
+</script>
+
+<template>
+  <List v-if="mode === 'list'" :encounter_id="encounter_id" />
+  <Entry v-else :encounter_id="encounter_id" />
+</template>
diff --git a/app/components/content/micro-lab-order/entry.vue b/app/components/content/micro-lab-order/entry.vue
new file mode 100644
index 00000000..e6ef9600
--- /dev/null
+++ b/app/components/content/micro-lab-order/entry.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import Entry from '~/components/content/mcu-order/entry.vue'
+
+defineProps<{
+  encounter_id: number
+}>()
+</script>
+
+<template>
+  <Entry :encounter_id="encounter_id" scope-code="micro-lab" />
+</template>
diff --git a/app/components/content/micro-lab-order/list.vue b/app/components/content/micro-lab-order/list.vue
new file mode 100644
index 00000000..c2bda748
--- /dev/null
+++ b/app/components/content/micro-lab-order/list.vue
@@ -0,0 +1,8 @@
+<script setup lang="ts">
+import List from '~/components/content/mcu-order/list.vue'
+
+</script>
+
+<template>
+  <List scope-code="micro-lab" />
+</template>
diff --git a/app/components/content/micro-lab-order/main.vue b/app/components/content/micro-lab-order/main.vue
new file mode 100644
index 00000000..033d093f
--- /dev/null
+++ b/app/components/content/micro-lab-order/main.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+//
+import List from './list.vue'
+import Entry from './entry.vue'
+
+const props = defineProps<{
+  encounter_id: number
+}>()
+
+const { mode } = useQueryCRUDMode()
+</script>
+
+<template>
+  <List v-if="mode === 'list'" :encounter_id="encounter_id" />
+  <Entry v-else :encounter_id="encounter_id" />
+</template>
diff --git a/app/components/content/prb/bpjs-list.vue b/app/components/content/prb/bpjs-list.vue
new file mode 100644
index 00000000..8ce0d050
--- /dev/null
+++ b/app/components/content/prb/bpjs-list.vue
@@ -0,0 +1,225 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Imports
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Filter from '~/components/pub/my-ui/nav-header/filter.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { getList, remove } from '~/services/prb.service'
+import { toast } from '~/components/pub/ui/toast'
+import type { Encounter } from '~/models/encounter'
+import WarningAlert from '~/components/pub/my-ui/alert/warning-alert.vue'
+import type { Prb } from '~/models/prb'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+// #endregion
+
+// #region State
+const props = withDefaults(defineProps<{
+  encounter?: Encounter
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: '', }),
+  entityName: 'prb',
+})
+const prbHistory = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'prb-history',
+})
+const dummy = [
+  {
+    "id": 1,
+    "date": new Date().toISOString(),
+    "name1": "Dr. Smith",
+    "name2": "Maria S.",
+    "name3": "Project Alpha",
+    "name4": "Completed",
+    "name5": 95.5
+  },
+]
+
+const isHistoryDialogOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const isFilterDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+const summaryLoading = ref(false)
+const isRequirementsMet = ref(true)
+const Prb = ref<Prb | null>(null)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<any>(null)
+
+const headerPrep: HeaderPrep = {
+  title: "Program Rujuk Balik",
+  icon: 'i-lucide-history',
+}
+if(true){
+  headerPrep.addNav = {
+    label: "Program Rujuk Balik",
+    onClick: () => navigateTo({
+        name: 'integration-bpjs-prb-add',
+      }),
+  };
+}
+headerPrep.components = [
+  {
+    component: defineAsyncComponent(() => import('~/components/app/prb/_common/btn-history.vue')),
+    props: {  }
+  },
+];
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    isFilterDialogOpen.value = true
+  },
+  onInput: (val: string) => {
+    searchInput.value = val
+  },
+  onClear: () => {
+    searchInput.value = ''
+  },
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getListData()
+})
+// #endregion
+
+// #region Functions
+async function getListData() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching Data:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+async function handleConfirmDelete(record: any, action: string) {
+  if (action === 'delete' && record?.id) {
+    try {
+      const result = await remove(record.id)
+      if (result.success) {
+        toast({ title: 'Berhasil', description: 'Data berhasil dihapus', variant: 'default' })
+        await fetchData()
+      } else {
+        toast({ title: 'Gagal', description: `Data gagal dihapus`, variant: 'destructive' })
+      }
+    } catch (error) {
+      toast({ title: 'Gagal', description: `Something went wrong`, variant: 'destructive' })
+    }
+  }
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+
+function handleFiltering() {
+  isFilterDialogOpen.value = false
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+provide('table_data_loader', isLoading)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'integration-bpjs-prb-prb_id-edit',
+        params: { id: encounterId, "prb_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true      
+      break
+
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <WarningAlert v-if="!isRequirementsMet"
+    class="mb-5"
+    text="Syarat pembuatan PRB belum terpenuhi"
+    :description="[
+      'Lanjutan Penatalaksanaan Pasien harus terisi Dirujuk Eksternal',
+      'Jenis Pembayaran pasien harus JKN'
+    ]" />
+
+  <div v-else>
+    <Header :prep="headerPrep" />
+
+    <Filter
+      :prep="headerPrep"
+      :ref-search-nav="refSearchNav"
+      :enable-export="false"
+    />
+
+    <AppPrbList :is-bpjs="true" :data="dummy" />
+
+    <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+      <AppPrbHistoryList
+        :data="dummy"
+        :pagination-meta="prbHistory.paginationMeta"
+        @page-change="prbHistory.handlePageChange" />
+    </Dialog>
+
+    <Dialog v-model:open="isFilterDialogOpen" title="Filter" size="lg">
+      <AppPrbCommonFilter @submit="handleFiltering" />
+    </Dialog>
+
+    <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+      <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+    </Dialog>
+
+    <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
+      @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
+      <template #default="{ record }">
+        <div class="text-sm">
+          <p>
+            <strong>ID:</strong>
+            {{ record?.id }}
+          </p>
+          <p v-if="record?.firstName">
+            <strong>Nama:</strong>
+            {{ record.firstName }}
+          </p>
+          <p v-if="record?.code">
+            <strong>Kode:</strong>
+            {{ record.cellphone }}
+          </p>
+        </div>
+      </template>
+    </RecordConfirmation>
+  </div>
+</template>
diff --git a/app/components/content/prb/detail.vue b/app/components/content/prb/detail.vue
new file mode 100644
index 00000000..4de8f260
--- /dev/null
+++ b/app/components/content/prb/detail.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import { withBase } from '~/models/_base'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
+import type { Patient } from '~/models/patient'
+import type { Person } from '~/models/person'
+import { getDetail } from '~/services/prb.service'
+
+// Components
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import type { Prb } from '~/models/prb'
+
+// #region Props & Emits
+const props = defineProps<{
+}>()
+
+// #endregion
+
+// #region State & Computed
+
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const PrbId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+const Prb = ref<Prb | null>(null)
+
+const headerPrep: HeaderPrep = {
+  title: 'Detail Program Rujuk Balik',
+  icon: 'i-lucide-newspaper',
+}
+
+// #endregion
+
+// #region Lifecycle Hooks
+// onMounted(async () => {
+//   const result = await getDetail(controlLetterId, {
+//     includes: "unit,specialist,subspecialist,doctor-employee-person",
+//   })
+//   if (result.success) {
+//     controlLetter.value = result.body?.data
+//   }
+// })
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+// #endregion region
+
+// #region Utilities & event handlers
+function handleAction() {
+  goBack()
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <Header :prep="headerPrep" :ref-search-nav="headerPrep.refSearchNav" />
+  <AppPrbDetail :instance="Prb" @click="handleAction" />
+</template>
diff --git a/app/components/content/prb/entry.vue b/app/components/content/prb/entry.vue
new file mode 100644
index 00000000..244c49b0
--- /dev/null
+++ b/app/components/content/prb/entry.vue
@@ -0,0 +1,160 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { Patient, genPatientProps } from '~/models/patient'
+import type { ExposedForm } from '~/types/form'
+import type { PatientBase } from '~/models/patient'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { genPatient } from '~/models/patient'
+import { PatientSchema } from '~/schemas/patient.schema'
+import { PersonAddressRelativeSchema } from '~/schemas/person-address-relative.schema'
+import { PersonAddressSchema } from '~/schemas/person-address.schema'
+import { PersonContactListSchema } from '~/schemas/person-contact.schema'
+import { PersonFamiliesSchema } from '~/schemas/person-family.schema'
+import { ResponsiblePersonSchema } from '~/schemas/person-relative.schema'
+import { uploadAttachment } from '~/services/patient.service'
+import { getDetail, update } from '~/services/prb.service'
+import type { Prb } from '~/models/prb'
+import ActionDialog from '~/components/pub/my-ui/nav-footer/ba-su.vue'
+
+import { toast } from '~/components/pub/ui/toast'
+import { withBase } from '~/models/_base'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { PrbSchema } from '~/schemas/prb.schema'
+import { formatDateYyyyMmDd } from '~/lib/date'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { getList, remove } from '~/services/prb.service'
+import { handleActionEdit } from '~/handlers/prb.handler'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import { formatDateToDatetimeLocal } from '~/lib/utils'
+
+// #region Props & Emits
+const props = withDefaults(defineProps<{
+  callbackUrl?: string
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+
+// form related state
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'prb',
+})
+// #endregion
+
+// #region State & Computed
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const PrbId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const Prb = ref({})
+const isConfirmationOpen = ref(false)
+const selectedOperativeAction = ref<any>(null)
+
+const isSepDialogOpen = ref(false)
+provide("isSepDialogOpen", isSepDialogOpen);
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(PrbId)
+  if (result.success) {
+    const responseData = {...result.body.data, date: formatDateYyyyMmDd(result.body.data.date)}
+    Prb.value = responseData
+    inputForm.value?.setValues(responseData)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const response = await handleActionEdit(
+    PrbId,
+    await composeFormData(),
+    () => { },
+    () => { },
+    toast,
+  )
+  goBack()
+}
+
+async function composeFormData(): Promise<Prb> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.encounter_id = encounterId
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) {
+      await navigateTo(props.callbackUrl)
+      return
+    }
+
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+
+const initialValues = {
+  a1: "",
+  a2: formatDateToDatetimeLocal(new Date()),
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Update Program Rujuk Balik</div>
+  <AppPrbEntry
+    ref="inputForm"
+    :schema="PrbSchema"
+    :initial-values="initialValues"
+    :is-bpjs="isBpjs"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false" @click="handleActionClick" />
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
+
+<style scoped>
+/* component style */
+</style>
diff --git a/app/components/content/prb/list.vue b/app/components/content/prb/list.vue
new file mode 100644
index 00000000..a1c09696
--- /dev/null
+++ b/app/components/content/prb/list.vue
@@ -0,0 +1,202 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Imports
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Filter from '~/components/pub/my-ui/nav-header/filter.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { getList, remove } from '~/services/prb.service'
+import { toast } from '~/components/pub/ui/toast'
+import type { Encounter } from '~/models/encounter'
+import WarningAlert from '~/components/pub/my-ui/alert/warning-alert.vue'
+import type { Prb } from '~/models/prb'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+// #endregion
+
+// #region State
+const props = withDefaults(defineProps<{
+  encounter?: Encounter
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: '', }),
+  entityName: 'prb',
+})
+const prbHistory = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'prb-history',
+})
+const dummy = [
+  {
+    "id": 1,
+    "date": new Date().toISOString(),
+    "name1": "Dr. Smith",
+    "name2": "Maria S.",
+    "name3": "Project Alpha",
+    "name4": "Completed",
+    "name5": 95.5
+  },
+]
+
+const isHistoryDialogOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+const summaryLoading = ref(false)
+const isRequirementsMet = ref(true)
+const Prb = ref<Prb | null>(null)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<any>(null)
+
+const headerPrep: HeaderPrep = {
+  title: "Program Rujuk Balik",
+  icon: 'i-lucide-history',
+}
+if(true){
+  headerPrep.addNav = {
+    label: "Program Rujuk Balik",
+    onClick: () => navigateTo({
+        name: 'rehab-encounter-id-prb-add',
+        params: { id: encounterId },
+      }),
+  };
+}
+headerPrep.components = [
+  {
+    component: defineAsyncComponent(() => import('~/components/app/prb/_common/btn-history.vue')),
+    props: {  }
+  },
+];
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getListData()
+})
+// #endregion
+
+// #region Functions
+async function getListData() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching Data:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+async function handleConfirmDelete(record: any, action: string) {
+  if (action === 'delete' && record?.id) {
+    try {
+      const result = await remove(record.id)
+      if (result.success) {
+        toast({ title: 'Berhasil', description: 'Data berhasil dihapus', variant: 'default' })
+        await fetchData()
+      } else {
+        toast({ title: 'Gagal', description: `Data gagal dihapus`, variant: 'destructive' })
+      }
+    } catch (error) {
+      toast({ title: 'Gagal', description: `Something went wrong`, variant: 'destructive' })
+    }
+  }
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+provide('table_data_loader', isLoading)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'rehab-encounter-id-prb-prb_id-edit',
+        params: { id: encounterId, "prb_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true      
+      break
+
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <WarningAlert v-if="!isRequirementsMet"
+    class="mb-5"
+    text="Syarat pembuatan PRB belum terpenuhi"
+    :description="[
+      'Lanjutan Penatalaksanaan Pasien harus terisi Dirujuk Eksternal',
+      'Jenis Pembayaran pasien harus JKN'
+    ]" />
+
+  <div v-else>
+    <Header :prep="headerPrep" />
+
+    <AppPrbDetail :instance="Prb" />
+    <h1 class="font-semibold text-lg mb-2">Obat</h1>
+    <AppPrbList :is-bpjs="isBpjs" :data="dummy" />
+
+    <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+      <AppPrbHistoryList        
+        :data="dummy"
+        :pagination-meta="prbHistory.paginationMeta"
+        @page-change="prbHistory.handlePageChange" />
+    </Dialog>
+
+    <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+      <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+    </Dialog>
+
+    <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
+      @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
+      <template #default="{ record }">
+        <div class="text-sm">
+          <p>
+            <strong>ID:</strong>
+            {{ record?.id }}
+          </p>
+          <p v-if="record?.firstName">
+            <strong>Nama:</strong>
+            {{ record.firstName }}
+          </p>
+          <p v-if="record?.code">
+            <strong>Kode:</strong>
+            {{ record.cellphone }}
+          </p>
+        </div>
+      </template>
+    </RecordConfirmation>
+  </div>
+</template>
diff --git a/app/components/content/procedure-room-order/entry.vue b/app/components/content/procedure-room-order/entry.vue
new file mode 100644
index 00000000..ad780e5b
--- /dev/null
+++ b/app/components/content/procedure-room-order/entry.vue
@@ -0,0 +1,173 @@
+<script setup lang="ts">
+//
+import * as CH from '~/components/pub/my-ui/content-header'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import NavEntry from '~/components/pub/my-ui/nav-footer/ba-de-dr-su.vue'
+import NavDetail from '~/components/pub/my-ui/nav-footer/ba.vue'
+import NavOk from '~/components/pub/my-ui/nav-footer/ok.vue'
+
+// Procedure Room
+import type { ProcedureRoom } from '~/models/procedure-room'
+import { getList as getProcedureRoomList } from '~/services/procedure-room.service'
+import PRSwitcher from '~/components/app/procedure-room/switcher.vue'
+import PRMultiOptPicker  from '~/components/app/procedure-room/multi-opt-picker.vue'
+import PRPicker  from '~/components/app/procedure-room/picker.vue'
+
+// Material Package
+import type { MaterialPackage } from '~/models/material-package'
+import { getList as getMaterialPackageList } from '~/services/material-package.service'
+
+// Material Package Item
+import type { MaterialPackageItem } from '~/models/material-package-item'
+import { getList as getmaterialPackageItems } from '~/services/material-package-item.service'
+import MPSwitcher from '~/components/app/material-package/switcher.vue'
+import MPIQuickList from '~/components/app/material-package-item/quick-list.vue'
+
+// Main data
+import { getDetail } from '~/services/procedure-room-order.service'
+import Detail from '~/components/app/procedure-room-order/detail.vue'
+
+// Items data
+import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item'
+import {
+  getList as getOrderItemList,
+  create as createOrderItem,
+  remove as removeOrderItem,
+} from '~/services/procedure-room-order-item.service'
+import ItemListEntry from '~/components/app/procedure-room-order-item/list-entry.vue'
+import ItemListDetail from '~/components/app/procedure-room-order-item/list-detail.vue'
+
+// data
+const { backToList, crudQueryParams } = useQueryCRUD()
+const id = crudQueryParams.value.recordId
+const dataRes = await getDetail(
+  typeof id === 'string' ? parseInt(id) : 0,
+  { includes: 'encounter,doctor,doctor-employee,doctor-employee-person' }
+)
+const data = dataRes.body?.data
+const items = ref<ProcedureRoomOrderItem[]>([])
+
+// Header
+const headerConfig: CH.Config = {
+  title: 'Order Ruang Tindakan',
+  icon: 'i-lucide-box',
+}
+
+//
+const pickerDialogOpen = ref(false)
+const procedureRooms = ref<ProcedureRoom[]>([])
+const procedureRoomType = ref('procedure')
+getProcedureRooms(procedureRoomType.value)
+watch(procedureRoomType, async (newValue) => {
+  getProcedureRooms(newValue)
+})
+
+//
+const materialPackages = ref<MaterialPackage[]>([])
+const selectedMaterialPackage = ref('')
+const res = await getMaterialPackageList()
+if (res.success) {
+  materialPackages.value = res.body.data
+}
+
+//
+const materialPackageItems = ref<MaterialPackageItem[]>([])
+watch(selectedMaterialPackage, async (newValue) => {
+  const res = await getmaterialPackageItems({
+    'material-package-code': selectedMaterialPackage.value,
+    includes: 'material'
+  })
+  if (res.success) {
+    materialPackageItems.value = res.body.data
+  }
+})
+
+// last flow
+onMounted(async () => {
+  await getItems()
+})
+
+///// functions
+async function getProcedureRooms(typeCode: string) {
+  const res = await getProcedureRoomList({ 'type-code': typeCode, includes: 'infra' })
+  if (res.success) {
+    procedureRooms.value = res.body.data
+  }
+}
+
+async function getItems() {
+  const res = await getOrderItemList({
+    'procedure-room-order-id': crudQueryParams.value.recordId,
+    includes: 'procedureRoom,procedureRoom-infra',
+  })
+  if (res.success) {
+    items.value = res.body.data
+  }
+}
+
+async function pickItem(item: ProcedureRoom) {
+  const exItem = items.value.find(e => e.procedureRoom_code === item.code)
+  if (exItem) {
+    await removeOrderItem(exItem.id)
+    await getItems()
+  } else {
+    const intId = parseInt(id?.toString() || '0')
+    await createOrderItem({
+      procedureRoomOrder_id: intId,
+      procedureRoom_code: item.code,
+    })
+    await getItems()
+  }
+}
+
+function requestItem() {
+  pickerDialogOpen.value = true
+}
+
+function navClick(type: 'back' | 'delete' | 'draft' | 'submit') {
+  if (type === 'back') {
+    backToList()
+  }
+}
+
+</script>
+
+<template>
+  <CH.ContentHeader v-bind="headerConfig" />
+
+  <Separator class="mb-4" />
+
+  <Detail :data="data" />
+
+  <template v-if="data.status_code == 'new'">
+    <ItemListEntry :data="items" @requestItem="requestItem" />
+    <MPSwitcher :data="materialPackages" v-model="selectedMaterialPackage" />
+  </template>
+  <template v-else>
+    <ItemListDetail :data="items" @requestItem="requestItem" />
+  </template>
+  <MPIQuickList :data="materialPackageItems" />
+
+  <div class="w-full flex justify-center">
+    <NavEntry v-if="data.status_code == 'new'" @click="navClick" />
+    <NavDetail v-else @click="navClick" />
+  </div>
+
+  <Dialog
+    v-model:open="pickerDialogOpen"
+    title="Pilih Item"
+    size="2xl"
+    prevent-outside
+  >
+    <PRSwitcher v-model="procedureRoomType" />
+    <PRPicker
+      :data="procedureRooms"
+      :pick-mode="procedureRoomType == 'procedure' ? 'multi' : 'single'"
+      v-model="items"
+      @pick="pickItem"
+    />
+
+    <Separator />
+    <NavOk @click="() => pickerDialogOpen = false" class="justify-center" />
+  </Dialog>
+</template>
diff --git a/app/components/content/procedure-room-order/list.vue b/app/components/content/procedure-room-order/list.vue
new file mode 100644
index 00000000..d742941c
--- /dev/null
+++ b/app/components/content/procedure-room-order/list.vue
@@ -0,0 +1,191 @@
+<script setup lang="ts">
+// Composables
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+// Handlers
+import type { ToastFn } from '~/handlers/_handler'
+
+// Pubs component
+import { toast } from '~/components/pub/ui/toast'
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Order
+import {
+  recId,
+  recAction,
+  recItem,
+  isRecordConfirmationOpen,
+  handleActionRemove,
+} from '~/handlers/procedure-room-order.handler'
+import { getList, create, submit } from '~/services/procedure-room-order.service'
+import type { ProcedureRoomOrder } from '~/models/procedure-room-order'
+import List from '~/components/app/procedure-room-order/list.vue'
+
+// Common prep
+const route = useRoute()
+const { setQueryParams } = useQueryParam()
+const { crudQueryParams } = useQueryCRUD()
+
+const plainEid = route.params.id
+const encounter_id = (plainEid && typeof plainEid == 'string') ? parseInt(plainEid) : 0
+const isSubmitConfirmationOpen = ref(false)
+
+// Main data
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  fetchData: getMyList,
+} = usePaginatedList<ProcedureRoomOrder>({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      'encounter-id': encounter_id,
+      includes: 'items',
+      search: params.search,
+      page: params.page,
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'prescription'
+})
+
+// Header things
+const headerPrep: HeaderPrep = {
+  title: 'Order Ruang Tindakan',
+  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: async () => {
+      recItem.value = null
+      recId.value = 0
+      const res = await create({ encounter_id })
+      if (res.success) {
+        crudQueryParams.value = { mode: 'entry', recordId: res.body?.data.id.toString() || '0' }
+      }
+    },
+  },
+}
+
+// list actions
+const timestamp = ref<any>({})
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+provide('timestamp', timestamp)
+watch(recAction, () => {
+  if (!recAction.value) {
+    return
+  } else if (recAction.value === ActionEvents.showDetail) {
+    crudQueryParams.value = { mode: 'entry', recordId: recId.value || '0' }
+  } else if (recAction.value === ActionEvents.showConfirmSubmit) {
+    isSubmitConfirmationOpen.value = true
+  } else if (recAction.value === ActionEvents.showConfirmDelete) {
+    isRecordConfirmationOpen.value = true
+  }
+  recAction.value = ''
+})
+
+///// functions
+
+function confirmCancel(data: ProcedureRoomOrder) {
+  recId.value = data.id
+  recItem.value = data
+  isRecordConfirmationOpen.value = true
+}
+
+function goToEdit(data: ProcedureRoomOrder) {
+  setQueryParams({
+    'mode': 'entry',
+    'id': data.id.toString()
+  })
+  recItem.value = data
+}
+
+function confirmSubmit(data: ProcedureRoomOrder) {
+  recId.value = data.id
+  recItem.value = data
+  isSubmitConfirmationOpen.value = true
+}
+
+async function handleActionSubmit(id: number, refresh: () => void, toast: ToastFn) {
+  const result = await submit(id)
+  if (result.success) {
+    toast({ title: 'Berhasil', description: 'Resep telah di ajukan', variant: 'default' })
+    setTimeout(refresh, 300)
+  } else {
+    toast({ title: 'Gagal', description: 'Gagal menjalankan perintah', variant: 'destructive' })
+  }
+}
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <List
+    v-if="!isLoading.dataListLoading"
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @cancel="confirmCancel"
+    @edit="goToEdit"
+    @submit="confirmSubmit"
+  />
+
+  <RecordConfirmation
+    v-model:open="isRecordConfirmationOpen"
+    action="delete"
+    :record="recItem"
+    @confirm="() => handleActionRemove(recId, getMyList, toast)"
+    @cancel=""
+  >
+    <div class="flex mb-2">
+      <div class="w-20">Tanggal</div>
+      <div class="w-4">:</div>
+      <div class="">{{ recItem.createdAt?.substring(0, 10) }}</div>
+    </div>
+    <div class="flex">
+      <div class="w-20">DPJP</div>
+      <div class="w-4">:</div>
+      <div class="">{{ recItem.doctor?.employee?.person?.name }}</div>
+    </div>
+  </RecordConfirmation>
+
+  <RecordConfirmation
+    v-model:open="isSubmitConfirmationOpen"
+    action="delete"
+    customTitle="Ajukan Resep"
+    customMessage="Proses akan mengajukan resep ini untuk diproses lebih lanjut. Lanjutkan?"
+    customConfirmText="Ajukan"
+    :record="recItem"
+    @confirm="() => handleActionSubmit(recId, getMyList, toast)"
+    @cancel=""
+  >
+    <div class="flex mb-2">
+      <div class="w-20">Tanggal</div>
+      <div class="w-4">:</div>
+      <div class="">{{ recItem.createdAt.substring(0, 10) }}</div>
+    </div>
+    <div class="flex">
+      <div class="w-20">DPJP</div>
+      <div class="w-4">:</div>
+      <div class="">{{ recItem.doctor?.employee?.person?.name }}</div>
+    </div>
+  </RecordConfirmation>
+</template>
diff --git a/app/components/content/procedure-room-order/main.vue b/app/components/content/procedure-room-order/main.vue
new file mode 100644
index 00000000..61250fe1
--- /dev/null
+++ b/app/components/content/procedure-room-order/main.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+//
+import List from './list.vue'
+import Entry from './entry.vue'
+
+const props = defineProps<{
+  encounter_id: number
+}>()
+
+const { crudQueryParams } = useQueryCRUD()
+</script>
+
+<template>
+  <List v-if="crudQueryParams.mode === 'list'" :encounter_id="encounter_id" />
+  <Entry v-else :encounter_id="encounter_id" />
+  <div class="hidden">{{ crudQueryParams.mode }}</div>
+</template>
diff --git a/app/components/content/radiology-order/list.vue b/app/components/content/radiology-order/list.vue
index b2c8571d..47c822e9 100644
--- a/app/components/content/radiology-order/list.vue
+++ b/app/components/content/radiology-order/list.vue
@@ -13,7 +13,6 @@ import {
   recAction,
   recItem,
   isReadonly,
-  isFormEntryDialogOpen,
   isRecordConfirmationOpen,
   handleActionSave,
   handleActionRemove,
@@ -28,6 +27,7 @@ const route = useRoute()
 const { setQueryParams } = useQueryParam()
 
 const title = ref('')
+const addTrigger = ref(false)
 
 const plainEid = route.params.id
 const encounter_id = (plainEid && typeof plainEid == 'string') ? parseInt(plainEid) : 0 // here the
@@ -74,7 +74,7 @@ const headerPrep: HeaderPrep = {
     onClick: () => {
       recItem.value = null
       recId.value = 0
-      isFormEntryDialogOpen.value = true
+      addTrigger.value = true
       isReadonly.value = false
     },
   },
@@ -90,7 +90,7 @@ const getMyDetail = async (id: number | string) => {
   if (result.success) {
     const currentValue = result.body?.data || {}
     recItem.value = currentValue
-    isFormEntryDialogOpen.value = true
+    addTrigger.value = true
   }
 }
 
@@ -113,10 +113,10 @@ watch([recId, recAction], () => {
   }
 })
 
-watch([isFormEntryDialogOpen], async () => {
-  if (isFormEntryDialogOpen.value) {
-    isFormEntryDialogOpen.value = false;
-    const saveResp = await handleActionSave({ encounter_id }, getMyList, () =>{}, toast)
+watch([addTrigger], async () => {
+  if (addTrigger.value) {
+    addTrigger.value = false;
+    const saveResp = await handleActionSave({ encounter_id, "scope_code": "rad" }, getMyList, () =>{}, toast)
     if (saveResp.success) {
       setQueryParams({
         'mode': 'entry',
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/content/vaccine-data/detail.vue b/app/components/content/vaccine-data/detail.vue
new file mode 100644
index 00000000..fd977b39
--- /dev/null
+++ b/app/components/content/vaccine-data/detail.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import { withBase } from '~/models/_base'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
+import type { Patient } from '~/models/patient'
+import type { Person } from '~/models/person'
+import { getDetail } from '~/services/vaccine-data.service'
+
+// Components
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import type { VaccineData } from '~/models/vaccine-data'
+
+// #region Props & Emits
+const props = defineProps<{
+}>()
+
+// #endregion
+
+// #region State & Computed
+
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const VaccineDataId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+const VaccineData = ref<VaccineData | null>(null)
+
+const headerPrep: HeaderPrep = {
+  title: 'Detail Data Vaksin',
+  icon: 'i-lucide-newspaper',
+}
+
+// #endregion
+
+// #region Lifecycle Hooks
+// onMounted(async () => {
+//   const result = await getDetail(controlLetterId, {
+//     includes: "unit,specialist,subspecialist,doctor-employee-person",
+//   })
+//   if (result.success) {
+//     controlLetter.value = result.body?.data
+//   }
+// })
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+// #endregion region
+
+// #region Utilities & event handlers
+function handleAction() {
+  goBack()
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <Header :prep="headerPrep" :ref-search-nav="headerPrep.refSearchNav" />
+  <AppVaccineDataDetail :instance="VaccineData" @click="handleAction" />
+</template>
diff --git a/app/components/content/vaccine-data/entry.vue b/app/components/content/vaccine-data/entry.vue
new file mode 100644
index 00000000..60fe3775
--- /dev/null
+++ b/app/components/content/vaccine-data/entry.vue
@@ -0,0 +1,159 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { Patient, genPatientProps } from '~/models/patient'
+import type { ExposedForm } from '~/types/form'
+import type { PatientBase } from '~/models/patient'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { genPatient } from '~/models/patient'
+import { PatientSchema } from '~/schemas/patient.schema'
+import { PersonAddressRelativeSchema } from '~/schemas/person-address-relative.schema'
+import { PersonAddressSchema } from '~/schemas/person-address.schema'
+import { PersonContactListSchema } from '~/schemas/person-contact.schema'
+import { PersonFamiliesSchema } from '~/schemas/person-family.schema'
+import { ResponsiblePersonSchema } from '~/schemas/person-relative.schema'
+import { uploadAttachment } from '~/services/patient.service'
+import { getDetail, update } from '~/services/vaccine-data.service'
+import type { VaccineData } from '~/models/vaccine-data'
+import ActionDialog from '~/components/pub/my-ui/nav-footer/ba-su.vue'
+
+import { toast } from '~/components/pub/ui/toast'
+import { withBase } from '~/models/_base'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { VaccineDataSchema } from '~/schemas/vaccine-data.schema'
+import { formatDateYyyyMmDd } from '~/lib/date'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { getList, remove } from '~/services/vaccine-data.service'
+import { handleActionEdit, handleActionSave } from '~/handlers/vaccine-data.handler'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import { formatDateToDatetimeLocal } from '~/lib/utils'
+
+// #region Props & Emits
+const props = withDefaults(defineProps<{
+  callbackUrl?: string
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+
+// form related state
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'vaccine-data',
+})
+// #endregion
+
+// #region State & Computed
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const VaccineDataId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const VaccineData = ref({})
+const isConfirmationOpen = ref(false)
+const selectedOperativeAction = ref<any>(null)
+
+const isSepDialogOpen = ref(false)
+provide("isSepDialogOpen", isSepDialogOpen);
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(VaccineDataId)
+  if (result.success) {
+    const responseData = {...result.body.data, date: formatDateYyyyMmDd(result.body.data.date)}
+    VaccineData.value = responseData
+    inputForm.value?.setValues(responseData)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const response = await handleActionSave(
+    await composeFormData(),
+    () => { },
+    () => { },
+    toast,
+  )
+  goBack()
+}
+
+async function composeFormData(): Promise<VaccineData> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.encounter_id = encounterId
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) {
+      await navigateTo(props.callbackUrl)
+      return
+    }
+
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+
+const initialValues = {
+  a1: "",
+  a2: formatDateToDatetimeLocal(new Date()),
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Update Data Vaksin</div>
+  <AppVaccineDataEntry
+    ref="inputForm"
+    :schema="VaccineDataSchema"
+    :initial-values="initialValues"
+    :is-bpjs="isBpjs"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action @click="handleActionClick" />
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
+
+<style scoped>
+/* component style */
+</style>
diff --git a/app/components/content/vaccine-data/list.vue b/app/components/content/vaccine-data/list.vue
new file mode 100644
index 00000000..a701271e
--- /dev/null
+++ b/app/components/content/vaccine-data/list.vue
@@ -0,0 +1,165 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Imports
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Filter from '~/components/pub/my-ui/nav-header/filter.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { getList, remove } from '~/services/vaccine-data.service'
+import { toast } from '~/components/pub/ui/toast'
+import type { Encounter } from '~/models/encounter'
+import WarningAlert from '~/components/pub/my-ui/alert/warning-alert.vue'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import type { VaccineData } from '~/models/vaccine-data'
+import { medicalRoles } from '~/const/common/role'
+// #endregion
+
+// #region State
+const props = withDefaults(defineProps<{
+  encounter?: Encounter
+  isBpjs?: boolean
+}>(), {
+  isBpjs: false,
+})
+const route = useRoute()
+const {user} = useUserStore()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: '', }),
+  entityName: 'vaccine-data',
+})
+const dummy = [
+  {
+    "id": 1,
+    "date": new Date().toISOString(),
+    "name1": "Dr. Smith",
+    "name2": 1,
+  },
+]
+
+const isHistoryDialogOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+const summaryLoading = ref(false)
+const isRequirementsMet = ref(true)
+const vaccineData = ref<VaccineData | null>(null)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<any>(null)
+
+const headerPrep: HeaderPrep = {
+  title: "Data Vaksin",
+  icon: 'i-lucide-syringe',
+}
+if(user.activeRole === 'emp|doc' || user.activeRole === 'system') {
+  headerPrep.addNav = {
+    label: "Data Vaksin",
+    onClick: () => navigateTo({
+        name: 'rehab-encounter-id-vaccine-data-add',
+        params: { id: encounterId },
+      }),
+  };
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getListData()
+})
+// #endregion
+
+// #region Functions
+async function getListData() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching Data:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+async function handleConfirmDelete(record: any, action: string) {
+  if (action === 'delete' && record?.id) {
+    try {
+      const result = await remove(record.id)
+      if (result.success) {
+        toast({ title: 'Berhasil', description: 'Data berhasil dihapus', variant: 'default' })
+        await fetchData()
+      } else {
+        toast({ title: 'Gagal', description: `Data gagal dihapus`, variant: 'destructive' })
+      }
+    } catch (error) {
+      toast({ title: 'Gagal', description: `Something went wrong`, variant: 'destructive' })
+    }
+  }
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+provide('table_data_loader', isLoading)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'rehab-encounter-id-vaccine-data-vaccine_data_id',
+        params: { id: encounterId, "vaccine_data_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <div>
+    <Header :prep="headerPrep" />
+
+    <AppVaccineDataList
+      :data="dummy"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange" />
+
+    <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
+      @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
+      <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>
+        </div>
+      </template>
+    </RecordConfirmation>
+  </div>
+</template>
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/camuflage-input.vue b/app/components/pub/my-ui/data/camuflage-input.vue
new file mode 100644
index 00000000..09500724
--- /dev/null
+++ b/app/components/pub/my-ui/data/camuflage-input.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+const model = defineModel<string>()
+const props = defineProps<{
+  class: string
+  defaultClass?: string
+  disabled?: boolean
+  width?: number
+  widthUnit?: string
+}>()
+
+const InputComp = defineAsyncComponent(() => import('~/components/pub/ui/input/Input.vue'))
+const activeState = ref(false)
+
+let defaultClass = props.defaultClass ?? 'h-8 xl:h-9'
+let widthStyle = '';
+if(props.width) {
+  widthStyle = `width: ${props.width}${props.widthUnit ?? 'px'};`
+} else {
+  widthStyle = `width: 100%;`
+}
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+
+watch(activeState, () => {
+  nextTick(() => {
+    if (asyncInputRef.value && typeof asyncInputRef.value.focus === 'function') {
+        asyncInputRef.value.focus()
+      }
+  })
+
+    //   document.getElementById('editable-div')?.scrollIntoView({ behavior: 'smooth' })
+    InputComp.value.focus()
+    // console.log(inputComp.__defaults)
+})
+</script>
+
+<template>
+  <div
+    v-if="!activeState || disabled" @click="() => activeState = true"
+    :class="`${defaultClass}`"
+    :style="widthStyle">
+    {{ model }}
+  </div>
+  <InputComp v-else 
+    v-model="model"
+    :class="`${defaultClass}`"
+    :style="widthStyle"
+    @blur="() => activeState = false"
+  />
+  <!-- {{ inputComp.value }} -->
+  <!-- <Input
+    v-else v-model="model" @blur="() => activeState = false"
+    :class="`${defaultClass}`"
+    :style="widthStyle"
+    autofocus
+  /> -->
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-choose.vue b/app/components/pub/my-ui/data/dropdown-action-choose.vue
new file mode 100644
index 00000000..8fb63f33
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-choose.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+
+const activeKey = ref<string | null>(null)
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+</script>
+
+<template>
+  <Button @click="process" variant="outline"
+          class="text-orange-400 border-orange-400 bg-transparent">
+          Pilih
+          <Icon name="i-lucide-arrow-right" class="h-4 w-4 align-middle transition-colors" />
+        </Button>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-detail.vue b/app/components/pub/my-ui/data/dropdown-action-detail.vue
new file mode 100644
index 00000000..b695fb5c
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-detail.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+
+const activeKey = ref<string | null>(null)
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+</script>
+
+<template>
+  <Button @click="process" variant="outline"
+          class="text-orange-400 border-orange-400 bg-transparent">
+          Detail
+          <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        </Button>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-print.vue b/app/components/pub/my-ui/data/dropdown-action-print.vue
new file mode 100644
index 00000000..99a7da03
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-print.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+</script>
+
+<template>
+  <div>
+    <Button type="button" variant="outline" 
+      class="text-orange-500 border border-orange-400"
+      @click="print">
+      <Icon name="i-lucide-printer" class="h-4 w-4 align-middle transition-colors" />
+      Preview
+    </Button>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-upd.vue b/app/components/pub/my-ui/data/dropdown-action-upd.vue
new file mode 100644
index 00000000..611e53d2
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-upd.vue
@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+  
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Edit',
+    onClick: () => {
+      edit()
+    },
+    icon: 'i-lucide-pencil',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+  {
+    label: 'Delete',
+    onClick: () => {
+      del()
+    },
+    icon: 'i-lucide-trash',
+  },
+]
+
+
+function edit() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showEdit
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+function del() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmDelete
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
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 332d2e88..125ece00 100644
--- a/app/components/pub/my-ui/form/file-field.vue
+++ b/app/components/pub/my-ui/form/file-field.vue
@@ -5,7 +5,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
@@ -18,6 +18,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(() => {
@@ -32,7 +45,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>
 
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/components/pub/my-ui/nav-footer/ca-ed-su.vue b/app/components/pub/my-ui/nav-footer/ca-ed-su.vue
index 1f0f5915..9bf7466b 100644
--- a/app/components/pub/my-ui/nav-footer/ca-ed-su.vue
+++ b/app/components/pub/my-ui/nav-footer/ca-ed-su.vue
@@ -7,7 +7,7 @@ const props = defineProps<{
 
 const defaultClass = props.defaultClass ?? 'm-2 flex gap-2 px-2'
 const additionalClass = props.class ?? ''
-const btnClass = props.smallMode ? '[&_button]:w-7 [&_button]:h-7 [&_button]:2xl:w-8 [&_button]:2xl:h-9 [&_button]:!p-0' : ''
+const btnClass = props.smallMode ? '[&_button]:w-7 [&_button]:h-7 [&_button]:2xl:w-8 [&_button]:2xl:h-8 [&_button]:!p-0' : ''
 
 type ClickType = 'cancel' | 'edit' | 'submit'
 
diff --git a/app/composables/useQueryCRUD.ts b/app/composables/useQueryCRUD.ts
index 4ff7748a..481142aa 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()
@@ -25,7 +77,6 @@ export function useQueryCRUDMode(key: string = 'mode') {
     },
   })
 
-  // Cek apakah form diakses dari view/detail
   const fromView = computed(() => route.query['from'] === 'view')
 
   const goToEntry = (options?: { fromView?: boolean }) => {
@@ -39,7 +90,12 @@ export function useQueryCRUDMode(key: string = 'mode') {
     })
   }
 
-  const goToView = () => (mode.value = 'view')
+  const goToView = (myRecord_id?: any) => {
+    mode.value = 'view'
+    if (myRecord_id) {
+      myRecord_id.value = myRecord_id
+    }
+  }
 
   const backToList = () => {
     router.push({
@@ -47,8 +103,7 @@ export function useQueryCRUDMode(key: string = 'mode') {
       query: {
         ...route.query,
         mode: 'list',
-        // HAPUS record-id dan from
-        'record-id': undefined,
+        recordIdKey: undefined,
         from: undefined,
       },
     })
@@ -60,13 +115,11 @@ export function useQueryCRUDMode(key: string = 'mode') {
       query: {
         ...route.query,
         mode: 'view',
-        // HAPUS from
         from: undefined,
       },
     })
   }
 
-  // Fungsi back yang otomatis menentukan kemana harus kembali
   const goBack = () => {
     if (fromView.value) {
       backToView()
diff --git a/app/const/key-val/clinical.ts b/app/const/key-val/clinical.ts
index d6a37b43..0c33a59c 100644
--- a/app/const/key-val/clinical.ts
+++ b/app/const/key-val/clinical.ts
@@ -18,6 +18,7 @@ export type MedObstacleCode = 'hearing' | 'sight' | 'physical' | 'emotional' | '
 export type LearnMethodCode = 'demo' | 'discuss-leaflet'
 export type LangClassCode = 'ind' | 'region' | 'foreign'
 export type TranslatorSrcCode = 'team' | 'family'
+export type ProcedureRoomTypeCode = 'procedure' | 'operation'
 
 export const subjectCodes: Record<SubjectCode, string> = {
   detail: 'Detail',
@@ -224,3 +225,8 @@ export const translatorSrcCodes: Record<TranslatorSrcCode, string> = {
   team: 'Tim Penerjemah',
   family: 'Keluarga',
 }
+
+export const procedureRoomTypeCodes: Record<ProcedureRoomTypeCode, string> = {
+  procedure: 'Ruang Tindakan',
+  operation: 'Ruang Operasi',
+}
diff --git a/app/handlers/antibiotic-in-use.ts b/app/handlers/antibiotic-in-use.ts
new file mode 100644
index 00000000..d10f3b1c
--- /dev/null
+++ b/app/handlers/antibiotic-in-use.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/antibiotic-in-use'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/handlers/antibiotic-src-category.ts b/app/handlers/antibiotic-src-category.ts
new file mode 100644
index 00000000..e68380b0
--- /dev/null
+++ b/app/handlers/antibiotic-src-category.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/antibiotic-src-category'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/handlers/antibiotic-src.ts b/app/handlers/antibiotic-src.ts
new file mode 100644
index 00000000..1671471b
--- /dev/null
+++ b/app/handlers/antibiotic-src.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/antibiotic-src'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/handlers/encounter-entry.handler.ts b/app/handlers/encounter-entry.handler.ts
index 4d29defb..5f632ac2 100644
--- a/app/handlers/encounter-entry.handler.ts
+++ b/app/handlers/encounter-entry.handler.ts
@@ -8,21 +8,26 @@ 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'
 
+// Handlers
+import { uploadAttachmentCustom } from '~/handlers/supporting-document.handler'
+
 // Services
 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'
 
 // Handlers
@@ -59,12 +64,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 +80,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 +205,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 +252,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 +343,7 @@ export function useEncounterEntry(props: {
     }
   }
 
-  async function loadEncounterDetail() {
+  async function getFetchEncounterDetail() {
     if (!isEditMode.value || props.id <= 0) {
       return
     }
@@ -313,22 +351,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 +401,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 +430,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 +454,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 +470,21 @@ export function useEncounterEntry(props: {
     if (formData.subSpecialistId) {
       await handleFetchDoctors(formData.subSpecialistId)
     }
+    if (encounter.encounterDocuments && Array.isArray(encounter.encounterDocuments)) {
+      let sepFileReview = {}
+      let sippFileReview = {}
+      for (const doc of encounter.encounterDocuments) {
+        if (doc.type_code === 'vclaim-sep') {
+          sepFileReview = { id: doc.id, fileName: doc.fileName, filePath: doc.filePath, type: doc.type_code }
+        } else if (doc.type_code === 'vclaim-sipp') {
+          sippFileReview = { id: doc.id, fileName: doc.fileName, filePath: doc.filePath, type: doc.type_code }
+        }
+      }
+      formData.sepFileReview = sepFileReview
+      formData.sippFileReview = sippFileReview
+    }
+
+    formObjects.value = { ...formData }
   }
 
   async function handleSaveEncounter(formValues: any) {
@@ -434,7 +499,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 => {
@@ -451,6 +516,8 @@ export function useEncounterEntry(props: {
       const visitDateValue = formValues.visitDate || formValues.registeredAt || formValues.registerDate || ''
       const memberNumber = formValues.member_number ?? formValues.cardNumber ?? formValues.memberNumber ?? null
       const refNumber = formValues.ref_number ?? formValues.sepNumber ?? formValues.refNumber ?? null
+      sepFile.value = formValues.sepFile || null
+      sippFile.value = formValues.sippFile || null
 
       let paymentMethodCode = formValues.paymentMethod_code ?? null
       if (!paymentMethodCode) {
@@ -467,7 +534,7 @@ export function useEncounterEntry(props: {
 
       const payload: any = {
         patient_id: patientId,
-        appointment_doctor_code: formValues.doctorId || null,
+        appointment_doctor_code: formValues.doctor_code || null,
         class_code: props.classCode || '',
         subClass_code: props.subClassCode || '',
         infra_id: formValues.infra_id ?? null,
@@ -495,23 +562,24 @@ export function useEncounterEntry(props: {
       if (paymentMethodCode) {
         payload.paymentMethod_code = paymentMethodCode
       }
+      if (!payload.vclaimReference) {
+        payload.vclaimReference = {
+          noSep: refNumber,
+        }
+      }
 
       if (paymentMethodCode === 'insurance') {
         payload.insuranceCompany_id = formValues.insuranceCompany_id ?? null
         if (memberNumber) payload.member_number = memberNumber
-        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 (props.classCode === 'ambulatory') {
+      if (isAdmin && props.classCode === 'ambulatory') {
         payload.visitMode_code = 'adm'
         payload.allocatedVisitCount = 0
       }
@@ -520,19 +588,45 @@ 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) {
+        const encounterId = isEditMode.value ? props.id : result.body?.data?.id
+
+        if (encounterId) {
+          if (sepFile.value) {
+            await uploadAttachmentCustom({
+              id: isEditMode.value && formValues.sepFileReview ? formValues.sepFileReview.id : null,
+              file: sepFile.value,
+              refId: encounterId,
+              entityTypeCode: 'encounter',
+              type: 'vclaim-sep',
+            })
+          }
+          if (sippFile.value) {
+            await uploadAttachmentCustom({
+              id: isEditMode.value && formValues.sippFileReview ? formValues.sippFileReview.id : null,
+              file: sippFile.value,
+              refId: encounterId,
+              entityTypeCode: 'encounter',
+              type: '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 +634,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'),
@@ -565,15 +659,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 +681,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 cd9b0fa8..151424d3 100644
--- a/app/handlers/encounter-init.handler.ts
+++ b/app/handlers/encounter-init.handler.ts
@@ -40,6 +40,8 @@ const ChemoMedicineProtocolListAsync = defineAsyncComponent(
 const DeviceOrderAsync = defineAsyncComponent(() => import('~/components/content/device-order/main.vue'))
 const PrescriptionAsync = defineAsyncComponent(() => import('~/components/content/prescription/main.vue'))
 const CpLabOrderAsync = defineAsyncComponent(() => import('~/components/content/cp-lab-order/main.vue'))
+const ProcedureRoomOrderAsync = defineAsyncComponent(() => import('~/components/content/procedure-room-order/main.vue'))
+const MicroLabOrderAsync = defineAsyncComponent(() => import('~/components/content/micro-lab-order/main.vue'))
 const CprjAsync = defineAsyncComponent(() => import('~/components/content/cprj/entry.vue'))
 const RadiologyAsync = defineAsyncComponent(() => import('~/components/content/radiology-order/main.vue'))
 const ConsultationAsync = defineAsyncComponent(() => import('~/components/content/consultation/list.vue'))
@@ -48,6 +50,11 @@ const GeneralConsentListAsync = defineAsyncComponent(() => import('~/components/
 const ResumeListAsync = defineAsyncComponent(() => import('~/components/content/resume/list.vue'))
 const ControlLetterListAsync = defineAsyncComponent(() => import('~/components/content/control-letter/list.vue'))
 const ActionReportEntryAsync = defineAsyncComponent(() => import('~/components/content/action-report/entry.vue'))
+const KfrListAsync = defineAsyncComponent(() => import('~/components/content/kfr/list.vue'))
+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: {
@@ -163,8 +170,8 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  actionRoomOrder: {
-    id: 'action-room-order',
+  procedureRoomOrder: {
+    id: 'procedure-room-order',
     title: 'Order Ruang Tindakan',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
@@ -187,8 +194,8 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  vacsinData: {
-    id: 'vacsin-data',
+  vaccineData: {
+    id: 'vaccine-data',
     title: 'Data Vaksin',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
@@ -211,6 +218,12 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency'],
     unit: 'all',
   },
+  kfr: {
+    id: 'kfr',
+    title: 'KFR',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
   refBack: {
     id: 'reference-back',
     title: 'PRB',
@@ -247,6 +260,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[]) {
@@ -361,8 +380,7 @@ export function injectComponents(id: string | number, data: EncounterListData, m
     currentKeys.cpLabOrder['props'] = { encounter_id: id }
   }
   if (currentKeys?.microLabOrder) {
-    // TODO: add component for microLabOrder
-    currentKeys.microLabOrder['component'] = null
+    currentKeys.microLabOrder['component'] = MicroLabOrderAsync
     currentKeys.microLabOrder['props'] = { encounter_id: id }
   }
   if (currentKeys?.paLabOrder) {
@@ -370,10 +388,9 @@ export function injectComponents(id: string | number, data: EncounterListData, m
     currentKeys.paLabOrder['component'] = null
     currentKeys.paLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.actionRoomOrder) {
-    // TODO: add component for actionRoomOrder
-    currentKeys.actionRoomOrder['component'] = null
-    currentKeys.actionRoomOrder['props'] = { encounter_id: id }
+  if (currentKeys?.procedureRoomOrder) {
+    currentKeys.procedureRoomOrder['component'] = ProcedureRoomOrderAsync
+    currentKeys.procedureRoomOrder['props'] = { encounter_id: id }
   }
   if (currentKeys?.mcuResult) {
     // TODO: add component for mcuResult
@@ -388,15 +405,31 @@ export function injectComponents(id: string | number, data: EncounterListData, m
     currentKeys.resume['component'] = ResumeListAsync
     currentKeys.resume['props'] = { encounter_id: id }
   }
-  if (currentKeys?.control) {
-    currentKeys.control['component'] = ControlLetterListAsync
-    currentKeys.control['props'] = { encounter: data?.encounter }
+  if (currentKeys?.controlLetter) {
+    currentKeys.controlLetter['component'] = ControlLetterListAsync
+    currentKeys.controlLetter['props'] = { encounter: data?.encounter }
+  }
+  if (currentKeys?.refBack) {
+    currentKeys.refBack['component'] = PrbListAsync
+    currentKeys.refBack['props'] = { encounter: data?.encounter }
+  }
+  if (currentKeys?.kfr) {
+    currentKeys.kfr['component'] = KfrListAsync
+    currentKeys.kfr['props'] = { encounter: data?.encounter }
   }
   if (currentKeys?.screening) {
     // TODO: add component for screening
     currentKeys.screening['component'] = null
     currentKeys.screening['props'] = { encounter_id: id }
   }
+  if (currentKeys?.surgeryReport) {
+    currentKeys.surgeryReport['component'] = SurgeryReportListAsync
+    currentKeys.surgeryReport['props'] = { encounter: data?.encounter }
+  }
+  if (currentKeys?.vaccineData) {
+    currentKeys.vaccineData['component'] = VaccineDataListAsync
+    currentKeys.vaccineData['props'] = { encounter: data?.encounter }
+  }
   if (currentKeys?.supportingDocument) {
     currentKeys.supportingDocument['component'] = DocUploadListAsync
     currentKeys.supportingDocument['props'] = { encounter_id: id }
@@ -407,6 +440,16 @@ 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 }
+  }
+
+  if (currentKeys?.initialNursingStudy) {
+    currentKeys.initialNursingStudy['component'] = InitialNursingStudyAsync
+    currentKeys.initialNursingStudy['props'] = { encounter: data?.encounter }
+  }
+
   if (currentKeys?.actionReport) {
     currentKeys.actionReport['component'] = ActionReportEntryAsync
     currentKeys.actionReport['props'] = {
@@ -495,7 +538,6 @@ export function mapResponseToEncounter(result: any): any {
 }
 
 export function getMenuItems(id: string | number, props: any, user: any, data: EncounterListData, meta: any) {
-  console.log(props)
   // const normalClassCode = props.classCode === 'ambulatory' ? 'outpatient' : props.classCode
   const normalClassCode = props.classCode === 'ambulatory' ? 'ambulatory' : props.classCode
   const currentKeys = injectComponents(id, data, meta)
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..d9ce2e31 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 || []
@@ -254,6 +256,8 @@ export function useIntegrationSepEntry() {
           },
         ]
       } else {
+        const destA = lettersRaw?.rujukan?.provPerujuk?.Kode
+        const destB = lettersRaw?.rujukan?.provPerujuk?.kode
         letters.value = [
           {
             letterNumber: lettersRaw?.rujukan?.noKunjungan || '',
@@ -274,7 +278,7 @@ export function useIntegrationSepEntry() {
               patientName: lettersRaw?.rujukan?.peserta?.nama || '',
               patientPhone: lettersRaw?.rujukan?.peserta?.mr?.noTelepon || '',
               medicalRecordNumber: lettersRaw?.rujukan?.peserta?.mr?.noMR || '',
-              destination: lettersRaw?.rujukan?.provPerujuk?.kode || '',
+              destination: destA || destB || '',
             },
           },
         ]
@@ -441,6 +445,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
 
@@ -474,29 +482,40 @@ export function useIntegrationSepEntry() {
       }
 
       if (!value.destinationClinic) {
-        mappedValues.destinationClinic = selectedObjects.value['destination'] || ''
+        mappedValues.referralTo = selectedObjects.value['destination'] || ''
       }
       if (!value.clinicExcecutive) {
         mappedValues.clinicExcecutive = 'no'
       }
 
       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 +628,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 +644,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 +689,7 @@ export function useIntegrationSepEntry() {
     specialistsTree,
     resourceType,
     resourcePath,
+    encounterId,
     patients,
     selectedPatient,
     paginationMeta,
@@ -687,5 +708,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/handlers/prb.handler.ts b/app/handlers/prb.handler.ts
new file mode 100644
index 00000000..bfff163b
--- /dev/null
+++ b/app/handlers/prb.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/prb.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/handlers/procedure-room-order.handler.ts b/app/handlers/procedure-room-order.handler.ts
new file mode 100644
index 00000000..d2535274
--- /dev/null
+++ b/app/handlers/procedure-room-order.handler.ts
@@ -0,0 +1,17 @@
+import { genCrudHandler } from '~/handlers/_handler'
+import { create, update, remove } from '~/services/procedure-room-order.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({ create, update, remove})
diff --git a/app/handlers/procedure-room.handler.ts b/app/handlers/procedure-room.handler.ts
new file mode 100644
index 00000000..49ee40ec
--- /dev/null
+++ b/app/handlers/procedure-room.handler.ts
@@ -0,0 +1,17 @@
+import { genCrudHandler } from '~/handlers/_handler'
+import { create, update, remove } from '~/services/procedure-room.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({ create, update, remove})
diff --git a/app/handlers/supporting-document.handler.ts b/app/handlers/supporting-document.handler.ts
index 70b29612..87ff864a 100644
--- a/app/handlers/supporting-document.handler.ts
+++ b/app/handlers/supporting-document.handler.ts
@@ -22,3 +22,17 @@ export const {
   update,
   remove,
 })
+
+export async function uploadAttachmentCustom(payload: any) {
+  const { user } = useUserStore()
+  
+  const formData = new FormData()
+  formData.append('content', payload.file)
+  formData.append('entityType_code', payload.entityTypeCode)
+  formData.append('type_code', payload.type)
+  formData.append('ref_id', payload.refId)
+  formData.append('upload_employee_id', user.employee_id)
+
+  const response = payload.id ? await update(payload.id, formData) : await create(formData)
+  return response?.body?.data
+}
diff --git a/app/handlers/vaccine-data.handler.ts b/app/handlers/vaccine-data.handler.ts
new file mode 100644
index 00000000..7f5fa1b6
--- /dev/null
+++ b/app/handlers/vaccine-data.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/vaccine-data.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index c7daf608..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
@@ -486,4 +488,16 @@ export const SpecimenTypeOptList: { label: string; value: SpecimenType }[] = [
   { label: 'Mikrobiologi', value: 'mikrobiologi' },
   { label: 'Laborat', value: 'laborat' },
   { label: 'Tidak perlu', value: 'tidak perlu' },
+]
+
+export type PrbProgramType = "ashma" | "diabetes mellitus" | "hipertensi" | "penyakit jantung" | "ppok" | "schizopherenia" | "stroke" | "systemic lupus erythematosus"
+export const PrbProgramTypeOptList: { label: string; value: PrbProgramType }[] = [
+  { label: 'ASHMA', value: 'ashma' },
+  { label: 'Diabetes Mellitus', value: 'diabetes mellitus' },
+  { label: 'Hipertensi', value: 'hipertensi' },
+  { label: 'Penyakit Jantung', value: 'penyakit jantung' },
+  { label: 'PPOK (Penyakit Paru Obstruktif Kronik)', value: 'ppok' },
+  { label: 'Schizopherenia', value: 'schizopherenia' },
+  { label: 'Stroke', value: 'stroke' },
+  { label: 'Systemic Lupus Erythematosus', value: 'systemic lupus erythematosus' },
 ]
\ No newline at end of file
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/lib/utils.ts b/app/lib/utils.ts
index e201a439..180320ae 100644
--- a/app/lib/utils.ts
+++ b/app/lib/utils.ts
@@ -1,5 +1,6 @@
 import type { ClassValue } from 'clsx'
 import { clsx } from 'clsx'
+import { format } from 'date-fns'
 import { twMerge } from 'tailwind-merge'
 import { toast } from '~/components/pub/ui/toast'
 
@@ -106,6 +107,11 @@ export function calculateAge(birthDate: Date | string | null | undefined): strin
   }
 }
 
+export function formatDateToDatetimeLocal(inputDate: Date) { 
+  const formattedString = format(inputDate, "yyyy-MM-dd'T'HH:mm")  
+  return formattedString
+}
+
 
 /**
  * Converts a plain JavaScript object (including File objects) into a FormData instance.
diff --git a/app/models/antibiotic-in-use.ts b/app/models/antibiotic-in-use.ts
new file mode 100644
index 00000000..e793fc12
--- /dev/null
+++ b/app/models/antibiotic-in-use.ts
@@ -0,0 +1,16 @@
+import { type Base, genBase } from "./_base"
+import type { AntibioticSrc } from "./antibiotic-src"
+
+export interface AntibioticInUse extends Base {
+  mcuOrder_id: number
+  antibioticSrc_code: string
+  antibioticSrc: AntibioticSrc
+}
+
+export function genDevice(): Pick<AntibioticInUse, 'mcuOrder_id' | 'antibioticSrc_code'> {
+  return {
+    ...genBase(),
+    mcuOrder_id: 0,
+    antibioticSrc_code: ''
+  }
+}
diff --git a/app/models/antibiotic-src-category.ts b/app/models/antibiotic-src-category.ts
new file mode 100644
index 00000000..6001b4e8
--- /dev/null
+++ b/app/models/antibiotic-src-category.ts
@@ -0,0 +1,14 @@
+import { type Base, genBase } from "./_base"
+
+export interface AntibioticSrcCategory extends Base {
+  code: string
+  name: string
+}
+
+export function genDevice(): AntibioticSrcCategory {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+  }
+}
diff --git a/app/models/antibiotic-src.ts b/app/models/antibiotic-src.ts
new file mode 100644
index 00000000..ee272f54
--- /dev/null
+++ b/app/models/antibiotic-src.ts
@@ -0,0 +1,16 @@
+import { type Base, genBase } from "./_base"
+
+export interface AntibioticSrc extends Base {
+  code: string
+  name: string
+  antibioticSrcCategory_code: string
+}
+
+export function genDevice(): AntibioticSrc {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+    antibioticSrcCategory_code: ''
+  }
+}
diff --git a/app/models/infra.ts b/app/models/infra.ts
index 80119748..e7ebe681 100644
--- a/app/models/infra.ts
+++ b/app/models/infra.ts
@@ -1,10 +1,27 @@
-export interface Infra {
-  id?: number
+import { type Base, genBase } from "./_base";
+import { genProcedureRoom, type ProcedureRoom } from "./procedure-room";
+
+export interface Infra extends Base {
   code: string
   name: string
   infraGroup_code: string
   parent_id?: number | string | null
+  unit_id?: number | string | null
   specialist_id?: number | string | null
   subspecialist_id?: number | string | null
-  unit_id?: number | string | null
+  procedureRoom?: ProcedureRoom
+}
+
+export function genInfra(): Infra {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+    infraGroup_code: '',
+    parent_id: null,
+    unit_id: null,
+    specialist_id: null,
+    subspecialist_id: null,
+    procedureRoom: genProcedureRoom(),
+  }
 }
diff --git a/app/models/material-package-item.ts b/app/models/material-package-item.ts
new file mode 100644
index 00000000..9ccde8d1
--- /dev/null
+++ b/app/models/material-package-item.ts
@@ -0,0 +1,14 @@
+import { type Base, genBase } from "./_base"
+
+export interface MaterialPackageItem extends Base {
+  materialPackage_code: string
+  material_code: string
+}
+
+export function genMaterialPackage(): MaterialPackageItem {
+  return {
+    ...genBase(),
+    materialPackage_code: '',
+    material_code: '',
+  }
+}
diff --git a/app/models/material-package.ts b/app/models/material-package.ts
new file mode 100644
index 00000000..df3f01d1
--- /dev/null
+++ b/app/models/material-package.ts
@@ -0,0 +1,14 @@
+import { type Base, genBase } from "./_base"
+
+export interface MaterialPackage extends Base {
+  code: string
+  name: string
+}
+
+export function genMaterialPackage(): MaterialPackage {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+  }
+}
diff --git a/app/models/mcu-order-item.ts b/app/models/mcu-order-item.ts
index 67038edf..ece036e4 100644
--- a/app/models/mcu-order-item.ts
+++ b/app/models/mcu-order-item.ts
@@ -2,16 +2,33 @@ import { type Base, genBase } from "./_base"
 
 export interface McuOrderItem extends Base {
   mcuOrder_id: number
-  mcuSrc_id: number
+  mcuSrc_code: string
+  note?: string
   examinationDate?: string
   result?: string
   status_code?: string
 }
 
+export interface CreateDto {
+  mcuOrder_id: number
+  mcuSrc_code: string
+  note?: string
+}
+
+export interface ReadList {
+  'mcu-order-id'?: number
+  'mcu-src-code'?: string
+  includes?: string
+}
+
+export interface UpdateDto extends CreateDto {
+  id: number
+}
+
 export function genMcuOrderItem(): McuOrderItem {
   return {
     ...genBase(),
     mcuOrder_id: 0,
-    mcuSrc_id: 0,
+    mcuSrc_code: '',
   }
 }
diff --git a/app/models/mcu-order-sub-item.ts b/app/models/mcu-order-sub-item.ts
index 271ed424..a64af0d1 100644
--- a/app/models/mcu-order-sub-item.ts
+++ b/app/models/mcu-order-sub-item.ts
@@ -1,8 +1,8 @@
 import { type Base, genBase } from "./_base"
 
 export interface McuOrderSubItem extends Base {
-  mcuSubSrc_id: number
   mcuOrderItem_id: number
+  mcuSubSrc_code: string
   result?: string
   status_code?: string
 }
@@ -10,7 +10,7 @@ export interface McuOrderSubItem extends Base {
 export function genMcuOrderSubItem(): McuOrderSubItem {
   return {
     ...genBase(),
-    mcuSubSrc_id: 0,
     mcuOrderItem_id: 0,
+    mcuSubSrc_code: '',
   }
 }
diff --git a/app/models/mcu-order.ts b/app/models/mcu-order.ts
index 35e4018c..859c0548 100644
--- a/app/models/mcu-order.ts
+++ b/app/models/mcu-order.ts
@@ -1,4 +1,5 @@
 import { type Base, genBase } from "./_base"
+import type { AntibioticInUse } from "./antibiotic-in-use"
 import { type Doctor, genDoctor } from "./doctor"
 import type { McuOrderItem } from "./mcu-order-item"
 
@@ -13,6 +14,7 @@ export interface McuOrder extends Base {
   temperature?: number
   mcuUrgencyLevel_code?: string
   items: McuOrderItem[]
+  antibioticInUseItems: AntibioticInUse[]
 }
 
 export function genMcuOrder(): McuOrder {
@@ -23,7 +25,8 @@ export function genMcuOrder(): McuOrder {
     doctor: genDoctor(),
     specimenPickTime: '',
     examinationDate: '',
-    items: []
+    items: [],
+    antibioticInUseItems: [],
   }
 }
 
diff --git a/app/models/prb.ts b/app/models/prb.ts
new file mode 100644
index 00000000..2997b5b3
--- /dev/null
+++ b/app/models/prb.ts
@@ -0,0 +1,37 @@
+import { type Base, genBase } from "./_base"
+import { genDoctor, type Doctor } from "./doctor"
+import { genEncounter, type Encounter } from "./encounter"
+import { genSpecialist, type Specialist } from "./specialist"
+import { genSubspecialist, type Subspecialist } from "./subspecialist"
+import { genUnit, type Unit } from "./unit"
+
+export interface Prb extends Base {
+  encounter_id: number
+  encounter: Encounter
+  unit_id: number
+  unit: Unit
+  specialist_id: number
+  specialist: Specialist
+  subspecialist_id: number
+  subspecialist: Subspecialist
+  doctor_id: number
+  doctor: Doctor
+  date: ''
+}
+
+export function genPrb(): Prb {
+  return {
+    ...genBase(),
+    encounter_id: 0,
+    encounter: genEncounter(),
+    unit_id: 0,
+    unit: genUnit(),
+    specialist_id: 0,
+    specialist: genSpecialist(),
+    subspecialist_id: 0,
+    subspecialist: genSubspecialist(),
+    doctor_id: 0,
+    doctor: genDoctor(),
+    date: ''
+  }
+}
diff --git a/app/models/procedure-room-order-item.ts b/app/models/procedure-room-order-item.ts
new file mode 100644
index 00000000..5fa84763
--- /dev/null
+++ b/app/models/procedure-room-order-item.ts
@@ -0,0 +1,27 @@
+import { type Base, genBase } from "./_base";
+import { genMaterialPackage, type MaterialPackage } from "./material-package";
+import { genProcedureRoom, type ProcedureRoom } from "./procedure-room";
+
+export interface ProcedureRoomOrderItem extends Base {
+	procedureRoomOrder_id: number
+	procedureRoom_code: string
+	procedureRoom: ProcedureRoom
+}
+
+export interface CreateDto {
+  procedureRoomOrder_id: number
+	procedureRoom_code: string
+}
+
+export interface UpdateDto extends CreateDto {
+  note?: string
+}
+
+export function genProcedureRoomOrderItem(): ProcedureRoomOrderItem {
+  return {
+    ...genBase(),
+    procedureRoomOrder_id: 0,
+    procedureRoom_code: '',
+    procedureRoom: genProcedureRoom(),
+  }
+}
diff --git a/app/models/procedure-room-order.ts b/app/models/procedure-room-order.ts
new file mode 100644
index 00000000..4d1bb8c5
--- /dev/null
+++ b/app/models/procedure-room-order.ts
@@ -0,0 +1,23 @@
+import { type Base, genBase } from "./_base";
+import { genMaterialPackage, type MaterialPackage } from "./material-package";
+import { genProcedureRoom, type ProcedureRoom } from "./procedure-room";
+
+export interface ProcedureRoomOrder extends Base {
+	encounter_id: number
+	materialPackage_code?: string
+	materialPackage: MaterialPackage
+  items?: ProcedureRoom[]
+}
+
+export interface CreateDto {
+  encounter_id: number
+}
+
+export function genProcedureRoomOrder(): ProcedureRoomOrder {
+  return {
+    ...genBase(),
+    encounter_id: 0,
+    materialPackage_code: '',
+    materialPackage: genMaterialPackage(),
+  }
+}
diff --git a/app/models/procedure-room.ts b/app/models/procedure-room.ts
new file mode 100644
index 00000000..b34bba13
--- /dev/null
+++ b/app/models/procedure-room.ts
@@ -0,0 +1,24 @@
+import { type Base, genBase } from "./_base";
+import type { Infra } from "./infra";
+
+export interface ProcedureRoom extends Base {
+	code: string
+	infra_code: string
+  infra?: Infra
+	type_code: string
+	unit_code: string
+  specialist_code?: string | null
+  subspecialist_code?: string | null
+}
+
+export function genProcedureRoom(): ProcedureRoom {
+  return {
+    ...genBase(),
+    code: '',
+    infra_code: '',
+    type_code: '',
+    unit_code: '',
+    specialist_code: null,
+    subspecialist_code: null,
+  }
+}
diff --git a/app/models/vaccine-data.ts b/app/models/vaccine-data.ts
new file mode 100644
index 00000000..86032b2a
--- /dev/null
+++ b/app/models/vaccine-data.ts
@@ -0,0 +1,37 @@
+import { type Base, genBase } from "./_base"
+import { genDoctor, type Doctor } from "./doctor"
+import { genEncounter, type Encounter } from "./encounter"
+import { genSpecialist, type Specialist } from "./specialist"
+import { genSubspecialist, type Subspecialist } from "./subspecialist"
+import { genUnit, type Unit } from "./unit"
+
+export interface VaccineData extends Base {
+  encounter_id: number
+  encounter: Encounter
+  unit_id: number
+  unit: Unit
+  specialist_id: number
+  specialist: Specialist
+  subspecialist_id: number
+  subspecialist: Subspecialist
+  doctor_id: number
+  doctor: Doctor
+  date: ''
+}
+
+export function genVaccineData(): VaccineData {
+  return {
+    ...genBase(),
+    encounter_id: 0,
+    encounter: genEncounter(),
+    unit_id: 0,
+    unit: genUnit(),
+    specialist_id: 0,
+    specialist: genSpecialist(),
+    subspecialist_id: 0,
+    subspecialist: genSubspecialist(),
+    doctor_id: 0,
+    doctor: genDoctor(),
+    date: ''
+  }
+}
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/pages/(features)/integration/bpjs/prb/[prb_id]/edit.vue b/app/pages/(features)/integration/bpjs/prb/[prb_id]/edit.vue
new file mode 100644
index 00000000..abf741bf
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs/prb/[prb_id]/edit.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Update PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+
+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)
+const canRead = true
+</script>
+
+<template>
+  <div>
+    <div v-if="canRead">
+      <ContentPrbEntry :is-bpjs="true" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/integration/bpjs/prb/[prb_id]/index.vue b/app/pages/(features)/integration/bpjs/prb/[prb_id]/index.vue
new file mode 100644
index 00000000..1d66b563
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs/prb/[prb_id]/index.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+
+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)
+const canRead = true
+</script>
+
+<template>
+  <div>
+    <div v-if="canRead">
+      <ContentPrbDetail :patient-id="Number(route.params.id)" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/integration/bpjs/prb/add.vue b/app/pages/(features)/integration/bpjs/prb/add.vue
new file mode 100644
index 00000000..19b029f9
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs/prb/add.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, getPagePermissions } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   navigateTo('/403')
+// }
+
+// Define permission-based computed properties
+const pagePermission = getPagePermissions(roleAccess)
+const callbackUrl = route.query['return-path'] as string | undefined
+</script>
+
+<template>
+  <div>
+    <div v-if="pagePermission.canRead">
+      <ContentPrbEntry :is-bpjs="true" :callback-url="callbackUrl" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/integration/bpjs/prb/index.vue b/app/pages/(features)/integration/bpjs/prb/index.vue
new file mode 100644
index 00000000..7a6ca683
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs/prb/index.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Daftar PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, getPagePermissions } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   navigateTo('/403')
+// }
+
+// Define permission-based computed properties
+const pagePermission = getPagePermissions(roleAccess)
+const callbackUrl = route.query['return-path'] as string | undefined
+</script>
+
+<template>
+  <div>
+    <div v-if="pagePermission.canRead">
+      <ContentPrbBpjsList :callback-url="callbackUrl" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/document-upload/[document_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/document-upload/[document_id]/edit.vue
new file mode 100644
index 00000000..e06920ba
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/document-upload/[document_id]/edit.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+    middleware: ['rbac'],
+    roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+    title: 'Update Dokumen Pendukung',
+    contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+    title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/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)
+const canRead = true
+</script>
+
+<template>
+    <div>
+        <div v-if="canRead">
+            <ContentDocumentUploadEdit />
+        </div>
+        <Error v-else :status-code="403" />
+    </div>
+</template>
\ No newline at end of file
diff --git a/app/pages/(features)/rehab/encounter/[id]/document-upload/add.vue b/app/pages/(features)/rehab/encounter/[id]/document-upload/add.vue
new file mode 100644
index 00000000..fcc7432e
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/document-upload/add.vue
@@ -0,0 +1,42 @@
+<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'
+
+definePageMeta({
+    middleware: ['rbac'],
+    roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+    title: 'Tambah Dokumen Pendukung',
+    contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+    title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/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)
+const canRead = true
+const callbackUrl = route.query['return-path'] as string | undefined
+</script>
+
+<template>
+    <div>
+        <div v-if="canRead">
+            <ContentDocumentUploadAdd :callback-url="callbackUrl" />
+        </div>
+        <Error v-else :status-code="403" />
+    </div>
+</template>
\ No newline at end of file
diff --git a/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
new file mode 100644
index 00000000..e1059769
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Update PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+
+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)
+const canRead = true
+</script>
+
+<template>
+  <div>
+    <div v-if="canRead">
+      <ContentPrbEntry />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/index.vue
new file mode 100644
index 00000000..1d66b563
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/index.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+
+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)
+const canRead = true
+</script>
+
+<template>
+  <div>
+    <div v-if="canRead">
+      <ContentPrbDetail :patient-id="Number(route.params.id)" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/prb/add.vue b/app/pages/(features)/rehab/encounter/[id]/prb/add.vue
new file mode 100644
index 00000000..b168fcb5
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/prb/add.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah PRB',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, getPagePermissions } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   navigateTo('/403')
+// }
+
+// Define permission-based computed properties
+const pagePermission = getPagePermissions(roleAccess)
+const callbackUrl = route.query['return-path'] as string | undefined
+</script>
+
+<template>
+  <div>
+    <div v-if="pagePermission.canRead">
+      <ContentPrbEntry :callback-url="callbackUrl" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/process.vue b/app/pages/(features)/rehab/encounter/[id]/process.vue
index 68cc7c02..49a5dd6d 100644
--- a/app/pages/(features)/rehab/encounter/[id]/process.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/process.vue
@@ -35,7 +35,7 @@ const pagePermission = getPagePermissions(roleAccess)
 </script>
 
 <template>
-    <div v-if="pagePermission.canRead">
+  <div v-if="pagePermission.canRead">
     <EncounterProcess class-code="ambulatory" sub-class-code="rehab" />
   </div>
   <Error v-else :status-code="403" />
diff --git a/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
new file mode 100644
index 00000000..a2f68104
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail Data Vaksin',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/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)
+const canRead = true
+</script>
+
+<template>
+  <div>
+    <div v-if="canRead">
+      <ContentVaccineDataDetail :patient-id="Number(route.params.id)" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/vaccine-data/add.vue b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/add.vue
new file mode 100644
index 00000000..df4c33b9
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/add.vue
@@ -0,0 +1,41 @@
+<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'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah Data Vaksin',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, getPagePermissions } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   navigateTo('/403')
+// }
+
+// Define permission-based computed properties
+const pagePermission = getPagePermissions(roleAccess)
+const callbackUrl = route.query['return-path'] as string | undefined
+</script>
+
+<template>
+  <div>
+    <div v-if="pagePermission.canRead">
+      <ContentVaccineDataEntry :callback-url="callbackUrl" />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
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/material-package-item.schema.ts b/app/schemas/material-package-item.schema.ts
new file mode 100644
index 00000000..e893aa5b
--- /dev/null
+++ b/app/schemas/material-package-item.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+import type { MaterialPackageItem } from '~/models/material-package-item'
+
+const MaterialSchema = z.object({
+  materialPackage_code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
+  material_code: z.string({ required_error: 'Nama harus diisi' }).min(1, 'Nama minimum 1 karakter'),
+})
+
+type MaterialFormData = z.infer<typeof MaterialSchema> & Partial<MaterialPackageItem>
+
+export { MaterialSchema }
+export type { MaterialFormData }
diff --git a/app/schemas/material-package.schema.ts b/app/schemas/material-package.schema.ts
new file mode 100644
index 00000000..38220f7b
--- /dev/null
+++ b/app/schemas/material-package.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+import type { MaterialPackage } from '~/models/material-package'
+
+const MaterialSchema = z.object({
+  code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
+  name: z.string({ required_error: 'Nama harus diisi' }).min(1, 'Nama minimum 1 karakter'),
+})
+
+type MaterialFormData = z.infer<typeof MaterialSchema> & Partial<MaterialPackage>
+
+export { MaterialSchema }
+export type { MaterialFormData }
diff --git a/app/schemas/prb-medicine.schema.ts b/app/schemas/prb-medicine.schema.ts
new file mode 100644
index 00000000..32b7b9c5
--- /dev/null
+++ b/app/schemas/prb-medicine.schema.ts
@@ -0,0 +1,27 @@
+import { z } from 'zod'
+
+const PrbMedicineSchema = z.object({
+  a1: z.string({
+    required_error: 'Mohon isi',
+  }).optional(),
+  a2: z.string({
+    required_error: 'Mohon isi',
+  }),
+  a3: z.string({
+    required_error: 'Mohon isi',
+  }),
+  a4: z.string({
+    required_error: 'Mohon isi',
+  }).optional(),
+  a5: z.string({
+    required_error: 'Mohon isi',
+  }),
+  a6: z.string({
+    required_error: 'Mohon isi',
+  }),
+})
+
+type PrbMedicineFormData = z.infer<typeof PrbMedicineSchema>
+
+export { PrbMedicineSchema }
+export type { PrbMedicineFormData }
diff --git a/app/schemas/prb.schema.ts b/app/schemas/prb.schema.ts
new file mode 100644
index 00000000..2cbb88a8
--- /dev/null
+++ b/app/schemas/prb.schema.ts
@@ -0,0 +1,47 @@
+import { z } from 'zod'
+
+const PrbSchema = z.object({
+  sepStatus: z.string({
+    required_error: 'Mohon isi status SEP',
+  }).default('SEP Internal'),
+  unit_code: z.string({
+    required_error: 'Mohon isi Unit',
+  }),
+  specialist_code: z.string({
+    required_error: 'Mohon isi Spesialis',
+  }),
+  subspecialist_code: z.string({
+    required_error: 'Mohon isi Sub Spesialis',
+  }),
+  doctor_code: z.string({
+    required_error: 'Mohon isi DPJP',
+  }),
+  encounter_code: z.string().optional(),
+  date: z.string({
+    required_error: 'Mohon lengkapi Tanggal Kontrol',
+  })
+    .refine(
+      (date) => {
+        // Jika kosong, return false untuk required validation
+        if (!date || date.trim() === '') return false
+
+        // Jika ada isi, validasi format tanggal
+        try {
+          const dateObj = new Date(date)
+          // Cek apakah tanggal valid dan tahun >= 1900
+          return !isNaN(dateObj.getTime()) && dateObj.getFullYear() >= 1900
+        } catch {
+          return false
+        }
+      },
+      {
+        message: 'Mohon lengkapi Tanggal Kontrol dengan format yang valid',
+      },
+    )
+    .transform((dateStr) => new Date(dateStr).toISOString()),
+})
+
+type PrbFormData = z.infer<typeof PrbSchema>
+
+export { PrbSchema }
+export type { PrbFormData }
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/schemas/vaccine-data.schema.ts b/app/schemas/vaccine-data.schema.ts
new file mode 100644
index 00000000..0a31dae8
--- /dev/null
+++ b/app/schemas/vaccine-data.schema.ts
@@ -0,0 +1,47 @@
+import { z } from 'zod'
+
+const VaccineDataSchema = z.object({
+  sepStatus: z.string({
+    required_error: 'Mohon isi status SEP',
+  }).default('SEP Internal'),
+  unit_code: z.string({
+    required_error: 'Mohon isi Unit',
+  }),
+  specialist_code: z.string({
+    required_error: 'Mohon isi Spesialis',
+  }),
+  subspecialist_code: z.string({
+    required_error: 'Mohon isi Sub Spesialis',
+  }),
+  doctor_code: z.string({
+    required_error: 'Mohon isi DPJP',
+  }),
+  encounter_code: z.string().optional(),
+  date: z.string({
+    required_error: 'Mohon lengkapi Tanggal Kontrol',
+  })
+    .refine(
+      (date) => {
+        // Jika kosong, return false untuk required validation
+        if (!date || date.trim() === '') return false
+
+        // Jika ada isi, validasi format tanggal
+        try {
+          const dateObj = new Date(date)
+          // Cek apakah tanggal valid dan tahun >= 1900
+          return !isNaN(dateObj.getTime()) && dateObj.getFullYear() >= 1900
+        } catch {
+          return false
+        }
+      },
+      {
+        message: 'Mohon lengkapi Tanggal Kontrol dengan format yang valid',
+      },
+    )
+    .transform((dateStr) => new Date(dateStr).toISOString()),
+})
+
+type VaccineDataFormData = z.infer<typeof VaccineDataSchema>
+
+export { VaccineDataSchema }
+export type { VaccineDataFormData }
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/antibiotic-in-use.ts b/app/services/antibiotic-in-use.ts
new file mode 100644
index 00000000..41038eb5
--- /dev/null
+++ b/app/services/antibiotic-in-use.ts
@@ -0,0 +1,25 @@
+// Base
+import * as base from './_crud-base'
+
+const name = 'antibiotic-in-use'
+const path = '/api/v1/' + name
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
diff --git a/app/services/antibiotic-src-category.ts b/app/services/antibiotic-src-category.ts
new file mode 100644
index 00000000..eac38f0e
--- /dev/null
+++ b/app/services/antibiotic-src-category.ts
@@ -0,0 +1,25 @@
+// Base
+import * as base from './_crud-base'
+
+const name = 'antibiotic-src-category'
+const path = '/api/v1/' + name
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
diff --git a/app/services/antibiotic-src.ts b/app/services/antibiotic-src.ts
new file mode 100644
index 00000000..4c2623bf
--- /dev/null
+++ b/app/services/antibiotic-src.ts
@@ -0,0 +1,25 @@
+// Base
+import * as base from './_crud-base'
+
+const name = 'antibiotic-src'
+const path = '/api/v1/' + name
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
diff --git a/app/services/infra.service.ts b/app/services/infra.service.ts
index 9147421d..aa9b94e8 100644
--- a/app/services/infra.service.ts
+++ b/app/services/infra.service.ts
@@ -1,14 +1,11 @@
 
-// Base
 import * as base from './_crud-base'
-
-// Types
 import type { Infra } from '~/models/infra'
 
-const path = '/api/v1/infra'
 const name = 'infra'
+const path = `/api/v1/${name}`
 
-export function create(data: any) {
+export function create(data: Infra) {
   return base.create(path, data, name)
 }
 
@@ -20,7 +17,7 @@ export function getDetail(id: number | string) {
   return base.getDetail(path, id, name)
 }
 
-export function update(id: number | string, data: any) {
+export function update(id: number | string, data: Infra) {
   return base.update(path, id, data, name)
 }
 
@@ -28,15 +25,26 @@ export function remove(id: number | string) {
   return base.remove(path, id, name)
 }
 
-export async function getValueLabelList(params: any = null): Promise<{ value: string; label: string }[]> {
+export async function getValueLabelList(params: any = null, useId = false): Promise<{ value: string; label: string }[]> {
   let data: { value: string; label: string }[] = []
   const result = await getList(params)
   if (result.success) {
     const resultData = result.body?.data || []
-    data = resultData.map((item: Infra) => ({
-      value: item.id ? Number(item.id) : item.code,
-      label: item.name,
-    }))
+    data = !useId ?
+      resultData.map((item: Infra) => ({ value: item.code, label: item.name })) :
+      resultData.map((item: Infra) => ({ value: item.id, label: item.name }))
   }
   return data
 }
+
+// export async function getProcedureRoomValueLabelList(params: any = null, useId = false): Promise<{ value: string; label: string }[]> {
+//   let data: { value: string; label: string }[] = []
+//   const result = await getList({ 'infraGroup_code': 'procedure-room' ,...params})
+//   if (result.success) {
+//     const resultData = result.body?.data || []
+//     data = !useId ?
+//       resultData.map((item: Infra) => ({ value: item.code, label: item.name })) :
+//       resultData.map((item: Infra) => ({ value: item.id, label: item.name }))
+//   }
+//   return data
+// }
diff --git a/app/services/material-package-item.service.ts b/app/services/material-package-item.service.ts
new file mode 100644
index 00000000..00059356
--- /dev/null
+++ b/app/services/material-package-item.service.ts
@@ -0,0 +1,25 @@
+// Base
+import * as base from './_crud-base'
+
+const name = 'material-package-item'
+const path = `/api/v1/${name}`
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
diff --git a/app/services/material-package.service.ts b/app/services/material-package.service.ts
new file mode 100644
index 00000000..36822045
--- /dev/null
+++ b/app/services/material-package.service.ts
@@ -0,0 +1,38 @@
+// Base
+import type { MaterialPackage } from '~/models/material-package'
+import * as base from './_crud-base'
+
+const name = 'material-package'
+const path = `/api/v1/${name}`
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
+
+export async function getValueLabelList(params: any = null, useId = false): Promise<{ value: string; label: string }[]> {
+  let data: { value: string; label: string }[] = []
+  const result = await getList(params)
+  if (result.success) {
+    const resultData = result.body?.data || []
+    data = !useId ?
+      resultData.map((item: MaterialPackage) => ({ value: item.code, label: item.name })) :
+      resultData.map((item: MaterialPackage) => ({ value: item.id, label: item.name }))
+  }
+  return data
+}
diff --git a/app/services/mcu-order-item.service.ts b/app/services/mcu-order-item.service.ts
index b7ffbbfe..4e8c852f 100644
--- a/app/services/mcu-order-item.service.ts
+++ b/app/services/mcu-order-item.service.ts
@@ -1,13 +1,14 @@
 import * as base from './_crud-base'
+import * as model from '~/models/mcu-order-item'
 
 const path = '/api/v1/mcu-order-item'
 const name = 'mcu-order-item'
 
-export function create(data: any) {
+export function create(data: model.CreateDto) {
   return base.create(path, data)
 }
 
-export function getList(params: any = null) {
+export function getList(params: model.ReadList | null = null) {
   return base.getList(path, params)
 }
 
@@ -15,7 +16,7 @@ export function getDetail(id: number | string, params?: any) {
   return base.getDetail(path, id, name, params)
 }
 
-export function update(id: number | string, data: any) {
+export function update(id: number | string, data: model.UpdateDto) {
   return base.update(path, id, data)
 }
 
diff --git a/app/services/mcu-order.service.ts b/app/services/mcu-order.service.ts
index 77e023d7..7299203b 100644
--- a/app/services/mcu-order.service.ts
+++ b/app/services/mcu-order.service.ts
@@ -22,3 +22,16 @@ export function update(id: number | string, data: any) {
 export function remove(id: number | string) {
   return base.remove(path, id)
 }
+
+export async function submit(id: number) {
+  try {
+    const resp = await xfetch(`${path}/${id}/submit`, 'PATCH')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error(`Error submitting ${name}:`, error)
+    throw new Error(`Failed to submit ${name}`)
+  }
+}
diff --git a/app/services/medicine.service.ts b/app/services/medicine.service.ts
index 57a52103..00ea34e3 100644
--- a/app/services/medicine.service.ts
+++ b/app/services/medicine.service.ts
@@ -1,4 +1,5 @@
 // Base
+import type { Medicine } from '~/models/medicine'
 import * as base from './_crud-base'
 
 const path = '/api/v1/medicine'
@@ -23,3 +24,16 @@ export function update(id: number | string, data: any) {
 export function remove(id: number | string) {
   return base.remove(path, id, name)
 }
+
+export async function getValueLabelList(params: any = null): Promise<{ value: string; label: string }[]> {
+  let data: { value: string; label: string }[] = []
+  const result = await getList(params)
+  if (result.success) {
+    const resultData = result.body?.data || []
+    data = resultData.map((item: Medicine) => ({
+      value: item.code,
+      label: item.name,
+    }))
+  }
+  return data
+}
\ No newline at end of file
diff --git a/app/services/prb.service.ts b/app/services/prb.service.ts
new file mode 100644
index 00000000..865a0b99
--- /dev/null
+++ b/app/services/prb.service.ts
@@ -0,0 +1,28 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+import { encounterClassCodes } from '~/lib/constants'
+
+const path = '/api/v1/prb'
+const name = 'prb'
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
\ No newline at end of file
diff --git a/app/services/procedure-room-order-item.service.ts b/app/services/procedure-room-order-item.service.ts
new file mode 100644
index 00000000..8e6d08b8
--- /dev/null
+++ b/app/services/procedure-room-order-item.service.ts
@@ -0,0 +1,26 @@
+// Base
+import type { CreateDto, UpdateDto } from '~/models/procedure-room-order-item'
+import * as base from './_crud-base'
+
+const name = 'procedure-room-order-item'
+const path = `/api/v1/${name}`
+
+export function create(data: CreateDto) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: UpdateDto) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
diff --git a/app/services/procedure-room-order.service.ts b/app/services/procedure-room-order.service.ts
new file mode 100644
index 00000000..b5c354c3
--- /dev/null
+++ b/app/services/procedure-room-order.service.ts
@@ -0,0 +1,42 @@
+// Base
+import type { ProcedureRoomOrder, CreateDto } from '~/models/procedure-room-order'
+import * as base from './_crud-base'
+
+const name = 'procedure-room-order'
+const path = `/api/v1/${name}`
+
+export function create(data: CreateDto) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params: any = null) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: ProcedureRoomOrder) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
+
+
+export async function submit(id: number) {
+  try {
+    const resp = await xfetch(`${path}/${id}/submit`, 'PATCH')
+    const result: any = {}
+    if (resp.success) {
+      result.success = resp.success
+      result.body = (resp.body as Record<string, any>) || {}
+      return result
+    }
+  } catch (error) {
+    console.error(`Error submitting ${name}:`, error)
+    throw new Error(`Failed to submit ${name}`)
+  }
+}
diff --git a/app/services/procedure-room.service.ts b/app/services/procedure-room.service.ts
new file mode 100644
index 00000000..c799de75
--- /dev/null
+++ b/app/services/procedure-room.service.ts
@@ -0,0 +1,26 @@
+// Base
+import type { ProcedureRoom } from '~/models/procedure-room'
+import * as base from './_crud-base'
+
+const name = 'procedure-room'
+const path = `/api/v1/${name}`
+
+export function create(data: ProcedureRoom) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string) {
+  return base.getDetail(path, id, name)
+}
+
+export function update(id: number | string, data: ProcedureRoom) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
diff --git a/app/services/vaccine-data.service.ts b/app/services/vaccine-data.service.ts
new file mode 100644
index 00000000..6e8aaa89
--- /dev/null
+++ b/app/services/vaccine-data.service.ts
@@ -0,0 +1,28 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+import { encounterClassCodes } from '~/lib/constants'
+
+const path = '/api/v1/vaccine-data'
+const name = 'vaccine-data'
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
\ No newline at end of file
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/public/side-menu-items/system.json b/public/side-menu-items/system.json
index c46775aa..19d20336 100644
--- a/public/side-menu-items/system.json
+++ b/public/side-menu-items/system.json
@@ -200,6 +200,11 @@
             "icon": "i-lucide-circuit-board",
             "link": "/integration/bpjs-vclaim/member"
           },
+          {
+            "title": "PRB",
+            "icon": "i-lucide-circuit-board",
+            "link": "/integration/bpjs/prb"
+          },
           {
             "title": "Surat Kontrol",
             "icon": "i-lucide-circuit-board",
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 || '')
   }