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/consultation/entry.vue b/app/components/app/consultation/entry.vue
index bff12bfb..873bfd40 100644
--- a/app/components/app/consultation/entry.vue
+++ b/app/components/app/consultation/entry.vue
@@ -35,24 +35,24 @@ const { defineField, errors, meta } = useForm({
   initialValues: {
     date: props.values.date || today.toISOString().slice(0, 10),
     problem: '',
-    dstUnit_id: 0,
-  } as Partial<ConsultationFormData>,
+    dstUnit_code: '',
+  } as ConsultationFormData,
 })
 
 const [date, dateAttrs] = defineField('date')
-const [unit_id, unitAttrs] = defineField('unit_id')
+const [unit_code, unitAttrs] = defineField('unit_code')
 const [problem, problemAttrs] = defineField('problem')
 
 // Fill fields from props.values if provided
 if (props.values) {
   if (props.values.date !== undefined) date.value = props.values.date.substring(0, 10)
-  if (props.values.dstUnit_id !== undefined) unit_id.value = props.values.dstUnit_id
+  if (props.values.dstUnit_code !== undefined) unit_code.value = props.values.dstUnit_code
   if (props.values.problem !== undefined) problem.value = props.values.problem
 }
 
 const resetForm = () => {
   date.value = date.value ?? today.toISOString().slice(0, 10)
-  unit_id.value = 0
+  unit_code.value = 0
   problem.value = ''
 }
 
@@ -62,7 +62,7 @@ function onSubmitForm(values: any) {
     encounter_id: props.encounter_id,
     date: date.value ? `${date.value}T00:00:00Z` : '',
     problem: problem.value || '',
-    dstUnit_id: unit_id.value || 0,
+    dstUnit_code: unit_code.value || '',
   }
   emit('submit', formData, resetForm)
 }
@@ -89,18 +89,18 @@ function onCancelForm() {
       </DE.Cell>
       <DE.Cell>
         <DE.Label>Unit</DE.Label>
-        <DE.Field :errMessage="errors.unit_id">
-          {{ errors.unit_id }}
+        <DE.Field :errMessage="errors.unit_code">
+          {{ errors.unit_code }}
           <Select
-            id="strUnit_id"
-            v-model.number="unit_id"
+            id="strUnit_code"
+            v-model="unit_code"
             icon-name="i-lucide-chevron-down"
             placeholder="Pilih poliklinik tujuan"
             v-bind="unitAttrs"
             :items="props.units || []"
             :disabled="isLoading || isReadonly"
           />
-          <!-- <Input type="number" id="unit_id" v-model.number="unit_id" v-bind="unitAttrs" :disabled="isLoading || isReadonly" /> -->
+          <!-- <Input type="number" id="unit_code" v-model.number="unit_code" v-bind="unitAttrs" :disabled="isLoading || isReadonly" /> -->
         </DE.Field>
       </DE.Cell>
       <DE.Cell :colSpan="3">
diff --git a/app/components/app/control-letter/history-dialog.vue b/app/components/app/control-letter/history-dialog.vue
new file mode 100644
index 00000000..7e5a2304
--- /dev/null
+++ b/app/components/app/control-letter/history-dialog.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+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'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+const props = defineProps<Props>()
+const isModalOpen = inject(`isHistoryDialogOpen`) as Ref<boolean>
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="Riwayat Surat Kontrol" size="full">   
+    <PubMyUiDataTable
+            v-bind="config"
+            :rows="data"
+            :skeleton-size="props.paginationMeta?.pageSize"
+        />
+        <PaginationView :pagination-meta="props.paginationMeta" @page-change="handlePageChange" />
+  </Dialog>
+</template>
\ No newline at end of file
diff --git a/app/components/app/control-letter/history-list.cfg.ts b/app/components/app/control-letter/history-list.cfg.ts
new file mode 100644
index 00000000..443bf237
--- /dev/null
+++ b/app/components/app/control-letter/history-list.cfg.ts
@@ -0,0 +1,85 @@
+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/print-btn.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {width: 130}, {width: 30},],
+
+  headers: [
+    [
+      { label: 'NAMA PASIEN' },
+      { label: 'NO.SURAT KONTROL' },
+      { label: 'NO.SEP' },
+      { label: 'TANGGAL RENCANA KONTROL' },
+      { label: 'TANGGAL TERBIT' },
+      { label: 'DPJP' },
+      { label: 'SPESIALIS' },
+      { label: 'SUBSPESIALIS' },
+      { label: 'TIPE RAWAT' },
+      { label: 'DIBUAT OLEH' },
+      { label: 'DIEDIT OLEH' },
+      { label: 'STATUS' },
+      { label: 'AKSI' },
+    ],
+  ],
+
+  keys: [
+    'date',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    '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
+    },
+    specialist_subspecialist: (rec: unknown): unknown => {
+      return '-'
+    },
+    dpjp: (rec: unknown): unknown => {
+      // const { person } = rec as Patient
+      return '-'
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+    sep_status(_rec) {
+      return 'SEP Internal'
+    },
+  },
+}
diff --git a/app/components/app/cprj/entry.vue b/app/components/app/cprj/entry.vue
new file mode 100644
index 00000000..d03bbf77
--- /dev/null
+++ b/app/components/app/cprj/entry.vue
@@ -0,0 +1,146 @@
+<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'
+
+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 })
+
+const [subjective, subjectiveAttrs] = defineField('subjective')
+const [objective, objectiveAttrs] = defineField('objective')
+const [assesment, assesmentAttrs] = defineField('assesment')
+const [plan, planAttrs] = defineField('plan')
+const [review, reviewAttrs] = defineField('review')
+
+const validate = async () => {
+  const result = await _validate()
+  console.log('Component validate() result:', result)
+
+  return {
+    valid: true,
+    data: result.values,
+    errors: result.errors,
+  }
+}
+
+defineExpose({ validate })
+</script>
+
+<template>
+  <form id="entry-form">
+    <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+      <div class="my-2">
+        <h1 class="font-semibold">Data Petugas</h1>
+      </div>
+
+      <div class="my-2 rounded-md border border-slate-300 p-4">
+        <Block :colCount="2">
+          <Cell>
+            <Label dynamic>PPA</Label>
+            <Field>
+              <Input disabled />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Nama PPA</Label>
+            <Field>
+              <Input disabled />
+            </Field>
+          </Cell>
+        </Block>
+      </div>
+
+      <div class="my-2">
+        <h1 class="font-semibold">Data S.O.A.P</h1>
+      </div>
+
+      <div class="my-2 rounded-md border border-slate-300 p-4">
+        <Block :colCount="2">
+          <Cell>
+            <Label dynamic>Subjektif</Label>
+            <Field>
+              <Textarea
+                v-model="subjective"
+                v-bind="subjectiveAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Objektif</Label>
+            <Field>
+              <Textarea
+                v-model="objective"
+                v-bind="objectiveAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block :colCount="2">
+          <Cell>
+            <Label dynamic>Assesmen</Label>
+            <Field>
+              <Textarea
+                v-model="assesment"
+                v-bind="assesmentAttrs"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label dynamic>Plan</Label>
+            <Field>
+              <Textarea
+                v-model="plan"
+                v-bind="planAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+        <Block>
+          <Cell>
+            <Label dynamic>Review</Label>
+            <Field>
+              <Textarea
+                v-model="review"
+                v-bind="reviewAttrs"
+              />
+            </Field>
+          </Cell>
+        </Block>
+      </div>
+      <Separator class="mt-8" />
+    </div>
+  </form>
+</template>
diff --git a/app/components/app/cprj/list.cfg.ts b/app/components/app/cprj/list.cfg.ts
new file mode 100644
index 00000000..a394e81d
--- /dev/null
+++ b/app/components/app/cprj/list.cfg.ts
@@ -0,0 +1,56 @@
+import type { Config, RecComponent, RecStrFuncComponent, RecStrFuncUnknown } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+import type { GeneralConsent } from '~/models/general-consent'
+
+type SmallDetailDto = any
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-ud.vue'))
+export const config: Config = {
+  cols: [{ width: 100 }, {}, {}, {}, { width: 50 }],
+  headers: [
+    [
+      { label: 'Tanggal' },
+      { label: 'PPA' },
+      { label: 'Hasil' },
+      { label: 'Review & Verifikasi' },
+      { label: 'Status' },
+      { label: 'Aksi' },
+    ],
+  ],
+  keys: ['date', 'ppa', 'result', 'review', 'status', 'action'],
+  delKeyNames: [
+    { key: 'data', label: 'Tanggal' },
+    { key: 'dstDoctor.name', label: 'Dokter' },
+  ],
+  parses: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+        props: {
+          size: 'sm',
+        },
+      }
+      return res
+    },
+    date(rec) {
+      const recX = rec as GeneralConsent
+      return recX.date?.substring(0, 10) || '-'
+    },
+  },
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+        props: {
+          size: 'sm',
+        },
+      }
+      return res
+    },
+  } as RecStrFuncComponent,
+  htmls: {} as RecStrFuncUnknown,
+}
diff --git a/app/components/app/cprj/list.vue b/app/components/app/cprj/list.vue
new file mode 100644
index 00000000..46f595f5
--- /dev/null
+++ b/app/components/app/cprj/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'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <!-- FIXME: pindahkan ke content/division/list.vue   -->
+    <PaginationView
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange"
+    />
+  </div>
+</template>
diff --git a/app/components/app/diagnose-src/list.vue b/app/components/app/diagnose-src/list.vue
index 1be60a60..9b603f6b 100644
--- a/app/components/app/diagnose-src/list.vue
+++ b/app/components/app/diagnose-src/list.vue
@@ -4,6 +4,7 @@ import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vu
 
 // Types
 import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import type { Config, } from '~/components/pub/my-ui/data-table'
 
 // Configs
 import { config } from './list-cfg'
@@ -11,9 +12,11 @@ import { config } from './list-cfg'
 interface Props {
   data: any[]
   paginationMeta: PaginationMeta
+  tableConfig?: Config
 }
-
-defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  tableConfig: () => config,
+})
 
 const emit = defineEmits<{
   pageChange: [page: number]
@@ -27,7 +30,7 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubMyUiDataTable
-      v-bind="config"
+      v-bind="props.tableConfig"
       :rows="data"
       :skeleton-size="paginationMeta?.pageSize"
     />
diff --git a/app/components/app/encounter/check-in-entry.vue b/app/components/app/encounter/check-in-entry.vue
index ad7de5d6..ea897a31 100644
--- a/app/components/app/encounter/check-in-entry.vue
+++ b/app/components/app/encounter/check-in-entry.vue
@@ -10,12 +10,13 @@ import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
 import * as DE from '~/components/pub/my-ui/doc-entry'
 import type { CheckInFormData } from '~/schemas/encounter.schema'
 import type { Encounter } from '~/models/encounter'
+import { now } from '@internationalized/date';
 
 interface Props {
   schema: z.ZodSchema<any>
   values: any
   doctors: { value: string; label: string }[]
-  employees: { value: string; label: string }[]
+  // employees: { value: string; label: string }[]
   encounter: Encounter
   isLoading?: boolean
   isReadonly?: boolean
@@ -36,18 +37,23 @@ const { defineField, errors, meta } = useForm({
   } as Partial<CheckInFormData>,
 })
 
-const [responsible_doctor_id, responsible_doctor_idAttrs] = defineField('responsible_doctor_id')
-const [adm_employee_id, adm_employee_idAttrs] = defineField('discharge_method_code')
+const [responsible_doctor_code, responsible_doctor_codeAttrs] = defineField('responsible_doctor_code')
+// const [adm_employee_id, adm_employee_idAttrs] = defineField('discharge_method_code')
 const [registeredAt, registeredAtAttrs] = defineField('registeredAt')
 
 function submitForm() {
   const formData: CheckInFormData = {
-    responsible_doctor_id: responsible_doctor_id.value,
-    adm_employee_id: adm_employee_id.value,
-    // registeredAt: registeredAt.value || '',
+    responsible_doctor_code: responsible_doctor_code.value,
+    // adm_employee_id: adm_employee_id.value,
+    registeredAt: registeredAt.value || '',
   }
   emit('submit', formData)
 }
+
+function setTime() {
+  const today = new Date()
+  registeredAt.value = today.toISOString().substring(0, 10) + ' ' + today.toLocaleTimeString('id-ID').substring(0, 5).replace('.', ':');
+}
 </script>
 
 <template>
@@ -57,8 +63,8 @@ function submitForm() {
       <DE.Field>
         <ComboBox
           id="doctor"
-          v-model="responsible_doctor_id"
-          v-bind="responsible_doctor_idAttrs"
+          v-model="responsible_doctor_code"
+          v-bind="responsible_doctor_codeAttrs"
           :items="doctors"
           :disabled="isLoading || isReadonly"
           placeholder="Pilih Dokter DPJP"
@@ -67,7 +73,7 @@ function submitForm() {
         />
       </DE.Field>
     </DE.Cell>
-    <DE.Cell>
+    <!-- <DE.Cell>
       <DE.Label>PJ Berkas</DE.Label>
       <DE.Field>
         <ComboBox
@@ -81,7 +87,7 @@ function submitForm() {
           empty-message="Petugas tidak ditemukan"
         />
       </DE.Field>
-    </DE.Cell>
+    </DE.Cell> -->
     <DE.Cell>
       <DE.Label>Waktu Masuk</DE.Label>
       <DE.Field>
@@ -89,7 +95,8 @@ function submitForm() {
             id="name"
             v-model="registeredAt"
             v-bind="registeredAtAttrs"
-            :disabled="isLoading || isReadonly"
+            @click="setTime"
+            readonly
           />
       </DE.Field>
     </DE.Cell>
@@ -104,4 +111,4 @@ function submitForm() {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/app/components/app/encounter/check-in-view.vue b/app/components/app/encounter/check-in-view.vue
index a3b6ab53..7a84ec0e 100644
--- a/app/components/app/encounter/check-in-view.vue
+++ b/app/components/app/encounter/check-in-view.vue
@@ -7,43 +7,48 @@ import type { Encounter } from '~/models/encounter'
 
 interface Props {
   encounter: Encounter
+  canUpdate?: boolean
+  isLoading?: boolean
 }
 const props = defineProps<Props>()
-const doctor = ref('-belum dipilih-')
+const doctor = computed(() => {
+  return props.encounter.responsible_doctor?.employee?.person?.name ?? '-belum dipilih-'
+})
 const adm = ref('-belum dipilih-')
 
 const emit = defineEmits<{
   edit: []
 }>()
-
-watch(props.encounter, () => {
-  doctor.value = props.encounter.responsible_doctor?.employee?.person?.name ?? props.encounter.appointment_doctor?.employee?.person?.name ?? '-belum dipilih-'
-  adm.value = props.encounter.adm_employee?.person?.name ?? '-belum dipilih-'
-})
 </script>
 
 <template>
   <DE.Block :cell-flex="false">
+    <DE.Cell>
+      <DE.Label class="font-semibold">Waktu Masuk</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter?.registeredAt?.substring(0, 15).replace('T', ' ') || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label class="font-semibold">PJ Berkas</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter.adm_employee?.person?.name || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label class="font-semibold">Perawat</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter.responsible_nurse?.employee?.person?.name || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
     <DE.Cell>
       <DE.Label class="font-semibold">Dokter</DE.Label>
       <DE.Field>
         <div class="py-2 border-b border-b-slate-300">{{ doctor }}</div>
       </DE.Field>
     </DE.Cell>
-    <DE.Cell>
-      <DE.Label class="font-semibold">PJ Berkas</DE.Label>
-      <DE.Field>
-        <div class="py-2 border-b border-b-slate-300">{{ adm }}</div>
-      </DE.Field>
-    </DE.Cell>
-    <DE.Cell>
-      <DE.Label class="font-semibold">Waktu Masuk</DE.Label>
-      <DE.Field>
-        <div class="py-2 border-b border-b-slate-300">{{ encounter?.registeredAt || '-' }}</div>
-      </DE.Field>
-    </DE.Cell>
   </DE.Block>
-  <div class="text-center">
+  <div v-if="canUpdate" class="text-center">
     <Button @click="() => emit('edit')">
       <LucidePen />
       Edit
@@ -53,4 +58,4 @@ watch(props.encounter, () => {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/app/components/app/encounter/check-out-view.vue b/app/components/app/encounter/check-out-view.vue
index 37cd2bbe..96316f0c 100644
--- a/app/components/app/encounter/check-out-view.vue
+++ b/app/components/app/encounter/check-out-view.vue
@@ -12,8 +12,7 @@ import type { Encounter } from '~/models/encounter';
 
 interface Props {
   encounter: Encounter
-  isLoading?: boolean
-  isReadonly?: boolean
+  canUpdate?: boolean
 }
 const props = defineProps<Props>()
 
@@ -73,7 +72,7 @@ const emit = defineEmits<{
       </DE.Field>
     </DE.Cell>
   </DE.Block>
-  <div class="text-center [&>*]:mx-1">
+  <div v-if="canUpdate" class="text-center [&>*]:mx-1">
     <Button @click="() => emit('edit')">
       <LucidePen />
       Edit
@@ -87,4 +86,4 @@ const emit = defineEmits<{
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/app/components/app/encounter/dropdown-action.vue b/app/components/app/encounter/dropdown-action.vue
new file mode 100644
index 00000000..0815e6a7
--- /dev/null
+++ b/app/components/app/encounter/dropdown-action.vue
@@ -0,0 +1,147 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from '~/components/pub/my-ui/data/types'
+import { ActionEvents } 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 activeServicePosition = inject<Ref<string>>('activeServicePosition')! // previously: activePosition
+
+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',
+  },
+  {
+    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',
+  },
+  {
+    label: 'Print',
+    value: 'print',
+    groups: ['registration'],
+    onClick: () => {
+      proceedItem(ActionEvents.showPrint)
+    },
+    icon: 'i-lucide-printer',
+  },
+  {
+    label: 'Batalkan',
+    value: 'cancel',
+    groups: ['registration'],
+    onClick: () => {
+      proceedItem(ActionEvents.showCancel)
+    },
+    icon: 'i-lucide-circle-x',
+  },
+  {
+    label: 'Hapus',
+    value: 'remove',
+    groups: ['registration'],
+    onClick: () => {
+      proceedItem(ActionEvents.showConfirmDelete)
+    },
+    icon: 'i-lucide-trash',
+  },
+]
+
+const noneLinkItems: LinkItem[] = [
+   {
+    label: 'Nothing',
+    value: 'nothing',
+    icon: 'i-lucide-file',
+  },
+]
+
+linkItemsFiltered.value = [...baseLinkItems]
+
+function proceedItem(action: string) {
+  recId.value = props.rec.id || 0
+  recItem.value = props.rec
+  recAction.value = action
+}
+
+function getLinks() {
+  switch (activeServicePosition.value) {
+    case 'medical':
+      linkItemsFiltered.value = baseLinkItems.filter((item) => item.groups?.includes('medical'))
+      break
+    case 'registration':
+      linkItemsFiltered.value = baseLinkItems.filter((item) => item.groups?.includes('registration'))
+      break
+    default:
+      linkItemsFiltered.value = noneLinkItems
+      break
+  }
+}
+
+watch(activeServicePosition, () => {
+  getLinks()
+})
+
+onMounted(() => {
+  getLinks()
+})
+</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 linkItemsFiltered"
+            :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/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 9c24a0c6..9950a3dd 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -1,42 +1,60 @@
 <script setup lang="ts">
 // Components
-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'
+import * as DE from '~/components/pub/my-ui/doc-entry'
 import { Button } from '~/components/pub/ui/button'
 import { Input } from '~/components/pub/ui/input'
-import Select from '~/components/pub/ui/select/Select.vue'
-import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import * as CB from '~/components/pub/my-ui/combobox'
+
 import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
-import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
 import FileUpload from '~/components/pub/my-ui/form/file-field.vue'
 
 // Types
 import { IntegrationEncounterSchema, type IntegrationEncounterFormData } from '~/schemas/integration-encounter.schema'
 import type { PatientEntity } from '~/models/patient'
-import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
 
 // Helpers
 import { toTypedSchema } from '@vee-validate/zod'
 import { useForm } from 'vee-validate'
+import { refDebounced } from '@vueuse/core'
+import type { Doctor } from '~/models/doctor'
 
+// References
+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
-  doctor?: any[]
-  subSpecialist?: any[]
-  specialists?: TreeItem[]
-  payments: any[]
+  doctorItems?: CB.Item[]
+  selectedDoctor: Doctor
+  // subSpecialist?: any[]
+  // specialists?: TreeItem[]
+  payments?: any[]
   participantGroups?: any[]
   seps: any[]
   patient?: PatientEntity | null | undefined
   objects?: any
 }>()
 
+// Model
+const model = defineModel<Encounter>()
+model.value = genEncounter()
+
+// Common preparation
+const defaultCBItems = [{ label: 'Pilih', value: '' }]
+const paymentMethodItems = CB.recStrToItem(paymentMethodCodes)
+
+// Emit preparation
 const emit = defineEmits<{
+  (e: 'onSelectDoctor', code: string): void
   (e: 'event', menu: string, value?: any): void
   (e: 'fetch', value?: any): void
 }>()
@@ -47,10 +65,10 @@ const { handleSubmit, errors, defineField, meta } = useForm<IntegrationEncounter
 })
 
 // Bind fields and extract attrs
-const [doctorId, doctorIdAttrs] = defineField('doctorId')
-const [subSpecialistId, subSpecialistIdAttrs] = defineField('subSpecialistId')
+const [doctorCode, doctorCodeAttrs] = defineField('doctor_code')
+const [unitCode, unitCodeAttrs] = defineField('unit_code')
 const [registerDate, registerDateAttrs] = defineField('registerDate')
-const [paymentType, paymentTypeAttrs] = defineField('paymentType')
+const [paymentMethodCode, paymentMethodCodeAttrs] = defineField('paymentMethod_code')
 const [patientCategory, patientCategoryAttrs] = defineField('patientCategory')
 const [cardNumber, cardNumberAttrs] = defineField('cardNumber')
 const [sepType, sepTypeAttrs] = defineField('sepType')
@@ -58,44 +76,49 @@ 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
 
-const doctorOpts = computed(() => {
-  // Add default option
-  const defaultOption = [{ label: 'Pilih', value: '' }]
-  // Add doctors from props
-  const doctors = props.doctor || []
-  return [...defaultOption, ...doctors]
-})
-
-const isJKNPayment = computed(() => paymentType.value === 'jkn')
-
-async function onFetchChildren(parentId: string): Promise<void> {
-  console.log('onFetchChildren', parentId)
+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 specialist/subspecialist selection to fetch doctors
-watch(subSpecialistId, async (newValue) => {
-  if (newValue) {
-    console.log('SubSpecialist changed:', newValue)
-    // Reset doctor selection
-    doctorId.value = ''
-    // Emit fetch event to parent
-    emit('fetch', { subSpecialistId: newValue })
-  }
-})
-
-// Watch SEP number changes to notify parent
-watch(sepNumber, (newValue) => {
-  emit('event', 'sep-number-changed', newValue)
-})
+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 || ''
+  },
+)
 
 // Sync props to form fields
 watch(
@@ -105,14 +128,19 @@ watch(
       patientName.value = objects?.patientName || ''
       nationalIdentity.value = objects?.nationalIdentity || ''
       medicalRecordNumber.value = objects?.medicalRecordNumber || ''
-      doctorId.value = objects?.doctorId || ''
-      subSpecialistId.value = objects?.subSpecialistId || ''
-      registerDate.value = objects?.registerDate || ''
-      paymentType.value = objects?.paymentType || ''
+      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 },
@@ -131,55 +159,77 @@ 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: doctorId.value,
-    subSpecialistCode: subSpecialistId.value,
+    doctorCode: doctorCode.value,
     registerDate: registerDate.value,
     cardNumber: cardNumber.value,
-    paymentType: paymentType.value,
-    sepType: sepType.value
+    paymentMethodCode: paymentMethodCode.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:', {
-    doctorId: doctorId.value,
-    subSpecialistId: subSpecialistId.value,
-    registerDate: registerDate.value,
-    paymentType: paymentType.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 = {
       preventDefault: () => {},
       target: formRef.value || {},
     } as SubmitEvent
-    
+
     // Call onSubmit directly
-    console.log('🔵 Calling onSubmit with mock event')
     onSubmit(mockEvent)
   }
 }
@@ -229,149 +279,148 @@ defineExpose({
         </div>
       </div>
 
-      <Block
+      <DE.Block
         labelSize="thin"
         class="!pt-0"
         :colCount="3"
         :cellFlex="false"
       >
-        <Cell>
-          <Label height="compact">Nama Pasien</Label>
-          <Field :errMessage="errors.patientName">
+        <DE.Cell>
+          <DE.Label height="compact">Nama Pasien</DE.Label>
+          <DE.Field :errMessage="errors.patientName">
             <Input
               id="patientName"
               v-model="patientName"
               v-bind="patientNameAttrs"
               :disabled="true"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">NIK</Label>
-          <Field :errMessage="errors.nationalIdentity">
+        <DE.Cell>
+          <DE.Label height="compact">NIK</DE.Label>
+          <DE.Field :errMessage="errors.nationalIdentity">
             <Input
               id="nationalIdentity"
               v-model="nationalIdentity"
               v-bind="nationalIdentityAttrs"
               :disabled="true"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">No. RM</Label>
-          <Field :errMessage="errors.medicalRecordNumber">
+        <DE.Cell>
+          <DE.Label height="compact">No. RM</DE.Label>
+          <DE.Field :errMessage="errors.medicalRecordNumber">
             <Input
               id="medicalRecordNumber"
               v-model="medicalRecordNumber"
               v-bind="medicalRecordNumberAttrs"
               :disabled="true"
             />
-          </Field>
-        </Cell>
-      </Block>
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
 
       <hr />
 
       <!-- Data Kunjungan -->
       <h3 class="text-lg font-semibold">Data Kunjungan</h3>
 
-      <Block
+      <DE.Block
         labelSize="thin"
         class="!pt-0"
         :colCount="3"
         :cellFlex="false"
       >
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Dokter
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.doctorId">
-            <Combobox
-              id="doctorId"
-              v-model="doctorId"
-              v-bind="doctorIdAttrs"
-              :items="doctorOpts"
+          </DE.Label>
+          <DE.Field :errMessage="errors.doctor_code">
+            <CB.Combobox
+              id="doctorCode"
+              v-model="doctorCode"
+              v-bind="doctorCodeAttrs"
+              :items="[...defaultCBItems, ...doctorItems]"
               :is-disabled="isLoading || isReadonly"
               placeholder="Pilih Dokter"
               search-placeholder="Cari Dokter"
               empty-message="Dokter tidak ditemukan"
+              @update:model-value="(value) => emit('onSelectDoctor', value)"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Spesialis / Subspesialis
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.subSpecialistId">
-            <TreeSelect
-              id="subSpecialistId"
-              v-model="subSpecialistId"
-              v-bind="subSpecialistIdAttrs"
-              :data="specialists || []"
-              :on-fetch-children="onFetchChildren"
+          </DE.Label>
+          <DE.Field :errMessage="errors.unit_code">
+            <Input
+              :value="unitFullName"
+              :disabled="true"
             />
-          </Field>
-        </Cell>
-      </Block>
+          </DE.Field>
+        </DE.Cell>
 
-      <Block
-        labelSize="thin"
-        class="!pt-0"
-        :colCount="3"
-        :cellFlex="false"
-      >
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Tanggal Daftar
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.registerDate">
+          </DE.Label>
+          <DE.Field :errMessage="errors.registerDate">
             <DatepickerSingle
+              v-if="!isDateLoading"
               id="registerDate"
               v-model="registerDate"
               v-bind="registerDateAttrs"
               placeholder="Pilih tanggal"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
 
-        <Cell>
-          <Label height="compact">
+      <DE.Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <DE.Cell>
+          <DE.Label height="compact">
             Jenis Pembayaran
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.paymentType">
-            <Select
-              id="paymentType"
-              v-model="paymentType"
-              v-bind="paymentTypeAttrs"
-              :items="payments"
+          </DE.Label>
+          <DE.Field :errMessage="errors.paymentMethod_code">
+            <CB.Combobox
+              id="paymentMethodCode"
+              v-model="paymentMethodCode"
+              v-bind="paymentMethodCodeAttrs"
+              :items="paymentMethodItems"
               :disabled="isLoading || isReadonly"
               placeholder="Pilih Jenis Pembayaran"
             />
-          </Field>
-        </Cell>
-      </Block>
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
 
       <!-- BPJS Fields (conditional) -->
-      <template v-if="isJKNPayment">
-        <Block
+      <template v-if="isInsurancePayment">
+        <DE.Block
           labelSize="thin"
           class="!pt-0"
           :colCount="3"
           :cellFlex="false"
         >
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               Kelompok Peserta
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.patientCategory">
+            </DE.Label>
+            <DE.Field :errMessage="errors.patientCategory">
               <Select
                 id="patientCategory"
                 v-model="patientCategory"
@@ -380,15 +429,18 @@ defineExpose({
                 :disabled="isLoading || isReadonly"
                 placeholder="Pilih Kelompok Peserta"
               />
-            </Field>
-          </Cell>
+            </DE.Field>
+            <span class="text-sm text-gray-500">
+              {{ noteReference }}
+            </span>
+          </DE.Cell>
 
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               No. Kartu BPJS
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.cardNumber">
+            </DE.Label>
+            <DE.Field :errMessage="errors.cardNumber">
               <Input
                 id="cardNumber"
                 v-model="cardNumber"
@@ -396,15 +448,35 @@ defineExpose({
                 :disabled="isLoading || isReadonly"
                 placeholder="Masukkan nomor kartu BPJS"
               />
-            </Field>
-          </Cell>
+            </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>
 
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               Jenis SEP
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.sepType">
+            </DE.Label>
+            <DE.Field :errMessage="errors.sepType">
               <Select
                 id="sepType"
                 v-model="sepType"
@@ -413,22 +485,22 @@ defineExpose({
                 :disabled="isLoading || isReadonly"
                 placeholder="Pilih Jenis SEP"
               />
-            </Field>
-          </Cell>
-        </Block>
+            </DE.Field>
+          </DE.Cell>
+        </DE.Block>
 
-        <Block
+        <DE.Block
           labelSize="thin"
           class="!pt-0"
           :colCount="3"
           :cellFlex="false"
         >
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               No. SEP
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.sepNumber">
+            </DE.Label>
+            <DE.Field :errMessage="errors.sepNumber">
               <div class="flex gap-2">
                 <Input
                   id="sepNumber"
@@ -436,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"
@@ -452,41 +524,171 @@ defineExpose({
                     name="i-lucide-loader-2"
                     class="h-4 w-4 animate-spin"
                   />
-                  <span v-else>+</span>
+                  <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>
-            </Field>
-          </Cell>
+            </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"
-          />
-        </Block>
+          <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>
   </div>
diff --git a/app/components/app/encounter/entry-form.vue.backup b/app/components/app/encounter/entry-form.vue.backup
new file mode 100644
index 00000000..f92b7736
--- /dev/null
+++ b/app/components/app/encounter/entry-form.vue.backup
@@ -0,0 +1,499 @@
+<script setup lang="ts">
+// Components
+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'
+import { Button } from '~/components/pub/ui/button'
+import { Input } from '~/components/pub/ui/input'
+import Select from '~/components/pub/ui/select/Select.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
+import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
+import FileUpload from '~/components/pub/my-ui/form/file-field.vue'
+
+// Types
+import { IntegrationEncounterSchema, type IntegrationEncounterFormData } from '~/schemas/integration-encounter.schema'
+import type { PatientEntity } from '~/models/patient'
+import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
+
+// Helpers
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+import { refDebounced } from '@vueuse/core'
+
+const props = defineProps<{
+  isLoading?: boolean
+  isReadonly?: boolean
+  isSepValid?: boolean
+  isCheckingSep?: boolean
+  doctor?: any[]
+  subSpecialist?: any[]
+  specialists?: TreeItem[]
+  payments: any[]
+  participantGroups?: any[]
+  seps: any[]
+  patient?: PatientEntity | null | undefined
+  objects?: any
+}>()
+
+const emit = defineEmits<{
+  (e: 'event', menu: string, value?: any): void
+  (e: 'fetch', value?: any): void
+}>()
+
+// Validation schema
+const { handleSubmit, errors, defineField, meta } = useForm<IntegrationEncounterFormData>({
+  validationSchema: toTypedSchema(IntegrationEncounterSchema),
+})
+
+// Bind fields and extract attrs
+const [doctorId, doctorIdAttrs] = defineField('doctorId')
+const [subSpecialistId, subSpecialistIdAttrs] = defineField('subSpecialistId')
+const [registerDate, registerDateAttrs] = defineField('registerDate')
+const [paymentType, paymentTypeAttrs] = defineField('paymentType')
+const [patientCategory, patientCategoryAttrs] = defineField('patientCategory')
+const [cardNumber, cardNumberAttrs] = defineField('cardNumber')
+const [sepType, sepTypeAttrs] = defineField('sepType')
+const [sepNumber, sepNumberAttrs] = defineField('sepNumber')
+const [patientName, patientNameAttrs] = defineField('patientName')
+const [nationalIdentity, nationalIdentityAttrs] = defineField('nationalIdentity')
+const [medicalRecordNumber, medicalRecordNumberAttrs] = defineField('medicalRecordNumber')
+const patientId = ref('')
+
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
+
+// SEP validation state from props
+const isSepValid = computed(() => props.isSepValid || false)
+const isCheckingSep = computed(() => props.isCheckingSep || false)
+
+const doctorOpts = computed(() => {
+  // Add default option
+  const defaultOption = [{ label: 'Pilih', value: '' }]
+  // Add doctors from props
+  const doctors = props.doctor || []
+  return [...defaultOption, ...doctors]
+})
+
+const isJKNPayment = computed(() => paymentType.value === 'jkn')
+
+async function onFetchChildren(parentId: string): Promise<void> {
+  console.log('onFetchChildren', parentId)
+}
+
+// Watch specialist/subspecialist selection to fetch doctors
+watch(subSpecialistId, async (newValue) => {
+  if (newValue) {
+    console.log('SubSpecialist changed:', newValue)
+    // Reset doctor selection
+    doctorId.value = ''
+    // Emit fetch event to parent
+    emit('fetch', { subSpecialistId: 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 || ''
+      doctorId.value = objects?.doctorId || ''
+      subSpecialistId.value = objects?.subSpecialistId || ''
+      registerDate.value = objects?.registerDate || ''
+      paymentType.value = objects?.paymentType || ''
+      patientCategory.value = objects?.patientCategory || ''
+      cardNumber.value = objects?.cardNumber || ''
+      sepType.value = objects?.sepType || ''
+      sepNumber.value = objects?.sepNumber || ''
+    }
+  },
+  { deep: true, immediate: true },
+)
+
+watch(
+  () => props.patient,
+  (patient) => {
+    if (patient && Object.keys(patient).length > 0) {
+      patientId.value = patient?.id ? String(patient.id) : ''
+      patientName.value = patient?.person?.name || ''
+      nationalIdentity.value = patient?.person?.residentIdentityNumber || ''
+      medicalRecordNumber.value = patient?.number || ''
+    }
+  },
+  { deep: true, immediate: true },
+)
+
+function onAddSep() {
+  const formValues = {
+    patientId: patientId.value || '',
+    doctorCode: doctorId.value,
+    subSpecialistCode: subSpecialistId.value,
+    registerDate: registerDate.value,
+    cardNumber: cardNumber.value,
+    paymentType: paymentType.value,
+    sepType: sepType.value
+  }
+  emit('event', 'add-sep', formValues)
+}
+
+// Submit handler
+const onSubmit = handleSubmit((values) => {
+  console.log('✅ Validated form values:', JSON.stringify(values, null, 2))
+  emit('event', 'save', values)
+})
+
+// Expose submit method for parent component
+const formRef = ref<HTMLFormElement | null>(null)
+
+function submitForm() {
+  console.log('🔵 submitForm called, formRef:', formRef.value)
+  console.log('🔵 Form values:', {
+    doctorId: doctorId.value,
+    subSpecialistId: subSpecialistId.value,
+    registerDate: registerDate.value,
+    paymentType: paymentType.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 = {
+      preventDefault: () => {},
+      target: formRef.value || {},
+    } as SubmitEvent
+
+    // Call onSubmit directly
+    console.log('🔵 Calling onSubmit with mock event')
+    onSubmit(mockEvent)
+  }
+}
+
+defineExpose({
+  submitForm,
+})
+</script>
+
+<template>
+  <div class="mx-auto w-full">
+    <form
+      ref="formRef"
+      @submit.prevent="onSubmit"
+      class="grid gap-6 p-4"
+    >
+      <!-- Data Pasien -->
+      <div class="flex flex-col gap-2">
+        <h3 class="text-lg font-semibold">Data Pasien</h3>
+        <div class="flex items-center gap-2">
+          <span class="text-sm">sudah pernah terdaftar sebagai pasien?</span>
+          <Button
+            variant="outline"
+            type="button"
+            class="h-[40px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50"
+            @click="emit('event', 'search')"
+          >
+            <Icon
+              name="i-lucide-search"
+              class="h-5 w-5"
+            />
+            Cari Pasien
+          </Button>
+          <span class="text-sm">belum pernah terdaftar sebagai pasien?</span>
+          <Button
+            variant="outline"
+            type="button"
+            class="h-[40px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50"
+            @click="emit('event', 'add')"
+          >
+            <Icon
+              name="i-lucide-plus"
+              class="h-5 w-5"
+            />
+            Tambah Pasien Baru
+          </Button>
+        </div>
+      </div>
+
+      <Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <Cell>
+          <Label height="compact">Nama Pasien</Label>
+          <Field :errMessage="errors.patientName">
+            <Input
+              id="patientName"
+              v-model="patientName"
+              v-bind="patientNameAttrs"
+              :disabled="true"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">NIK</Label>
+          <Field :errMessage="errors.nationalIdentity">
+            <Input
+              id="nationalIdentity"
+              v-model="nationalIdentity"
+              v-bind="nationalIdentityAttrs"
+              :disabled="true"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">No. RM</Label>
+          <Field :errMessage="errors.medicalRecordNumber">
+            <Input
+              id="medicalRecordNumber"
+              v-model="medicalRecordNumber"
+              v-bind="medicalRecordNumberAttrs"
+              :disabled="true"
+            />
+          </Field>
+        </Cell>
+      </Block>
+
+      <hr />
+
+      <!-- Data Kunjungan -->
+      <h3 class="text-lg font-semibold">Data Kunjungan</h3>
+
+      <Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <Cell>
+          <Label height="compact">
+            Dokter
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.doctorId">
+            <Combobox
+              id="doctorId"
+              v-model="doctorId"
+              v-bind="doctorIdAttrs"
+              :items="doctorOpts"
+              :is-disabled="isLoading || isReadonly"
+              placeholder="Pilih Dokter"
+              search-placeholder="Cari Dokter"
+              empty-message="Dokter tidak ditemukan"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">
+            Spesialis / Subspesialis
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.subSpecialistId">
+            <TreeSelect
+              id="subSpecialistId"
+              v-model="subSpecialistId"
+              v-bind="subSpecialistIdAttrs"
+              :data="specialists || []"
+              :on-fetch-children="onFetchChildren"
+            />
+          </Field>
+        </Cell>
+      </Block>
+
+      <Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <Cell>
+          <Label height="compact">
+            Tanggal Daftar
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.registerDate">
+            <DatepickerSingle
+              id="registerDate"
+              v-model="registerDate"
+              v-bind="registerDateAttrs"
+              placeholder="Pilih tanggal"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">
+            Jenis Pembayaran
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.paymentType">
+            <Select
+              id="paymentType"
+              v-model="paymentType"
+              v-bind="paymentTypeAttrs"
+              :items="payments"
+              :disabled="isLoading || isReadonly"
+              placeholder="Pilih Jenis Pembayaran"
+            />
+          </Field>
+        </Cell>
+      </Block>
+
+      <!-- BPJS Fields (conditional) -->
+      <template v-if="isJKNPayment">
+        <Block
+          labelSize="thin"
+          class="!pt-0"
+          :colCount="3"
+          :cellFlex="false"
+        >
+          <Cell>
+            <Label height="compact">
+              Kelompok Peserta
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.patientCategory">
+              <Select
+                id="patientCategory"
+                v-model="patientCategory"
+                v-bind="patientCategoryAttrs"
+                :items="participantGroups || []"
+                :disabled="isLoading || isReadonly"
+                placeholder="Pilih Kelompok Peserta"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label height="compact">
+              No. Kartu BPJS
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.cardNumber">
+              <Input
+                id="cardNumber"
+                v-model="cardNumber"
+                v-bind="cardNumberAttrs"
+                :disabled="isLoading || isReadonly"
+                placeholder="Masukkan nomor kartu BPJS"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label height="compact">
+              Jenis SEP
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.sepType">
+              <Select
+                id="sepType"
+                v-model="sepType"
+                v-bind="sepTypeAttrs"
+                :items="seps"
+                :disabled="isLoading || isReadonly"
+                placeholder="Pilih Jenis SEP"
+              />
+            </Field>
+          </Cell>
+        </Block>
+
+        <Block
+          labelSize="thin"
+          class="!pt-0"
+          :colCount="3"
+          :cellFlex="false"
+        >
+          <Cell>
+            <Label height="compact">
+              No. SEP
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.sepNumber">
+              <div class="flex gap-2">
+                <Input
+                  id="sepNumber"
+                  v-model="sepNumber"
+                  v-bind="sepNumberAttrs"
+                  placeholder="Tambah SEP terlebih dahulu"
+                  class="flex-1"
+                  :disabled="isLoading || isReadonly"
+                />
+                <Button
+                  v-if="!isSepValid"
+                  variant="outline"
+                  type="button"
+                  class="bg-primary"
+                  size="sm"
+                  :disabled="isCheckingSep || isLoading || isReadonly"
+                  @click="onAddSep"
+                >
+                  <Icon
+                    v-if="isCheckingSep"
+                    name="i-lucide-loader-2"
+                    class="h-4 w-4 animate-spin"
+                  />
+                   <Icon
+                    v-else
+                    name="i-lucide-plus"
+                    class="h-4 w-4"
+                  />
+                </Button>
+                <Button
+                  v-else
+                  variant="outline"
+                  type="button"
+                  class="bg-green-500 text-white hover:bg-green-600"
+                  size="sm"
+                  disabled
+                >
+                  <Icon
+                    name="i-lucide-check"
+                    class="h-4 w-4"
+                  />
+                </Button>
+              </div>
+            </Field>
+          </Cell>
+
+          <FileUpload
+            field-name="sepFile"
+            label="Dokumen SEP"
+            placeholder="Unggah dokumen SEP"
+            :accept="['pdf', 'jpg', 'png']"
+            :max-size-mb="1"
+          />
+
+          <FileUpload
+            field-name="sippFile"
+            label="Dokumen SIPP"
+            placeholder="Unggah dokumen SIPP"
+            :accept="['pdf', 'jpg', 'png']"
+            :max-size-mb="1"
+          />
+        </Block>
+      </template>
+    </form>
+  </div>
+</template>
diff --git a/app/components/app/encounter/filter.vue b/app/components/app/encounter/filter-form.vue
similarity index 100%
rename from app/components/app/encounter/filter.vue
rename to app/components/app/encounter/filter-form.vue
diff --git a/app/components/app/encounter/filter-nav.vue b/app/components/app/encounter/filter-nav.vue
new file mode 100644
index 00000000..8f4c850e
--- /dev/null
+++ b/app/components/app/encounter/filter-nav.vue
@@ -0,0 +1,134 @@
+<script setup lang="ts">
+import { Calendar as CalendarIcon, Filter as FilterIcon, Search } from 'lucide-vue-next'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateRange } from 'radix-vue'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+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
+  onFilterClick?: () => void
+  onExportPdf?: () => void
+  onExportExcel?: () => void
+  onExportCsv?: () => void
+}>()
+
+const emit = defineEmits<{
+  apply: [filters: { personName: string; startDate: string; endDate: string }]
+}>()
+
+const searchQuery = ref('')
+const isRoleRegistration = props.activePositon === 'registration'
+const isRoleMedical = props.activePositon === 'medical'
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+// Get current date
+const today = new Date()
+const todayCalendar = new CalendarDate(today.getFullYear(), today.getMonth() + 1, today.getDate())
+
+// 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 value = ref({
+  start: oneMonthAgoCalendar,
+  end: todayCalendar,
+}) as Ref<DateRange>
+
+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"
+    />
+  </div>
+
+  <Popover>
+    <PopoverTrigger as-child>
+      <Button
+        variant="outline"
+        :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">
+          <template v-if="value.end">
+            {{ df.format(value.start.toDate(getLocalTimeZone())) }} -
+            {{ df.format(value.end.toDate(getLocalTimeZone())) }}
+          </template>
+
+          <template v-else>
+            {{ df.format(value.start.toDate(getLocalTimeZone())) }}
+          </template>
+        </template>
+        <template v-else>Pick a date</template>
+      </Button>
+    </PopoverTrigger>
+    <PopoverContent class="w-auto p-0">
+      <RangeCalendar
+        v-model="value"
+        initial-focus
+        :number-of-months="2"
+        @update:start-value="(startDate) => (value.start = startDate)"
+      />
+    </PopoverContent>
+  </Popover>
+
+  <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 && (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"
+        />
+        Ekspor
+      </Button>
+    </DropdownMenuTrigger>
+    <DropdownMenuContent>
+      <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/encounter/history-button-menu.vue b/app/components/app/encounter/history-button-menu.vue
new file mode 100644
index 00000000..4274a98f
--- /dev/null
+++ b/app/components/app/encounter/history-button-menu.vue
@@ -0,0 +1,133 @@
+<script setup lang="ts">
+// Components
+import { Button } from '~/components/pub/ui/button'
+
+const route = useRoute()
+const router = useRouter()
+
+// Track active menu item from query param
+const activeMenu = computed(() => route.query.menu as string || '')
+
+interface ButtonItems {
+  label: string
+  icon: string
+  value: string
+  type: 'icon' | 'image'
+}
+
+const itemsOne: ButtonItems[] = [
+  {
+    label: 'Data Pendaftaran',
+    icon: 'i-lucide-file',
+    value: 'register',
+    type: 'icon',
+  },
+  {
+    label: 'Status Pembayaran',
+    icon: 'i-lucide-banknote-arrow-down',
+    value: 'status',
+    type: 'icon',
+  },
+  {
+    label: 'Riwayat Pasien',
+    icon: 'i-lucide-history',
+    value: 'history',
+    type: 'icon',
+  },
+  {
+    label: 'Penunjang',
+    icon: 'i-lucide-library-big',
+    value: 'support',
+    type: 'icon',
+  },
+  {
+    label: 'Resep',
+    icon: 'i-lucide-pill',
+    value: 'receipt',
+    type: 'icon',
+  },
+  {
+    label: 'DPJP',
+    icon: 'i-lucide-stethoscope',
+    value: 'doctor',
+    type: 'icon',
+  },
+  {
+    label: 'I-Care BPJS',
+    icon: '/bpjs.png',
+    value: 'bpjs',
+    type: 'image',
+  },
+  {
+    label: 'File SEP',
+    icon: 'i-lucide-file',
+    value: 'sep',
+    type: 'icon',
+  },
+]
+
+const itemsTwo: ButtonItems[] = [
+  {
+    label: 'Tarif Tindakan',
+    icon: 'i-lucide-banknote-arrow-down',
+    value: 'price-list',
+    type: 'icon',
+  },
+  {
+    label: 'Tarif Tindakan Paket',
+    icon: 'i-lucide-banknote-arrow-down',
+    value: 'price-list-package',
+    type: 'icon',
+  },
+]
+
+function handleClick(value: string) {
+  router.replace({ path: route.path, query: { menu: value } })
+}
+</script>
+
+<template>
+  <div class="my-4">
+  <h2 class="mb-4 text-base font-semibold md:text-lg 2xl:text-xl">History Pasien:</h2>
+  <div class="flex flex-wrap gap-2 mb-2">
+    <Button
+      v-for="item in itemsOne"
+      :key="item.value"
+      :class="[
+        'flex items-center gap-2 rounded-lg border px-3 py-1 text-sm font-medium transition-colors',
+        activeMenu === item.value
+          ? 'border-orange-300 bg-orange-400 text-white'
+          : 'border-orange-300 bg-white text-orange-500 hover:bg-orange-400 hover:text-white'
+      ]"
+      @click="handleClick(item.value)"
+    >
+      <Icon v-if="item.type === 'icon'"
+        :name="item.icon"
+        class="h-4 w-4"
+      />
+      <img v-else-if="item.type === 'image'" :src="item.icon" class="h-[24px] w-[24px] object-contain" />
+      {{ item.label }}
+    </Button>
+  </div>
+  <h2 class="mb-4 text-base font-semibold md:text-lg 2xl:text-xl">Billing Pasien:</h2>
+  <div class="flex flex-wrap gap-2 mb-2">
+    <Button
+      v-for="item in itemsTwo"
+      :key="item.value"
+      :class="[
+        'flex items-center gap-2 rounded-lg border px-3 py-1 text-sm font-medium transition-colors',
+        activeMenu === item.value
+          ? 'border-orange-300 bg-orange-400 text-white'
+          : 'border-orange-300 bg-white text-orange-500 hover:bg-orange-400 hover:text-white'
+      ]"
+      @click="handleClick(item.value)"
+    >
+      <Icon
+        :name="item.icon"
+        class="h-4 w-4"
+      />
+      {{ item.label }}
+    </Button>
+  </div>
+  </div>
+</template>
diff --git a/app/components/app/encounter/list.cfg.ts b/app/components/app/encounter/list.cfg.ts
index 9ebbc34f..cc0b951c 100644
--- a/app/components/app/encounter/list.cfg.ts
+++ b/app/components/app/encounter/list.cfg.ts
@@ -6,7 +6,7 @@ import { getAge } from '~/lib/date'
 
 type SmallDetailDto = Encounter
 
-const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-pdud.vue'))
+const action = defineAsyncComponent(() => import('./dropdown-action.vue'))
 const statusBadge = defineAsyncComponent(() => import('./status-badge.vue'))
 
 export const config: Config = {
diff --git a/app/components/app/encounter/list.vue b/app/components/app/encounter/list.vue
index 1d58d6a7..801e5b4c 100644
--- a/app/components/app/encounter/list.vue
+++ b/app/components/app/encounter/list.vue
@@ -1,14 +1,15 @@
 <script setup lang="ts">
+import DataTable from '~/components/pub/my-ui/data-table/data-table.vue'
 import { config } from './list.cfg'
 
 const props = defineProps<{
-  data: any[]
+  data: any[],
 }>()
 </script>
 
 <template>
-  <PubMyUiDataTable
+  <DataTable
     v-bind="config"
-    :rows="data"
+    :rows="props.data"
   />
 </template>
diff --git a/app/components/app/encounter/patient-info-collapsible.vue b/app/components/app/encounter/patient-info-collapsible.vue
new file mode 100644
index 00000000..924a8c2e
--- /dev/null
+++ b/app/components/app/encounter/patient-info-collapsible.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+// Types
+import type { Encounter } from '~/models/encounter'
+
+// Components
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '~/components/pub/ui/accordion'
+import EncounterQuickInfoFull from '~/components/app/encounter/quick-info-full.vue'
+
+const props = defineProps<{
+  data: Encounter
+}>()
+</script>
+
+<template>
+  <div class="w-full rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
+    <!-- Data Pasien -->
+    <Accordion type="single" defaultValue="item-patient" collapsible>
+      <AccordionItem value="item-patient" class="border-none">
+        <AccordionTrigger class="focus:outline-none focus:ring-0">
+          <h2 class="mb-4 text-base font-semibold md:text-lg 2xl:text-xl">Data Pasien:</h2>
+        </AccordionTrigger>
+        <AccordionContent>
+          <EncounterQuickInfoFull :data="props.data" :is-grid="true" />
+        </AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  </div>
+</template>
diff --git a/app/components/app/encounter/patient-info.vue b/app/components/app/encounter/patient-info.vue
new file mode 100644
index 00000000..ea41199e
--- /dev/null
+++ b/app/components/app/encounter/patient-info.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+// Types
+import type { Encounter } from '~/models/encounter'
+
+// Components
+import EncounterQuickInfoFull from '~/components/app/encounter/quick-info-full.vue'
+
+const props = defineProps<{
+  data: Encounter
+}>()
+</script>
+
+<template>
+  <div class="w-full rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
+    <h2 class="mb-4 text-base font-semibold md:text-lg 2xl:text-xl">Data Pasien:</h2>
+    <EncounterQuickInfoFull :data="props.data" :is-grid="false" />
+  </div>
+</template>
diff --git a/app/components/app/encounter/quick-info-full.vue b/app/components/app/encounter/quick-info-full.vue
new file mode 100644
index 00000000..4cbc5bfb
--- /dev/null
+++ b/app/components/app/encounter/quick-info-full.vue
@@ -0,0 +1,247 @@
+<script setup lang="ts">
+// Helpers
+import { format, parseISO } from 'date-fns'
+import { id as localeID } from 'date-fns/locale'
+import { getAge } from '~/lib/date'
+import { cn } from "~/lib/utils"
+
+// Types
+import type { Encounter } from '~/models/encounter'
+import { paymentTypes } from '~/lib/constants.vclaim'
+
+const props = defineProps<{
+  data: Encounter
+  isGrid?: boolean
+}>()
+
+const isGrid = props.isGrid !== undefined ? props.isGrid : true
+
+// Address
+const address = computed(() => {
+  if (props.data.patient.person.addresses && props.data.patient.person.addresses.length > 0) {
+    return props.data.patient.person.addresses.map((a) => a.address).join(', ')
+  }
+  return '-'
+})
+
+// DPJP
+const dpjp = computed(() => {
+  if (props.data.responsible_doctor) {
+    const dp = props.data.responsible_doctor.employee.person
+    return `${dp.frontTitle || ''} ${dp.name || ''} ${dp.endTitle || ''}`.trim()
+  } else if (props.data.appointment_doctor) {
+    const dp = props.data.appointment_doctor.employee.person
+    return `${dp.frontTitle || ''} ${dp.name || ''} ${dp.endTitle || ''}`.trim()
+  }
+  return '-'
+})
+
+// Tgl. Lahir dengan Umur
+const birthDateFormatted = computed(() => {
+  if (!props.data.patient.person.birthDate) {
+    return '-'
+  }
+  try {
+    const ageData = getAge(props.data.patient.person.birthDate)
+    const ageYears = ageData.extFormat.split(' ')[0] || '0'
+    return `${ageData.idFormat} (${ageYears} Tahun)`
+  } catch {
+    return '-'
+  }
+})
+
+// Tgl. Masuk RS dengan waktu
+const registeredDateFormatted = computed(() => {
+  const dateStr = props.data.registeredAt || props.data.visitDate
+  if (!dateStr) {
+    return '-'
+  }
+  try {
+    const date = parseISO(dateStr)
+    return format(date, 'dd MMMM yyyy HH:mm', { locale: localeID })
+  } catch {
+    return '-'
+  }
+})
+
+// Jns. Kelamin
+const genderLabel = computed(() => {
+  const code = props.data.patient.person.gender_code
+  if (!code) return '-'
+  // Map common gender codes
+  if (code === 'M' || code === 'male' || code.toLowerCase() === 'l') {
+    return 'Laki-laki'
+  } else if (code === 'F' || code === 'female' || code.toLowerCase() === 'p') {
+    return 'Perempuan'
+  }
+  return code
+})
+
+// Jns. Pembayaran
+const paymentTypeLabel = computed(() => {
+  const code = props.data.paymentMethod_code
+  if (!code) return '-'
+
+  // Map payment method codes
+  if (code === 'insurance') {
+    return 'JKN'
+  } else if (code === 'jkn') {
+    return 'JKN'
+  } else if (code === 'jkmm') {
+    return 'JKMM'
+  } else if (code === 'spm') {
+    return 'SPM'
+  } else if (code === 'pks') {
+    return 'PKS'
+  }
+
+  // Try to get from paymentTypes constant
+  if (paymentTypes[code]) {
+    return paymentTypes[code].split(' ')[0] // Get first part (e.g., "JKN" from "JKN (Jaminan...)")
+  }
+
+  return code
+})
+
+// No. Billing - try to get from trx_number or other billing fields
+const billingNumber = computed(() => {
+  // Check if encounter has payment data with trx_number
+  if ((props.data as any).trx_number) {
+    return (props.data as any).trx_number
+  }
+  // Check if encounter has payment relation
+  if ((props.data as any).payment?.trx_number) {
+    return (props.data as any).payment.trx_number
+  }
+  return '-'
+})
+
+// Nama Ruang - from unit name or room relation
+const roomName = computed(() => {
+  if (props.data.unit?.name) {
+    return props.data.unit.name
+  }
+  // Check if there's a room relation
+  if ((props.data as any).room?.name) {
+    return (props.data as any).room.name
+  }
+  return '-'
+})
+
+// No Bed - from bed relation or field
+const bedNumber = computed(() => {
+  // Check if encounter has bed data
+  if ((props.data as any).bed?.number) {
+    return (props.data as any).bed.number
+  }
+  if ((props.data as any).bed_number) {
+    return (props.data as any).bed_number
+  }
+  return '-'
+})
+</script>
+
+<template>
+  <h2 class="mb-4 font-semibold md:text-base 2xl:text-lg">Data Pasien:</h2>
+  <!-- 4 Column Grid Layout -->
+  <div :class="cn('grid grid-cols-4 gap-4', isGrid && 'sm:grid-cols-4')">
+    <!-- No. RM -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">No. RM</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ data.patient.number || '-' }}
+      </p>
+    </div>
+
+    <!-- Tgl. Lahir -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">Tgl. Lahir</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ birthDateFormatted }}
+      </p>
+    </div>
+
+    <!-- Jns. Pembayaran -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">Cara Bayar</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ paymentTypeLabel }}
+      </p>
+    </div>
+
+    <!-- No Bed -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">No Bed</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ bedNumber }}
+      </p>
+    </div>
+
+    <!-- Nama Pasien -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">No. Bed</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ data.patient.person.name || '-' }}
+      </p>
+    </div>
+
+    <!-- Tgl. Masuk RS -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">Tgl. Masuk RS</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ registeredDateFormatted }}
+      </p>
+    </div>
+
+    <!-- No. Billing -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">No. Billing</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ billingNumber }}
+      </p>
+    </div>
+
+    <!-- DPJP -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">DPJP</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ dpjp }}
+      </p>
+    </div>
+
+    <!-- Alamat -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">Alamat</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ address }}
+      </p>
+    </div>
+
+    <!-- Jns. Kelamin -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">Jns. Kelamin</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ genderLabel }}
+      </p>
+    </div>
+
+    <!-- Nama Ruang -->
+    <div class="flex gap-1">
+      <label class="w-20 2xl:w-24 flex-none text-sm font-semibold text-gray-700 dark:text-gray-300">Nama Ruang</label>
+      <label class="w-2 flex-none">:</label>
+      <p class="flex-1 text-sm text-gray-900 dark:text-gray-100">
+        {{ roomName }}
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/encounter/quick-info.vue b/app/components/app/encounter/quick-info.vue
index 4b223917..2c486a73 100644
--- a/app/components/app/encounter/quick-info.vue
+++ b/app/components/app/encounter/quick-info.vue
@@ -1,95 +1,124 @@
 <script setup lang="ts">
 import * as DE from '~/components/pub/my-ui/doc-entry'
+import { genderCodes } from '~/const/key-val/person';
 import type { Encounter } from '~/models/encounter'
 
 const props = defineProps<{
   data: Encounter
 }>()
 
-let address = ''
-if (props.data.patient.person.addresses) {
-  address = props.data.patient.person.addresses.map((a) => a.address).join(', ')
-}
+const addressText = computed(() => {
+  if (props.data.patient.person.addresses && props.data.patient.person.addresses.length > 0) {
+    return props.data.patient.person.addresses.map((a) => a.address).join(', ')
+  }
+  return '-'
+})
 
-let dpjp = ''
+const paymentMethodText = computed(() => {
+  const code = props.data.paymentMethod_code
+  if (!code) return '-'
+
+  // Map payment method codes
+  if (code === 'insurance') {
+    return 'JKN'
+  } else if (code === 'jkn') {
+    return 'JKN'
+  } else if (code === 'jkmm') {
+    return 'JKMM'
+  } else if (code === 'spm') {
+    return 'SPM'
+  } else if (code === 'pks') {
+    return 'PKS'
+  }
+})
+
+let dpjpText = ref('')
 if (props.data.responsible_doctor) {
   const dp = props.data.responsible_doctor.employee.person
-  dpjp = `${dp.frontTitle} ${dp.name} ${dp.endTitle}`
+  dpjpText.value = `${dp.frontTitle} ${dp.name} ${dp.endTitle}`
 } else if (props.data.appointment_doctor) {
-  dpjp = props.data.appointment_doctor.employee.person.name
+  dpjpText.value = props.data.appointment_doctor.employee.person.name
 }
 </script>
 
 <template>
-  <div class="w-full rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
+  <div class="w-full py-3 2xl:py-4 px-5">
     <!-- Data Pasien -->
     <h2 class="mb-2 font-semibold md:text-base 2xl:text-lg">
       {{ data.patient.person.name }} - {{ data.patient.number }}
     </h2>
-
     <div class="grid grid-cols-3">
       <div>
-        <DE.Block
-          mode="preview"
-          labelSize="large"
-        >
+        <DE.Block mode="preview" class="!mb-0">
           <DE.Cell>
-            <DE.Label class="font-semibold">No. RM</DE.Label>
+            <DE.Label class="font-semibold">Tgl. Lahir</DE.Label>
+            <DE.Colon />
             <DE.Field>
               {{ data.patient.person.birthDate?.substring(0, 10) }}
             </DE.Field>
           </DE.Cell>
           <DE.Cell>
-            <DE.Label class="font-semibold">Jenis Kelamin</DE.Label>
+            <DE.Label class="font-semibold"><span class="hidden xl:inline">Jns.</span> Kelamin</DE.Label>
+            <DE.Colon />
             <DE.Field>
-              {{ data.patient.person.gender_code }}
+              {{ genderCodes[data.patient.person.gender_code as keyof typeof genderCodes] }}
             </DE.Field>
           </DE.Cell>
           <DE.Cell>
             <DE.Label class="font-semibold">Alamat</DE.Label>
+            <DE.Colon />
             <DE.Field>
-              <div v-html="address"></div>
+              {{ addressText }}
             </DE.Field>
           </DE.Cell>
         </DE.Block>
       </div>
       <div>
-        <DE.Block
-          mode="preview"
-          labelSize="large"
-        >
+        <DE.Block mode="preview" class="!mb-0">
           <DE.Cell>
-            <DE.Label class="font-semibold">Tgl. Kunjungan</DE.Label>
+            <DE.Label position="dynamic" class="font-semibold">Tgl. Masuk</DE.Label>
+            <DE.Colon />
             <DE.Field>
               {{ data.visitDate.substring(0, 10) }}
             </DE.Field>
           </DE.Cell>
           <DE.Cell>
-            <DE.Label class="font-semibold">Klinik</DE.Label>
+            <DE.Label position="dynamic" class="font-semibold">Poliklinik</DE.Label>
+            <DE.Colon />
             <DE.Field>
               {{ data.unit?.name }}
             </DE.Field>
           </DE.Cell>
           <DE.Cell>
-            <DE.Label class="font-semibold">DPJP</DE.Label>
+            <DE.Label position="dynamic" class="font-semibold">Diagnosa</DE.Label>
+            <DE.Colon />
             <DE.Field>
-              {{ dpjp }}
+              {{ data.unit?.name }}
             </DE.Field>
           </DE.Cell>
         </DE.Block>
       </div>
       <div>
-        <DE.Block
-          mode="preview"
-          labelSize="large"
-        >
+        <DE.Block mode="preview" class="!mb-0">
           <DE.Cell>
-            <DE.Label
-              position="dynamic"
-              class="!text-base font-semibold 2xl:!text-lg"
-            >
+            <DE.Label position="dynamic" class="font-semibold">DPJP</DE.Label>
+            <DE.Colon />
+            <DE.Field>
+              {{ dpjpText }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label position="dynamic" class="font-semibold">Pembayaran</DE.Label>
+            <DE.Colon />
+            <DE.Field>
+              {{ paymentMethodText }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label position="dynamic" class="!text-base !font-semibold 2xl:!text-lg">
               Billing
             </DE.Label>
+            <DE.Colon class="pt-1"/>
             <DE.Field class="text-base 2xl:text-lg">
               Rp. 000.000
               <!-- {{ data }} -->
diff --git a/app/components/app/encounter/quick-shortcut.vue b/app/components/app/encounter/quick-shortcut.vue
new file mode 100644
index 00000000..1ca7b23d
--- /dev/null
+++ b/app/components/app/encounter/quick-shortcut.vue
@@ -0,0 +1,132 @@
+<script setup lang="ts">
+// Components
+import { Button } from '~/components/pub/ui/button'
+
+const route = useRoute()
+const router = useRouter()
+
+// Track active menu item from query param
+const activeMenu = computed(() => route.query.menu as string || '')
+
+interface ButtonItems {
+  label: string
+  icon: string
+  value: string
+  type: 'icon' | 'image'
+}
+
+const itemsOne: ButtonItems[] = [
+  {
+    label: 'Data Pendaftaran',
+    icon: 'i-lucide-file',
+    value: 'register',
+    type: 'icon',
+  },
+  {
+    label: 'Status Pembayaran',
+    icon: 'i-lucide-banknote-arrow-down',
+    value: 'status',
+    type: 'icon',
+  },
+  {
+    label: 'Riwayat Pasien',
+    icon: 'i-lucide-history',
+    value: 'history',
+    type: 'icon',
+  },
+  {
+    label: 'Penunjang',
+    icon: 'i-lucide-library-big',
+    value: 'support',
+    type: 'icon',
+  },
+  {
+    label: 'Resep',
+    icon: 'i-lucide-pill',
+    value: 'receipt',
+    type: 'icon',
+  },
+  {
+    label: 'DPJP',
+    icon: 'i-lucide-stethoscope',
+    value: 'doctor',
+    type: 'icon',
+  },
+  {
+    label: 'I-Care BPJS',
+    icon: '/bpjs.png',
+    value: 'bpjs',
+    type: 'image',
+  },
+  {
+    label: 'File SEP',
+    icon: 'i-lucide-file',
+    value: 'sep',
+    type: 'icon',
+  },
+]
+
+const itemsTwo: ButtonItems[] = [
+  {
+    label: 'Tarif Tindakan',
+    icon: 'i-lucide-banknote-arrow-down',
+    value: 'price-list',
+    type: 'icon',
+  },
+  {
+    label: 'Tarif Tindakan Paket',
+    icon: 'i-lucide-banknote-arrow-down',
+    value: 'price-list-package',
+    type: 'icon',
+  },
+]
+
+function handleClick(value: string) {
+  router.replace({ path: route.path, query: { menu: value } })
+}
+</script>
+
+<template>
+  <div class="w-full py-3 2xl:py-4 px-5">
+    <h2 class="mb-2 font-semibold md:text-base 2xl:text-lg">Akses Cepat:</h2>
+    <div class="flex flex-wrap gap-2 mb-2">
+      <Button
+        v-for="item in itemsOne"
+        :key="item.value"
+        :class="[
+          'flex items-center gap-2 rounded-lg border px-3 py-1 text-sm font-medium transition-colors',
+          activeMenu === item.value
+            ? 'border-orange-300 bg-orange-400 text-white'
+            : 'border-orange-300 bg-white text-orange-500 hover:bg-orange-400 hover:text-white'
+        ]"
+        @click="handleClick(item.value)"
+      >
+        <Icon v-if="item.type === 'icon'"
+          :name="item.icon"
+          class="h-4 w-4"
+        />
+        <img v-else-if="item.type === 'image'" :src="item.icon" class="h-[24px] w-[24px] object-contain" />
+        {{ item.label }}
+      </Button>
+    </div>
+    <div class="flex flex-wrap gap-2 mb-2">
+      <Button
+        v-for="item in itemsTwo"
+        :key="item.value"
+        :class="[
+          'flex items-center gap-2 rounded-lg border px-3 py-1 text-sm font-medium transition-colors',
+          activeMenu === item.value
+            ? 'border-orange-300 bg-orange-400 text-white'
+            : 'border-orange-300 bg-white text-orange-500 hover:bg-orange-400 hover:text-white'
+        ]"
+        @click="handleClick(item.value)"
+      >
+        <Icon
+          :name="item.icon"
+          class="h-4 w-4"
+        />
+        {{ item.label }}
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/app/components/app/encounter/status-badge.vue b/app/components/app/encounter/status-badge.vue
index c8d4cd06..2ddd6549 100644
--- a/app/components/app/encounter/status-badge.vue
+++ b/app/components/app/encounter/status-badge.vue
@@ -12,7 +12,7 @@ const statusCodeColors: Record<string, Variants> = {
   review: 'fresh',
   process: 'fresh',
   done: 'positive',
-  canceled: 'destructive',
+  cancel: 'destructive',
   rejected: 'destructive',
   skiped: 'negative',
 }
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/kfr/_common/banner-patient-in-therapy.vue b/app/components/app/kfr/_common/banner-patient-in-therapy.vue
new file mode 100644
index 00000000..27dc4445
--- /dev/null
+++ b/app/components/app/kfr/_common/banner-patient-in-therapy.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import { cn } from '~/lib/utils';
+
+const props = withDefaults(defineProps<{
+  assesmentDate?: string
+  class?: string
+}>(), {
+  assesmentDate: new Date().toISOString(),
+})
+</script>
+
+<template>
+    <div :class="cn('flex items-center gap-3 p-3 rounded-md text-orange-500 border border-orange-400 bg-orange-50',
+        props.class
+    )">
+        <Icon name="i-lucide-triangle-alert" class="h-9 w-9 align-middle transition-colors" />
+        <p class="font-medium">Pasien telah mencapai atau telah melampaui jadwal Asesment pada 
+          <b>{{ new Date(props.assesmentDate).toDateString() }}</b>
+          <br>
+           Harap melakukan Re-Asement sebelum melanjutkan Protocol Therapy</p>
+    </div>
+</template>
diff --git a/app/components/app/kfr/_common/btn-confirmation-detail.vue b/app/components/app/kfr/_common/btn-confirmation-detail.vue
new file mode 100644
index 00000000..e09432d5
--- /dev/null
+++ b/app/components/app/kfr/_common/btn-confirmation-detail.vue
@@ -0,0 +1,28 @@
+<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<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const recDate = inject<Ref<any>>('rec_date')!
+
+function confirm() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  recDate.value = new Date().getTime()
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="confirm">
+        <Icon name="i-lucide-circle-check" class="h-4 w-4 align-middle transition-colors" />
+        Konfirmasi
+    </Button>
+</template>
diff --git a/app/components/app/kfr/_common/btn-history.vue b/app/components/app/kfr/_common/btn-history.vue
new file mode 100644
index 00000000..6804c451
--- /dev/null
+++ b/app/components/app/kfr/_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>
diff --git a/app/components/app/kfr/_common/card-result.vue b/app/components/app/kfr/_common/card-result.vue
new file mode 100644
index 00000000..d77302ef
--- /dev/null
+++ b/app/components/app/kfr/_common/card-result.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+</script>
+
+<template>
+  <table>
+    <tbody>
+      <tr>
+        <td><b>S : </b></td>
+        <td>{{ props.rec.result.s }}</td>
+      </tr>
+    </tbody>
+  </table>
+  <Separator class="my-3" />
+  <table>
+    <tbody>
+      <tr>
+        <td><b>O : </b></td>
+        <td>{{ props.rec.result.o }}</td>
+      </tr>
+    </tbody>
+  </table>
+  <Separator class="my-3" />
+  <table>
+    <tbody>
+      <tr>
+        <td><b>A : </b></td>
+        <td>{{ props.rec.result.a }}</td>
+      </tr>
+    </tbody>
+  </table>
+  <Separator class="my-3" />
+  <div>
+    <h1><b>P : </b></h1>
+    <ul class="pl-5 list-disc space-y-1">
+      <li>
+        <h1><b>Goal of Treatment</b></h1>
+        <p>{{ props.rec.result.p.goal }}</p>
+      </li>
+      <li>
+        <h1><b>Tindakan/Program Rehabilitasi Medik</b></h1>
+        <p>{{ props.rec.result.p.action }}</p>
+      </li>
+      <li>
+        <h1><b>Edukasi</b></h1>
+        <p>{{ props.rec.result.p.education }}</p>
+      </li>
+      <li>
+        <h1><b>Frekuensi Kunjungan</b></h1>
+        <p>{{ props.rec.result.p.frequency }} x Perminggu</p>
+      </li>
+    </ul>
+  </div>
+  <Separator class="my-3" />
+  <table>
+    <tbody>
+      <tr>
+        <td><b>Rencana Tindak Lanjut : </b></td>
+        <td>{{ props.rec.result.plan }} - {{ props.rec.result.planDesc }}</td>
+      </tr>
+    </tbody>
+  </table>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/_common/dropdown-action.vue b/app/components/app/kfr/_common/dropdown-action.vue
new file mode 100644
index 00000000..f99c3c43
--- /dev/null
+++ b/app/components/app/kfr/_common/dropdown-action.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const { getActiveRole } = useUserStore()
+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 = computed(() => {
+  const role = getActiveRole()
+  const isAdmin = role == "system"
+  const isDoctorRole = role == "emp|doc"
+  const isPhysioRole = role == "emp|doc"
+  const isUnverified = true // recItem.id === 0
+  const isUnvalidated = true // recItem.id
+
+  const items: LinkItem[] = [
+    { label: 'Print', onClick: print, icon: 'i-lucide-printer', }
+  ]
+  if (isDoctorRole || isAdmin) {
+    items.push({ label: 'Edit', onClick: edit, icon: 'i-lucide-pencil', })
+
+    if (isUnverified) {
+      items.push({ label: 'Verify', onClick: verify, icon: 'i-lucide-check', })
+    }
+    if (!isUnverified && isUnvalidated) { // verified & unvalidated
+      items.push({ label: 'Validate', onClick: validate, icon: 'i-lucide-check-check', })
+    }
+
+    items.push({ label: 'Delete', onClick: del, icon: 'i-lucide-trash', })
+  }
+  
+  return items
+})
+
+function edit() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showEdit
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+
+function verify() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showVerify
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+function validate() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showValidate
+  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/app/kfr/_common/radio-followup.vue b/app/components/app/kfr/_common/radio-followup.vue
new file mode 100644
index 00000000..94ede9cb
--- /dev/null
+++ b/app/components/app/kfr/_common/radio-followup.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { value: 'EVALUASI', label: 'Evaluasi' },
+  { value: 'RUJUK', label: 'Rujuk' },
+  { value: 'SELESAI', label: 'Selesai' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/kfr/_common/verify-badge.vue b/app/components/app/kfr/_common/verify-badge.vue
new file mode 100644
index 00000000..c82c0c7c
--- /dev/null
+++ b/app/components/app/kfr/_common/verify-badge.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { Badge } from '~/components/pub/ui/badge'
+
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+
+const verifyStatusCodes: Record<string, string> = {
+  verified: 'Terverifikasi',
+  unverified: 'Belum Verifikasi',
+}
+const validateStatusCodes: Record<string, string> = {
+  validated: 'Tervalidasi',
+  unvalidated: 'Belum Validasi',
+}
+
+const verifyStatusText = computed(() => {
+  const code: keyof typeof verifyStatusCodes = props.rec.status.verified === 1 ? `verified` : `unverified`
+  return verifyStatusCodes[code]
+})
+const validateStatusText = computed(() => {
+  const code: keyof typeof validateStatusCodes = props.rec.status.validated === 1 ? `validated` : `unvalidated`
+  return validateStatusCodes[code]
+})
+
+const verifyBadgeVariant = computed(() => {
+  return props.rec.status.verified === 1 ? 'default' : 'outline'
+})
+const validateBadgeVariant = computed(() => {
+  return props.rec.status.validated === 1 ? 'default' : 'outline'
+})
+</script>
+
+<template>
+  <div class="flex flex-col gap-2 items-center justify-center">
+    <Badge :variant="verifyBadgeVariant" class="w-fit rounded-2xl text-[0.6rem]" >
+      {{ verifyStatusText }}
+    </Badge>
+    <Badge :variant="validateBadgeVariant" class="w-fit rounded-2xl text-[0.6rem]" >
+      {{ validateStatusText }}
+    </Badge>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/entry.vue b/app/components/app/kfr/entry.vue
new file mode 100644
index 00000000..e7d0c64f
--- /dev/null
+++ b/app/components/app/kfr/entry.vue
@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import RadioFollowup from './_common/radio-followup.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+// const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isFunctionalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isProcedurePickerDialogOpen = ref<boolean>(false)
+
+// function toggleMedicalDiagnosisPickerDialog() {
+//   isMedicalDiagnosisPickerDialogOpen.value = !isMedicalDiagnosisPickerDialogOpen.value
+// }
+// function toggleFunctionalDiagnosisPickerDialog() {
+//   isFunctionalDiagnosisPickerDialogOpen.value = !isFunctionalDiagnosisPickerDialogOpen.value
+// }
+
+// provide(`isDiagnosisPickerDialogOpen`, isDiagnosisPickerDialogOpen)
+// provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)        
+
+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">
+
+    <!-- FORM 1 -->
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">
+        <TextAreaInput
+          field-name="subjective"
+          label="Subjective"
+          placeholder="Subjective"
+          class="w-1/2"
+          :errors="errors" />
+      </DE.Cell>
+      <DE.Cell :col-span="2" >
+        <TextAreaInput
+          field-name="objective"
+          label="Objective"
+          placeholder="Masukkan Objective"
+          class="w-1/2"
+          :errors="errors" />
+      </DE.Cell>
+      <DE.Cell :col-span="2">
+        <TextAreaInput
+          field-name="assesment"
+          label="Assesment"
+          placeholder="Masukkan Assesment"
+          class="w-1/2"
+          :errors="errors" />
+      </DE.Cell>
+
+      <DE.Cell class="mt-2 px-4 bg-gray-50 border rounded-lg" :col-span="2">
+        <DE.Block :col-count="2" :cell-flex="false">
+          <TextAreaInput
+            field-name="planningGoal"
+            label="Goal of Treatment"
+            placeholder="Masukkan Goal of Treatment"
+            :errors="errors" />
+          <TextAreaInput
+            field-name="planningAction"
+            label="Tindakan/Program Rehabilitasi Medik"
+            placeholder="Masukkan Tindakan/Program Rehabilitasi Medik"
+            :errors="errors" />
+          <TextAreaInput
+            field-name="planningEducation"
+            label="Edukasi"
+            placeholder="Masukkan Edukasi"
+            :errors="errors" />
+          <InputBase
+            field-name="planningFrequency"
+            label="Frekuensi Kunjungan"
+            right-label="x Minggu"
+            placeholder="Masukkan Frekuensi Kunjungan"
+            :errors="errors"
+            numeric-only
+            is-disabled 
+          />
+        </DE.Block>
+      </DE.Cell>
+
+      <DE.Cell :col-span="2">      
+        <RadioFollowup
+          field-name="followUpPlan"
+          label="Rencana Tindak Lanjut"
+          :errors="errors"
+          is-required
+        />
+        <TextAreaInput
+          label=""
+          field-name="followUpPlanDesc"
+          placeholder="Masukkan Keterangan rencana tindak lanjut"
+          class="w-1/2 mt-3"
+          :errors="errors" />
+      </DE.Cell>
+
+      
+
+    </DE.Block>
+  </Form>
+</template>
diff --git a/app/components/app/kfr/history-list.cfg.ts b/app/components/app/kfr/history-list.cfg.ts
new file mode 100644
index 00000000..bc86241e
--- /dev/null
+++ b/app/components/app/kfr/history-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'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dp.vue'))
+const resultData = defineAsyncComponent(() => import('./_common/card-result.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+
+export const config: Config = {
+  cols: [{}, { width: 800 }, {}, { width: 120 }, { width: 3 },],
+
+  headers: [
+    [
+      { label: 'Tanggal' },
+      { label: 'Hasil Asesmen Pasien Dan Pemberian Pelayanan' },
+      { label: 'Jenis Form' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'result', 'type', 'status', 'action'],
+
+  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: {
+    result(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: resultData,
+      }
+    },
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/kfr/history-list.vue b/app/components/app/kfr/history-list.vue
new file mode 100644
index 00000000..d0a0619a
--- /dev/null
+++ b/app/components/app/kfr/history-list.vue
@@ -0,0 +1,61 @@
+<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
+  dateValue: DateRange
+}
+const props = defineProps<Props>()
+const df = new DateFormatter('en-US', {  dateStyle: 'medium',})
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+  'update:dateValue': [value: DateRange]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <Popover>
+            <PopoverTrigger as-child>
+                <Button variant="outline" :class="cn('mb-1 w-[280px] justify-start text-left font-normal',
+                !props.dateValue && 'text-muted-foreground')">
+                <CalendarIcon class="mr-2 h-4 w-4" />
+                <template v-if="props.dateValue.start">
+                    <template v-if="props.dateValue.end">
+                    {{ df.format(props.dateValue.start.toDate(getLocalTimeZone())) }} -
+                    {{ df.format(props.dateValue.end.toDate(getLocalTimeZone())) }}
+                    </template>
+
+                    <template v-else>
+                    {{ df.format(props.dateValue.start.toDate(getLocalTimeZone())) }}
+                    </template>
+                </template>
+                <template v-else> Pick a date </template>
+                </Button>
+            </PopoverTrigger>
+            <PopoverContent class="w-auto p-0">
+                <RangeCalendar v-model="props.dateValue" initial-focus :number-of-months="2"
+                    @update:model-value="(date) => emit('update:dateValue', date)" />
+            </PopoverContent>
+        </Popover>
+
+    <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/kfr/list.cfg.ts b/app/components/app/kfr/list.cfg.ts
new file mode 100644
index 00000000..1ba6a461
--- /dev/null
+++ b/app/components/app/kfr/list.cfg.ts
@@ -0,0 +1,59 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./_common/dropdown-action.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+const resultData = defineAsyncComponent(() => import('./_common/card-result.vue'))
+
+export const config: Config = {
+  cols: [{}, { width: 800 }, {}, { width: 120 }, { width: 3 },],
+
+  headers: [
+    [
+      { label: 'Tanggal' },
+      { label: 'Hasil Asesmen Pasien Dan Pemberian Pelayanan' },
+      { label: 'Jenis Form' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'result', 'type', 'status', 'action'],
+
+  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: {
+    result(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: resultData,
+      }
+    },
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/kfr/list.vue b/app/components/app/kfr/list.vue
new file mode 100644
index 00000000..f5d7a6bb
--- /dev/null
+++ b/app/components/app/kfr/list.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { config } from './list.cfg'
+
+interface Props {
+  data: any[]
+}
+defineProps<Props>()
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable v-bind="config" :rows="data" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/verify-dialog.vue b/app/components/app/kfr/verify-dialog.vue
new file mode 100644
index 00000000..c67bd977
--- /dev/null
+++ b/app/components/app/kfr/verify-dialog.vue
@@ -0,0 +1,108 @@
+<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 type { InstallationFormData } from '~/schemas/installation.schema'
+import TextCaptcha from '~/components/pub/my-ui/form/text-captcha.vue'
+
+
+const props = defineProps<{
+  schema: any
+  errors?: FormErrors
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+const captchaRef = ref<InstanceType<typeof TextCaptcha> | null>(null)
+const captchaValid = ref(false)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: InstallationFormData = {
+    name: values.name || '',
+    code: values.code || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+function onCaptchaUpdate(valid: boolean) {
+  captchaValid.value = valid
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+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"
+    validation-mode="onSubmit" 
+  >
+      <div class="border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+
+          <InputBase
+            field-name="name"
+            label="Nama"
+            placeholder="Masukkan Nama"
+            :errors="errors"/>
+          <InputBase
+            field-name="email"
+            label="Email"
+            placeholder="Masukkan Email"
+            :errors="errors"/>
+
+          <div class="mt-2">
+            <Label class="" for="password">Password</Label>
+            <Field class="" id="password" :errors="errors">
+              <FormField v-slot="{ componentField }" name="password">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="password"
+                      v-bind="componentField"
+                      type="password"
+                      class="w-full"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </div>
+
+          <TextCaptcha
+            ref="captchaRef"
+            :length="5"
+            :useSpacing="true"
+            :noiseChars="true"
+            @update:valid="onCaptchaUpdate"
+          />
+
+        </div>
+      </div>
+  </Form>
+</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/prescription/flat-list.vue b/app/components/app/prescription/flat-list.vue
index fe0bab9c..2c768201 100644
--- a/app/components/app/prescription/flat-list.vue
+++ b/app/components/app/prescription/flat-list.vue
@@ -31,12 +31,6 @@ function navClick(type: 'cancel' | 'edit' | 'submit', data: Prescription): void
 <template>
   <div v-if="data.length == 0" class="p-10 text-center">
     <div class="mb-4 xl:mb-5">Belum Ada Data</div>
-    <div>
-      <Button>
-        <Icon name="i-lucide-plus" class="me-2 align-middle" />
-        Tambah Order
-      </Button>
-    </div>
   </div>
   <Table.Table>
     <Table.TableHeader>
diff --git a/app/components/app/prescription/grouped-list.vue b/app/components/app/prescription/grouped-list.vue
index 07d6fcaa..87e202bb 100644
--- a/app/components/app/prescription/grouped-list.vue
+++ b/app/components/app/prescription/grouped-list.vue
@@ -32,12 +32,6 @@ function navClick(type: 'cancel' | 'edit' | 'submit', data: Prescription): void
 <template>
   <div v-if="data.length == 0" class="p-10 text-center">
     <div class="mb-4 xl:mb-5">Belum Ada Data</div>
-    <div>
-      <Button>
-        <Icon name="i-lucide-plus" class="me-2 align-middle" />
-        Tambah Order
-      </Button>
-    </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')">
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/procedure-src/list.vue b/app/components/app/procedure-src/list.vue
index 1be60a60..d976b660 100644
--- a/app/components/app/procedure-src/list.vue
+++ b/app/components/app/procedure-src/list.vue
@@ -7,13 +7,16 @@ import type { PaginationMeta } from '~/components/pub/my-ui/pagination/paginatio
 
 // Configs
 import { config } from './list-cfg'
+import type { Config } from '~/components/pub/my-ui/data-table'
 
 interface Props {
   data: any[]
   paginationMeta: PaginationMeta
+  tableConfig?: Config
 }
-
-defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  tableConfig: () => config,
+})
 
 const emit = defineEmits<{
   pageChange: [page: number]
@@ -27,7 +30,7 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubMyUiDataTable
-      v-bind="config"
+      v-bind="props.tableConfig"
       :rows="data"
       :skeleton-size="paginationMeta?.pageSize"
     />
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 35956ad7..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,28 +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 || '-'
-    if (objects?.sepType === 'internal') {
-      admissionType.value = '4'
-    }
-    if (objects?.sepType === 'external') {
-      admissionType.value = '1'
-    }
+    onInitialized(objects)
     isDateReload.value = true
     setTimeout(() => {
+      if (objects?.sepDate) {
+        sepDate.value = objects?.sepDate
+        referralLetterDate.value = objects?.sepDate
+      }
       if (objects?.letterDate) {
         referralLetterDate.value = objects?.letterDate
       }
@@ -176,6 +289,9 @@ onMounted(() => {
   if (!isService.value) {
     serviceType.value = '2'
   }
+  if (!admissionType.value) {
+    admissionType.value = '1'
+  }
 })
 </script>
 
@@ -199,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>
@@ -277,7 +394,7 @@ onMounted(() => {
               id="cardNumber"
               v-model="cardNumber"
               v-bind="cardNumberAttrs"
-              :disabled="false"
+              :disabled="isLoading || isReadonly"
             />
           </Field>
         </Cell>
@@ -292,7 +409,7 @@ onMounted(() => {
               id="nationalId"
               v-model="nationalId"
               v-bind="nationalIdAttrs"
-              :disabled="false"
+              :disabled="isLoading || isReadonly"
             />
           </Field>
         </Cell>
@@ -371,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"
@@ -399,7 +517,7 @@ onMounted(() => {
               id="referralLetterDate"
               v-model="referralLetterDate"
               v-bind="referralLetterDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal surat"
             />
           </Field>
@@ -410,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
@@ -474,7 +593,7 @@ onMounted(() => {
           </Field>
         </Cell>
 
-         <Cell>
+        <Cell v-if="!isReadonly && isShowSpecialist">
           <Label height="compact">
             Spesialis / Subspesialis
             <span class="text-red-500">*</span>
@@ -497,6 +616,7 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.attendingDoctor">
             <Combobox
+              v-if="!isReadonly"
               id="attendingDoctor"
               v-model="attendingDoctor"
               v-bind="attendingDoctorAttrs"
@@ -507,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>
 
@@ -517,6 +643,7 @@ onMounted(() => {
           </Label>
           <Field :errMessage="errors.initialDiagnosis">
             <Combobox
+              v-if="!isReadonly"
               id="initialDiagnosis"
               v-model="initialDiagnosis"
               v-bind="initialDiagnosisAttrs"
@@ -527,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>
@@ -651,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
@@ -661,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>
@@ -680,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
@@ -749,7 +884,7 @@ onMounted(() => {
               id="accidentDate"
               v-model="accidentDate"
               v-bind="accidentDateAttrs"
-              :disabled="true"
+              :disabled="isLoading || isReadonly"
               placeholder="Pilih tanggal kejadian"
             />
           </Field>
@@ -959,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"
@@ -971,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"
@@ -982,6 +1119,7 @@ onMounted(() => {
           Preview
         </Button>
         <Button
+          v-if="props.mode === 'add'"
           type="button"
           class="h-[40px] min-w-[120px] text-white"
           :disabled="isLoading"
@@ -993,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/list.vue b/app/components/app/sep/list.vue
index 2afaa2cc..78a0b740 100644
--- a/app/components/app/sep/list.vue
+++ b/app/components/app/sep/list.vue
@@ -11,7 +11,8 @@ const props = defineProps<{
 
 <template>
   <PubMyUiDataTable
-    v-bind="config"
     :rows="props.data"
+    v-bind="config"
+    v-on="$attrs"
   />
 </template>
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/soapi/list-cfg.ts b/app/components/app/soapi/list-cfg.ts
index 648297c4..3db1b24a 100644
--- a/app/components/app/soapi/list-cfg.ts
+++ b/app/components/app/soapi/list-cfg.ts
@@ -3,7 +3,7 @@ import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = 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-ud.vue'))
 
 export const config: Config = {
   cols: [{}, {}, {}, { width: 100 }, { width: 120 }, {}, {}, {}, { width: 100 }, { width: 100 }, {}, { width: 50 }],
@@ -20,7 +20,7 @@ export const config: Config = {
     ],
   ],
 
-  keys: ['time', 'employee_id', 'main_complaint', 'encounter_id', 'diagnose', 'status', 'action'],
+  keys: ['time', 'employee_id', 'main_complaint', 'encounter', 'diagnose', 'status', 'action'],
 
   delKeyNames: [
     { key: 'code', label: 'Kode' },
@@ -44,6 +44,10 @@ export const config: Config = {
         return '-'
       }
     },
+    encounter(rec: any) {
+      const data = rec?.encounter ?? {}
+      return data?.class_code || '-'
+    },
     diagnose(rec: any) {
       const { value } = rec ?? {}
 
diff --git a/app/components/app/surgery-report/_common/btn-history.vue b/app/components/app/surgery-report/_common/btn-history.vue
new file mode 100644
index 00000000..972eab8e
--- /dev/null
+++ b/app/components/app/surgery-report/_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/surgery-report/_common/filter.vue b/app/components/app/surgery-report/_common/filter.vue
new file mode 100644
index 00000000..d5e99b30
--- /dev/null
+++ b/app/components/app/surgery-report/_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/surgery-report/_common/history-dialog.vue b/app/components/app/surgery-report/_common/history-dialog.vue
new file mode 100644
index 00000000..d92da4a5
--- /dev/null
+++ b/app/components/app/surgery-report/_common/history-dialog.vue
@@ -0,0 +1,52 @@
+<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 SelectOriginPolyclinic from '~/components/app/bpjs/control-letter/_common/select-origin-polyclinic.vue'
+import SelectDestinationPolyclinic from '~/components/app/bpjs/control-letter/_common/select-destination-polyclinic.vue'
+import { cn } from '~/lib/utils'
+
+const props = defineProps()
+
+const items = reactive([
+  { id: 1, updatedBy: 'Kakek Sugiono', createdAt: new Date(Date.now() - 86400000 * 2) },
+  { id: 2, updatedBy: 'Kakek Sugiono', createdAt: new Date(Date.now() - 86400000) },
+  { id: 3, updatedBy: 'Kakek Sugiono', createdAt: new Date() },
+])
+const itemsCount = computed(() => items.length || 0)
+</script>
+
+<template>
+  <ul :class="cn('pb-5 flex flex-col min-h-[30rem]', '')">
+    <li v-for="(item, index) in items" :key="item.id" class="flex gap-3 items-start">
+
+      <div class="flex flex-col items-center">
+        <div class="h-5 w-5 rounded-full border-2 border-gray-300 flex items-center justify-center">
+          <div :class="cn('dark:bg-white border-gray-300 rounded-full p-1.5',
+            index === 0 ? 'bg-green-500' : 'bg-transparent'
+          )">
+          </div>
+        </div>
+
+        <hr v-if="index !== itemsCount - 1" class="h-14 w-0.5 bg-gray-300 dark:bg-gray-300" aria-hidden="true">
+      </div>
+
+      <div class="flex justify-between items-center min-w-96">
+        <div class="max-w-80">
+          <time :class="cn('mt-0 text-base font-medium text-gray-800 dark:text-gray-100', '')">
+            {{ item?.createdAt.toLocaleDateString('id-ID') }}
+          </time>
+          <h1 :class="cn('text-gray-500 dark:text-gray-400', '')">Ditambahkan Oleh : {{ item.updatedBy }}</h1>
+          <NuxtLink class="mt-1 text-orange-500" :to="`surgery-report/${item.id}`">
+            Lihat Detail
+          </NuxtLink>
+        </div>
+      </div>
+    </li>
+  </ul>
+</template>
\ No newline at end of file
diff --git a/app/components/app/surgery-report/_common/radio-blood-type.vue b/app/components/app/surgery-report/_common/radio-blood-type.vue
new file mode 100644
index 00000000..91def086
--- /dev/null
+++ b/app/components/app/surgery-report/_common/radio-blood-type.vue
@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'PRC', value: 'prc' },
+  { label: 'FFP', value: 'ffp' },
+  { label: 'WB', value: 'wb' },
+  { label: 'TC', value: 'tc' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-billing-code.vue b/app/components/app/surgery-report/_common/select-billing-code.vue
new file mode 100644
index 00000000..321c2d33
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-billing-code.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, BillingCodeTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => BillingCodeTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-birth-desc.vue b/app/components/app/surgery-report/_common/select-birth-desc.vue
new file mode 100644
index 00000000..2b19f3bc
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-birth-desc.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, BirthDescriptionTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => BirthDescriptionTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-birth-place-desc.vue b/app/components/app/surgery-report/_common/select-birth-place-desc.vue
new file mode 100644
index 00000000..c6f2ed06
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-birth-place-desc.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, BirthPlaceDescriptionTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => BirthPlaceDescriptionTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-date.vue b/app/components/app/surgery-report/_common/select-date.vue
new file mode 100644
index 00000000..0468c752
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-date.vue
@@ -0,0 +1,117 @@
+<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
+  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"
+    >
+      {{ 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"
+              @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/surgery-report/_common/select-dissection-type.vue b/app/components/app/surgery-report/_common/select-dissection-type.vue
new file mode 100644
index 00000000..45708dac
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-dissection-type.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, DissectionTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => DissectionTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-dpjp-anastesi.vue b/app/components/app/surgery-report/_common/select-dpjp-anastesi.vue
new file mode 100644
index 00000000..b649c28f
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-dpjp-anastesi.vue
@@ -0,0 +1,87 @@
+<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 { occupationCodes } 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
+
+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/surgery-report/_common/select-dpjp-bedah.vue b/app/components/app/surgery-report/_common/select-dpjp-bedah.vue
new file mode 100644
index 00000000..b649c28f
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-dpjp-bedah.vue
@@ -0,0 +1,87 @@
+<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 { occupationCodes } 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
+
+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/surgery-report/_common/select-specimen-type.vue b/app/components/app/surgery-report/_common/select-specimen-type.vue
new file mode 100644
index 00000000..e1017e76
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-specimen-type.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, SpecimenTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => SpecimenTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-surgery-order.vue b/app/components/app/surgery-report/_common/select-surgery-order.vue
new file mode 100644
index 00000000..ff48d195
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-surgery-order.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, SurgeryOrderTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => SurgeryOrderTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-surgery-system-type.vue b/app/components/app/surgery-report/_common/select-surgery-system-type.vue
new file mode 100644
index 00000000..745904eb
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-surgery-system-type.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, SurgerySystemTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => SurgerySystemTypeOptList)
+</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="itemList"
+              :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/surgery-report/_common/select-surgery-type.vue b/app/components/app/surgery-report/_common/select-surgery-type.vue
new file mode 100644
index 00000000..e396fe7d
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-surgery-type.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes, SurgeryTypeOptList } 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
+
+const itemList = computed<Array<Item>>(() => SurgeryTypeOptList)
+</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="itemList"
+              :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/surgery-report/detail.vue b/app/components/app/surgery-report/detail.vue
new file mode 100644
index 00000000..e0bb7727
--- /dev/null
+++ b/app/components/app/surgery-report/detail.vue
@@ -0,0 +1,144 @@
+<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 { ControlLetter } from '~/models/control-letter'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+// #region Props & Emits
+const props = defineProps<{
+  instance: ControlLetter | 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('space-y-10',)">
+    <div :class="cn('space-y-2',)">
+      <h1>Dibuat oleh {{ `Dr. Agus` }} pada {{ `11 Agustus 2025, 20.00` }}</h1>
+      <DetailRow label="Tanggal Laporan">{{ props.instance?.date ? new
+        Date(props.instance?.date).toLocaleDateString('id-ID') : '-' }}</DetailRow>
+    </div>
+    <div :class="cn('space-y-2',)">
+      <h1 class="font-semibold text-lg">Tim Pelaksanaan Operasi</h1>
+      <DetailRow label="DPJP Bedah">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Operator">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Asisten Operator">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Instrumentir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="DPJP Anastesi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Perawat Anastesi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Tanggal Pembedahan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Diagnosa Pra Bedah">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Perawat Pasca Bedah">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    </div>
+
+    <div :class="cn('space-y-2',)">
+      <h1 class="font-semibold text-lg">Tindakan Operatif / Non Operatif Lain</h1>
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-14">No</TableHead>
+              <TableHead class="">Prosedur</TableHead>
+              <TableHead class="">Code</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in dummy" :key="idx">
+              <TableCell class="">{{ idx + 1 }}</TableCell>
+              <TableCell class="">{{ field.name }}</TableCell>
+              <TableCell class="">{{ field.code }}</TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+    
+    <div :class="cn('space-y-2',)">
+      <h1 class="font-semibold text-lg">Data Pelaksanaan Operasi</h1>
+      <DE.Block :col-count="2" :cell-flex="false">
+        <div>
+          <DetailRow label="Jenis Operasi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Kode Biling">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Sitem Operasi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Operasi Mulai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Operasi Selesai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Lama Operasi"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</DetailRow>
+          <DetailRow label="Pembiusan Mulai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Pembiusan Selesai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Lama Pembiusan"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</DetailRow>
+        </div>
+        <div>
+          <DetailRow label="Jenis Pembedahan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Operasi ke">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Keterangan Lahir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Ket Tempat Lahir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Berat Badan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Ket Saat Lahir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Uraian Operasi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Jumlah Pendarahan">{{ props.instance?.date ? props.instance?.date : '-' }} CC</DetailRow>
+        </div>
+        <div>
+          <DetailRow label="PRC">{{ props.instance?.date ? props.instance?.date : '-' }} CC</DetailRow>
+          <DetailRow label="FPP">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="WB">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="TC">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Merk">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Nama Implant">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Stiker/Nomor Register Implant">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Nama Pendamping Implant">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+        </div>
+        <div>
+          <DetailRow label-class="w-96" label="Specimen/Jaringan dikirim ke">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Keterangan Jaringan">
+            <Badge :variant="`outline`">
+              {{ `Example` }}
+            </Badge>
+          </DetailRow>
+        </div>
+      </DE.Block>
+    </div>
+
+    <div class="border-t-1 my-2 flex justify-end border-t-slate-300 py-2">
+      <PubMyUiNavFooterBa @click="onClick" />
+    </div>
+  </article>
+</template>
+
+<style scoped></style>
diff --git a/app/components/app/surgery-report/entry.vue b/app/components/app/surgery-report/entry.vue
new file mode 100644
index 00000000..8ac204f7
--- /dev/null
+++ b/app/components/app/surgery-report/entry.vue
@@ -0,0 +1,259 @@
+<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 { FieldArray } from 'vee-validate'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import SelectDpjpBedah from './_common/select-dpjp-bedah.vue'
+import SelectDpjpAnastesi from './_common/select-dpjp-anastesi.vue'
+import SelectSurgeryType from './_common/select-surgery-type.vue'
+import SelectBillingCode from './_common/select-billing-code.vue'
+import SelectSurgerySystemType from './_common/select-surgery-system-type.vue'
+import SelectDissectionType from './_common/select-dissection-type.vue'
+import SelectSurgeryOrder from './_common/select-surgery-order.vue'
+import SelectBirthDesc from './_common/select-birth-desc.vue'
+import SelectBirthPlaceDesc from './_common/select-birth-place-desc.vue'
+import SelectSpecimenType from './_common/select-specimen-type.vue'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import RadioBloodType from './_common/radio-blood-type.vue'
+import OperativeActionPicker from './operative-action/picker-dialog.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+  operativeActionList?: any[]
+}>()
+
+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="4" :cell-flex="false">
+      <SelectDpjpBedah :errors="errors"
+        field-name="a1"
+        label="DPJP Bedah" placeholder="Pilih DPJP Bedah"
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a2"
+        label="Operator" placeholder="Isi Operator"
+      />
+      <InputBase :errors="errors"
+        field-name="a3"
+        label="Asisten Operator" placeholder="Isi Asisten Operator"
+      />
+      <InputBase :errors="errors"
+        field-name="a4"
+        label="Instrumentir" placeholder="Isi Instrumentir"
+      />
+      <SelectDpjpAnastesi :errors="errors"
+        field-name="a5"
+        label="DPJP Anastesi" placeholder="Pilih DPJP Anastesi"
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Perawatan Anastesi" placeholder="Isi Perawatan Anastesi"
+      />
+      <SelectDate
+        field-name="a7"
+        label="Tanggal Pembedahan"
+        :errors="errors"
+        is-required
+      />
+    </DE.Block>
+    <DE.Block :col-count="4" :cell-flex="false">
+      <DE.Cell :col-span="2">
+        <TextAreaInput :errors="errors"
+          field-name="a8"
+          label="Diagnosa Pra Bedah" placeholder="Isi Diagnosa Pra Bedah"            
+          is-required
+        />
+      </DE.Cell>
+      <InputBase :errors="errors"
+        field-name="a9"
+        label="Perawat Pasca Bedah" placeholder="Isi Perawat Pasca Bedah"
+      />
+    </DE.Block>
+    
+    <!-- PICKER -->
+    <DE.Block :col-count="1" :cell-flex="false" class="w-1/2">
+      <OperativeActionPicker field-name="a63" title="Prosedur" />
+    </DE.Block>
+    <!-- -->
+
+    <DE.Block :col-count="3" :cell-flex="false">
+      <SelectSurgeryType :errors="errors"
+        field-name="a10"
+        label="Jenis Operasi" placeholder="Pilih Jenis Operasi"
+        is-required
+      />
+      <SelectBillingCode :errors="errors"
+        field-name="a11"
+        label="Kode Billing" placeholder="Pilih Kode Billing"
+        is-required
+      />
+      <SelectSurgerySystemType :errors="errors"
+        field-name="a12"
+        label="Sistem Operasi" placeholder="Pilih Sistem Operasi"
+        is-required
+      />      
+      <SelectDate :errors="errors"
+        field-name="a7"
+        label="Operasi Mulai"        
+        is-required
+        is-with-time
+      />    
+      <SelectDate :errors="errors"
+        field-name="a7"
+        label="Operasi Selesai"        
+        is-required
+        is-with-time
+      />
+      <div>
+        <p class="mt-1.5 mb-2">Lama Operasi</p>
+        <h1 class="text-base"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
+      </div>
+      <SelectDate :errors="errors"
+        field-name="a44"
+        label="Pembiusan Mulai"        
+        is-required
+        is-with-time
+      />    
+      <SelectDate :errors="errors"
+        field-name="a45"
+        label="Pembiusan Selesai"        
+        is-required
+        is-with-time
+      />
+      <div>
+        <p class="mt-1.5 mb-2">Lama Pembiusan</p>
+        <h1 class="text-base"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
+      </div>
+      <SelectDissectionType :errors="errors"
+        field-name="a13"
+        label="Jenis Pembedahan" placeholder="Pilih Jenis Pembedahan"
+        is-required
+      />
+      <SelectSurgeryOrder :errors="errors"
+        field-name="a14"
+        label="Urutan Operasi Ke" placeholder="Pilih Urutan Operasi Ke"
+        is-required
+      />
+      <SelectBirthDesc :errors="errors"
+        field-name="a15"
+        label="Ket. Lahir" placeholder="Pilih Ket. Lahir"
+        is-required
+      />
+      <SelectBirthPlaceDesc :errors="errors"
+        field-name="a16"
+        label="Ket. Tempat Lahir" placeholder="Pilih Ket. Tempat Lahir"
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Berat Badan" placeholder="Isi Berat Badan"
+        right-label="Gram"
+        numeric-only
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Ket. Saat Lahir" placeholder="Isi Ket. Saat Lahir"
+      />
+      <TextAreaInput :errors="errors"
+        field-name="a8"
+        label="Uraian Operasi" placeholder="Isi Uraian Operasi"            
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Jumlah Pendarahan" placeholder="Isi Jumlah Pendarahan"
+        right-label="cc"
+        numeric-only
+      />
+    </DE.Block>
+    
+
+    <DE.Block :col-count="1" :cell-flex="false" class="w-1/2">
+      <RadioBloodType :errors="errors"
+        field-name="a16"
+        label="Jenis Darah Masuk" placeholder="Pilih Jenis Darah Masuk"
+      />
+      <InputBase :errors="errors"
+        class=""
+        field-name="a6"
+        label="Jumlah Darah Masuk" placeholder="Isi Jumlah Darah Masuk"
+        right-label="cc"
+        numeric-only
+      />
+    </DE.Block>
+
+    <DE.Block :col-count="3" :cell-flex="false">
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Merk" placeholder="Isi Merk"
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Nama Implant" placeholder="Isi Nama Implant"
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Stiker / Nomor Register Implant" placeholder="Isi Stiker / Nomor Register Implant"
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Nama Penedamping Implant" placeholder="Isi Nama Penedamping Implant"
+      />
+      <SelectSpecimenType :errors="errors"
+        field-name="a17"
+        label="Specimen/Jaringan Dikirim Ke" placeholder="Pilih Specimen/Jaringan Dikirim Ke"
+        is-required
+      />
+    </DE.Block>
+
+    <DE.Block :col-count="1" :cell-flex="false" class="w-1/2">
+          <FieldArray v-slot="{ fields, push, remove }" name="a32">
+            <div v-for="(field, idx) in fields" :key="idx" class="flex items-end gap-3 mb-3">      
+              <InputBase :errors="errors"
+                :field-name="`a32[${idx}]`"
+                label="Keterangan Jaringan" placeholder="Isi Keterangan Jaringan"
+              />
+              <Button v-if="idx !== 0" type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Keterangan Jaringan
+            </Button>
+          </FieldArray>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/surgery-report/list.cfg.ts b/app/components/app/surgery-report/list.cfg.ts
new file mode 100644
index 00000000..6a63af13
--- /dev/null
+++ b/app/components/app/surgery-report/list.cfg.ts
@@ -0,0 +1,57 @@
+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-dud.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {}, {},],
+
+  headers: [
+    [
+      { label: 'Tgl Laporan' },
+      { label: 'DPJP Bedah' },
+      { label: 'DPJP Anastesi' },
+      { label: 'Tgl Pembedahan' },
+      { label: 'Jenis Operasi' },
+      { label: 'Kode Billing' },
+      { label: 'Sistem Operasi' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'doctor.employee.person.name', 'doctor.employee.person.name', 'date', 'name', 'name', 'name', '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/surgery-report/list.vue b/app/components/app/surgery-report/list.vue
new file mode 100644
index 00000000..8274e752
--- /dev/null
+++ b/app/components/app/surgery-report/list.vue
@@ -0,0 +1,31 @@
+<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'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+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>
diff --git a/app/components/app/surgery-report/operative-action/dropdown-action.vue b/app/components/app/surgery-report/operative-action/dropdown-action.vue
new file mode 100644
index 00000000..7dc56c86
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/dropdown-action.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>>('ap_rec_id')!
+const recAction = inject<Ref<string>>('ap_rec_action')!
+const recItem = inject<Ref<any>>('ap_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/app/surgery-report/operative-action/list.cfg.ts b/app/components/app/surgery-report/operative-action/list.cfg.ts
new file mode 100644
index 00000000..eeb08cff
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/list.cfg.ts
@@ -0,0 +1,44 @@
+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('./dropdown-action.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {width: 30}, ],
+
+  headers: [
+    [
+      { label: 'Nama Prosedur' },
+      { label: 'Code' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['name', 'code', 'action',],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+    
+  },
+}
diff --git a/app/components/app/surgery-report/operative-action/list.vue b/app/components/app/surgery-report/operative-action/list.vue
new file mode 100644
index 00000000..8b025e4f
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/list.vue
@@ -0,0 +1,84 @@
+<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[]
+  paginationMeta: PaginationMeta
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+const timestamp = ref<any>({})
+provide('ap_rec_id', recId)
+provide('ap_rec_action', recAction)
+provide('ap_rec_item', recItem)
+provide('timestamp', timestamp)
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+  toggleDialog: []
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+
+watch([recId, recAction, ], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      emit('toggleDialog')
+      break
+  }
+})
+</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>
diff --git a/app/components/app/surgery-report/operative-action/picker-dialog.vue b/app/components/app/surgery-report/operative-action/picker-dialog.vue
new file mode 100644
index 00000000..a568c159
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/picker-dialog.vue
@@ -0,0 +1,116 @@
+<script setup lang="ts">
+import ProcedureListDialog from './list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+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 './list.vue'
+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 { getList, getDetail } from '~/services/procedure-src.service'
+import { ActionEvents, type HeaderPrep, type RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+const isOperativeActionDialogOpen = ref(false)
+provide("isOperativeActionDialogOpen", isOperativeActionDialogOpen);
+
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'surgery-report',
+})
+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 = ''
+  },
+}
+
+const handleToggleOperativeActionDialog = () => {
+  isOperativeActionDialogOpen.value = !isOperativeActionDialogOpen.value
+}
+
+const dummy = [
+  {
+    id: 1,
+    number: 1,
+    name: 'Operasi',
+    code: 'OP-001'
+  }
+]
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isOperativeActionDialogOpen = true" size="xs" 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" />
+        Pilih {{ title }}
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="props.fieldName">
+      <Dialog
+        v-model:open="isOperativeActionDialogOpen"
+        title="" size="xl">
+        <Header
+              :prep="headerPrep"
+              :ref-search-nav="refSearchNav"
+              v-model:search="searchInput"
+              @search="handleSearch" />
+        <!-- <List :data="dummy" :process-fn="push" /> -->
+        <List
+          :data="dummy"
+          :pagination-meta="paginationMeta"
+          @page-change="handlePageChange"
+          @toggle-dialog="handleToggleOperativeActionDialog"
+          :process-fn="push"
+        />
+      </Dialog>
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="">Prosedur</TableHead>
+              <TableHead class="">Code</TableHead>
+              <TableHead class="w-24">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <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/therapy-protocol/_common/banner-patient-in-therapy.vue b/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
new file mode 100644
index 00000000..46ea79d9
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { cn } from '~/lib/utils';
+
+const props = withDefaults(defineProps<{
+  therapyEndDate?: string
+  class?: string
+}>(), {
+  therapyEndDate: new Date().toISOString(),
+})
+</script>
+
+<template>
+    <div :class="cn('flex items-center gap-2 p-3 rounded-md text-orange-500 border border-orange-400 bg-orange-50',
+        props.class
+    )">
+        <Icon name="i-lucide-triangle-alert" class="h-4 w-4 align-middle transition-colors" />
+        <p class="font-medium">Pasien ini sedang menjalankan program terapi sampai {{ new Date(props.therapyEndDate).toDateString() }}</p>
+    </div>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue b/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
new file mode 100644
index 00000000..e09432d5
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
@@ -0,0 +1,28 @@
+<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<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const recDate = inject<Ref<any>>('rec_date')!
+
+function confirm() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  recDate.value = new Date().getTime()
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="confirm">
+        <Icon name="i-lucide-circle-check" class="h-4 w-4 align-middle transition-colors" />
+        Konfirmasi
+    </Button>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue b/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
new file mode 100644
index 00000000..86953443
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'Ya', value: 'YA' },
+  { label: 'Tidak', value: 'TIDAK' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/radio-relationship.vue b/app/components/app/therapy-protocol/_common/radio-relationship.vue
new file mode 100644
index 00000000..07aad8b8
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/radio-relationship.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'Suami/Istri', value: 'partner' },
+  { label: 'Anak', value: 'child' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-arrangement.vue b/app/components/app/therapy-protocol/_common/select-arrangement.vue
new file mode 100644
index 00000000..9a945d44
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-arrangement.vue
@@ -0,0 +1,72 @@
+<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 { occupationCodes } from '~/lib/constants'
+
+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
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const arrangementTypeOpts = [
+  { label: 'KRS', value: "krs" },
+  { label: 'MRS', value: "mrs" },
+  { label: 'Pindah IGD', value: "pindahIgd" },
+  { label: 'Rujuk', value: "rujuk" },
+  { label: 'Rujuk Balik', value: "rujukBalik" },
+  { label: 'Meninggal', value: "meninggal" },
+  { label: 'Lain Lain', value: "other" },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="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 :name="fieldName" v-slot="{ componentField, value }">
+          <FormItem>
+            <FormControl>
+              <Select 
+                v-bind="componentField" 
+                :model-value="value"
+                :items="arrangementTypeOpts"
+                :defaultValue='arrangementTypeOpts[0]?.value' 
+              />
+            </FormControl>            
+            <FormMessage />
+          </FormItem>
+        </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-date-range.vue b/app/components/app/therapy-protocol/_common/select-date-range.vue
new file mode 100644
index 00000000..c9048fcf
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-date-range.vue
@@ -0,0 +1,52 @@
+<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'
+import { CalendarDate, DateFormatter, getLocalTimeZone, type DateValue } from '@internationalized/date'
+
+const props = defineProps<{
+  dateValueStart?: DateValue | undefined
+  dateValueEnd?: DateValue | undefined
+}>()
+
+const {
+  dateValueStart = new CalendarDate(2022, 1, 20),
+  dateValueEnd = new CalendarDate(2022, 1, 20).add({ days: 20 }),
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+</script>
+
+<template>
+  <Popover>
+        <PopoverTrigger as-child>
+          <Button variant="outline" :class="cn('w-[280px] justify-start text-left font-normal',
+            (!dateValueStart && !dateValueEnd) && 'text-muted-foreground')">
+            <CalendarIcon class="mr-2 h-4 w-4" />
+            <template v-if="dateValueStart">
+              <template v-if="dateValueEnd">
+                {{ df.format(dateValueStart.toDate(getLocalTimeZone())) }} -
+                {{ df.format(dateValueEnd.toDate(getLocalTimeZone())) }}
+              </template>
+  
+              <template v-else>
+                {{ df.format(dateValueStart.toDate(getLocalTimeZone())) }}
+              </template>
+            </template>
+            <template v-else> Pick a date </template>
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent class="w-auto p-0">
+          <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+            @update:start-value="(startDate) => (dateValueStart = startDate)" />
+        </PopoverContent>
+      </Popover>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-date.vue b/app/components/app/therapy-protocol/_common/select-date.vue
new file mode 100644
index 00000000..74245e7e
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-date.vue
@@ -0,0 +1,121 @@
+<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,
+  isWithTime = false,
+} = 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="isWithTime ? 'datetime-local' : 'date'"
+              min="1900-01-01"
+              :max="new Date().toISOString().split('T')[0]"
+              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/therapy-protocol/_common/select-death-cause.vue b/app/components/app/therapy-protocol/_common/select-death-cause.vue
new file mode 100644
index 00000000..a155b139
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-death-cause.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes } from '~/lib/constants'
+
+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
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="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="jobOptions"
+              :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/therapy-protocol/_common/select-faskes.vue b/app/components/app/therapy-protocol/_common/select-faskes.vue
new file mode 100644
index 00000000..0852195b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-faskes.vue
@@ -0,0 +1,70 @@
+<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 { occupationCodes } from '~/lib/constants'
+
+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
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</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="jobOptions"
+              :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/therapy-protocol/_common/select-primary-diagnosis.vue b/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
new file mode 100644
index 00000000..0852195b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
@@ -0,0 +1,70 @@
+<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 { occupationCodes } from '~/lib/constants'
+
+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
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</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="jobOptions"
+              :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/therapy-protocol/_common/select-secondary-diagnosis.vue b/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
new file mode 100644
index 00000000..a155b139
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
@@ -0,0 +1,71 @@
+<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 { occupationCodes } from '~/lib/constants'
+
+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
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="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="jobOptions"
+              :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/therapy-protocol/_common/text-captcha.vue b/app/components/app/therapy-protocol/_common/text-captcha.vue
new file mode 100644
index 00000000..de9d7f4b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/text-captcha.vue
@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { ref, computed, watch, defineEmits, defineProps, onMounted, nextTick, defineExpose } from 'vue'
+import Input from '~/components/pub/ui/input/Input.vue';
+import Button from '~/components/pub/ui/button/Button.vue';
+import waveyFingerprint from '~/assets/svg/wavey-fingerprint.svg'
+
+/**
+ * TextCaptcha props:
+ * - length: number of characters in the core captcha
+ * - caseSensitive: whether validation is case sensitive
+ * - useSpacing: show spaced-out characters (visual obfuscation only)
+ * - noiseChars: include random noise characters visually (not required to type)
+ */
+const props = defineProps({
+  length: { type: Number, default: 6 },
+  caseSensitive: { type: Boolean, default: false },
+  useSpacing: { type: Boolean, default: true },
+  noiseChars: { type: Boolean, default: false }, // adds random noise characters to display
+  refreshCooldownMs: { type: Number, default: 500 }, // guard repeated refresh
+})
+
+const emit = defineEmits<{
+  (e: 'update:valid', valid: boolean): void
+  (e: 'validated', valid: boolean): void
+  (e: 'change', value: string): void
+}>()
+
+// Internal state
+const raw = ref('')            // the canonical captcha value (what user must match, ignoring visual noise)
+const display = ref('')        // randomized visual representation (may include spacing/noise)
+const input = ref('')          // user typed value
+const lastRefresh = ref(0)
+const valid = inject('isCaptchaValid') as Ref<boolean>
+const errorMessage = ref('')
+
+/** Characters excluding ambiguous ones: 0/O, 1/l/I etc. */
+const CHARS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+
+function randomChar() {
+  return CHARS.charAt(Math.floor(Math.random() * CHARS.length))
+}
+
+/** Generate the canonical captcha string */
+function genRaw(len = props.length) {
+  let s = ''
+  for (let i = 0; i < len; i++) s += randomChar()
+  return s
+}
+
+/** Create a visually obfuscated display string (spacing, noise, random case) */
+function genDisplay(base: string) {
+  const arr: string[] = []
+  for (const ch of base) {
+    // toggle case randomly (only for letters)
+    const c = /[A-Za-z]/.test(ch) && Math.random() > 0.5 ? (Math.random() > 0.5 ? ch.toLowerCase() : ch.toUpperCase()) : ch
+    arr.push(c)
+    if (props.useSpacing && Math.random() > 0.3) arr.push(' ') // random space
+  }
+  return arr.join('')
+}
+
+/** Refresh captcha */
+function refresh() {
+  const now = Date.now()
+  if (now - lastRefresh.value < props.refreshCooldownMs) return
+  lastRefresh.value = now
+
+  raw.value = genRaw(props.length)
+  display.value = genDisplay(raw.value)
+  input.value = ''
+  valid.value = false
+  errorMessage.value = ''
+  // emit change so parent knows new value (but we don't send the raw canonical in production)
+  emit('change', display.value)
+}
+
+/** Normalize input and canonical for comparison */
+function normalizeForCompare(s: string) {
+  const normalized = s.replace(/\s+/g, '') // strip spaces
+  return props.caseSensitive ? normalized : normalized.toLowerCase()
+}
+
+/** Validate the current input */
+function validate() {
+  const left = normalizeForCompare(input.value)
+  const right = normalizeForCompare(raw.value)
+  if (!input.value) {
+    valid.value = false
+    errorMessage.value = 'Please enter the captcha text.'
+  } else if (left === right) {
+    valid.value = true
+    errorMessage.value = ''
+  } else {
+    valid.value = false
+    errorMessage.value = 'Captcha does not match.'
+  }
+  emit('update:valid', valid.value)
+  emit('validated', valid.value)
+  return valid.value
+}
+
+// expose a refresh method to parent via ref
+defineExpose({ refresh, validate, isValid: computed(() => valid.value) })
+
+// generate on mount
+onMounted(() => refresh())
+
+// // re-validate whenever input changes (lightweight)
+// watch(input, () => {
+//   // we don't auto-pass until the user explicitly validate (but we can optionally live-validate)
+//   // Here we perform live feedback but still emit validated only when called
+//   const left = normalizeForCompare(input.value)
+//   const right = normalizeForCompare(raw.value)
+//   valid.value = !!input.value && left === right
+//   // emit a live update so the parent can disable submit accordingly
+//   emit('update:valid', valid.value)
+// })
+</script>
+
+<template>
+  <div class="space-y-2 w-full max-w-sm">
+    <div class="flex items-center justify-between gap-3">
+      <!-- Captcha visual box -->
+      <div
+        role="img"
+        aria-label="Text captcha, type the characters shown"
+        tabindex="0"
+        class="select-none p-3 rounded-md border border-gray-200 text-white text-xl font-mono tracking-wider text-center w-full"
+      >
+        <span class="inline-block" v-html="display"></span>
+      </div>
+
+      <!-- Refresh -->
+      <div class="flex-shrink-0">
+        <Button variant="ghost" type="button" @click="refresh" title="Refresh captcha">
+          <Icon name="i-lucide-refresh-cw" />
+        </Button>
+      </div>
+    </div>
+
+    <!-- Input -->
+    <div class="flex gap-3 items-start">
+        <div class="flex-grow">
+            <Input
+                v-model="input"
+                :aria-invalid="valid ? 'false' : 'true'"
+                inputmode="text"
+                placeholder="Type the captcha text"
+                @keyup.enter="validate"
+            />
+            <p v-if="errorMessage" class="text-xs text-red-500 mt-1">{{ errorMessage }}</p>
+            <p v-else-if="valid" class="text-xs text-green-500 mt-1">Correct</p>
+            <p v-else class="text-xs text-gray-500 mt-1">Not case-sensitive</p>
+        </div>
+        <Button variant="outline" type="button" @click="validate" title="Validate"
+            class="border-orange-400">
+            <Icon name="i-lucide-check" class="text-orange-400" />
+        </Button>
+    </div>
+
+  </div>
+</template>
+
+<style scoped>
+/* small nicety: make noise/spaced display look irregular */
+div[role="img"] {
+  background: url('~/assets/svg/wavey-fingerprint.svg') repeat center;
+}
+
+div[role="img"] span {
+  letter-spacing: 0.12em;
+  font-weight: 600;
+  user-select: none;
+}
+</style>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/_common/verify-badge.vue b/app/components/app/therapy-protocol/_common/verify-badge.vue
new file mode 100644
index 00000000..30cd4c54
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/verify-badge.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { Badge } from '~/components/pub/ui/badge'
+
+const activeStatusCodes: Record<string, string> = {
+  verified: 'Verifikasi',
+  unverified: 'Belum Verifikasi',
+}
+
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+
+const statusText = computed(() => {
+  const code: keyof typeof activeStatusCodes = props.rec.status_code === 1 ? `verified` : `unverified`
+  return activeStatusCodes[code]
+})
+
+const badgeVariant = computed(() => {
+  return props.rec.status_code === 1 ? 'default' : 'outline'
+})
+</script>
+
+<template>
+  <div class="flex justify-center">
+    <Badge :variant="badgeVariant" class="rounded-2xl text-[0.6rem]" >
+      {{ statusText }}
+    </Badge>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/add-list.cfg.ts b/app/components/app/therapy-protocol/add-list.cfg.ts
new file mode 100644
index 00000000..856ae82b
--- /dev/null
+++ b/app/components/app/therapy-protocol/add-list.cfg.ts
@@ -0,0 +1,51 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+
+export const medicalDiagnosisConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Diagnosa' },
+      { label: 'ICD-X' },
+    ],
+  ],
+
+  keys: ['number', 'diagnosis', 'icd_x'],
+
+  parses: {  },
+}
+
+export const functionalDiagnosisConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Diagnosa' },
+      { label: 'ICD-X' },
+    ],
+  ],
+
+  keys: ['number', 'diagnosis', 'icd_x'],
+
+  parses: {  },
+}
+
+
+
+export const proceduralConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Prosedur' },
+      { label: 'ICD-IX' },
+    ],
+  ],
+
+  keys: ['number', 'procedure', 'icd_x'],
+
+  parses: {  },
+}
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/detail-list.cfg.ts b/app/components/app/therapy-protocol/detail-list.cfg.ts
new file mode 100644
index 00000000..e50113d7
--- /dev/null
+++ b/app/components/app/therapy-protocol/detail-list.cfg.ts
@@ -0,0 +1,28 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+const action = defineAsyncComponent(() => import('./_common/btn-confirmation-detail.vue'))
+
+export const detailTherapyProtocolListConfig: Config = {
+  cols: [{}, {}, {}, {width: 100},],
+
+  headers: [
+    [
+      { label: 'Program Kegiatan' },
+      { label: 'Paraf Terapis' },
+      { label: 'Paraf Dokter' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['program', 'therapistSign', 'doctorSign', 'action'],
+
+  parses: {  },
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+}
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/detail.vue b/app/components/app/therapy-protocol/detail.vue
new file mode 100644
index 00000000..e57ff3b1
--- /dev/null
+++ b/app/components/app/therapy-protocol/detail.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import SelectSecondaryDiagnosis from './_common/select-secondary-diagnosis.vue'
+import SelectPrimaryDiagnosis from './_common/select-primary-diagnosis.vue'
+import SelectArrangement from './_common/select-arrangement.vue'
+import type { ResumeArrangementType } from '~/schemas/resume.schema'
+import SelectFaskes from './_common/select-faskes.vue'
+import SelectDeathCause from './_common/select-death-cause.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, medicalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Badge from '~/components/pub/ui/badge/Badge.vue'
+import { detailTherapyProtocolListConfig } from './detail-list.cfg'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+
+const props = defineProps<{
+
+}>()
+
+const router = useRouter()
+const formRef = ref()
+const isConfirmationOpen = ref(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),
+})
+
+function goBack() {
+  router.go(-1)
+}
+async function handleConfirmAdd() {
+  // handleActionClick('submit')
+  console.log(`tersubmit wak`)
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {   
+    goBack()
+  }
+}
+
+const dummymedicalDiagnosis = [
+  { id: `asdfouno182y49128y3`, program: 'Latihan penguatan otot', icd_x: 'E11' },
+  { id: `asdfouno182y49128g8`, program: 'Mobilisasi otot', icd_x: 'I10' },
+]
+</script>
+
+<template>
+  <div class="flex items-center">         
+    <Button type="button" variant="outline" class="ml-auto text-gray-500 border border-orange-400 bg-orange-50" @click="handleActionClick('back')">
+      <Icon name="i-lucide-arrow-left" class="h-4 w-4 align-middle transition-colors" />
+      Kembali
+    </Button>
+  </div>
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 1</h1>
+    <DetailRow label="Tanggal Pemeriksaan">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Diagnosa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Permintaan Terapi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Frekuensi Terapi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Waktu Mencapai Target">{{ `aaaaaa bulan` }}</DetailRow>
+  </section>
+  <Separator class="my-5" />
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 2</h1>
+    <DetailRow label="Hubungan dengan Tertanggung">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Anamnesa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Pemeriksaan Fisik dan Uji Fungsi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Diagnosa Medis (ICD-X)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Diagnosa Fungsional (ICD-X)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Prosedur Tata Laksana (ICD-IX CM)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Pemeriksaan Penunjang">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Evaluasi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Anjuran">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Suspek Penyakit Akibat Kerja">{{ `aaaaaa` }}</DetailRow>
+  </section>
+  <Separator class="my-5" />
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 3</h1>
+    <DetailRow label="Diagnosa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Permintaan Terapi">{{ `aaaaaa` }}</DetailRow>
+
+    <div class="mt-3">
+      <PubMyUiDataTable 
+        v-bind="detailTherapyProtocolListConfig"
+        :rows="dummymedicalDiagnosis" />
+    </div>  
+
+  </section>
+</template>
diff --git a/app/components/app/therapy-protocol/edit.vue b/app/components/app/therapy-protocol/edit.vue
new file mode 100644
index 00000000..e871fc90
--- /dev/null
+++ b/app/components/app/therapy-protocol/edit.vue
@@ -0,0 +1,217 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import SelectSecondaryDiagnosis from './_common/select-secondary-diagnosis.vue'
+import SelectPrimaryDiagnosis from './_common/select-primary-diagnosis.vue'
+import SelectArrangement from './_common/select-arrangement.vue'
+import type { ResumeArrangementType } from '~/schemas/resume.schema'
+import SelectFaskes from './_common/select-faskes.vue'
+import SelectDeathCause from './_common/select-death-cause.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, medicalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  resumeArrangementType: ResumeArrangementType
+  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),
+})
+
+const dummymedicalDiagnosis = [
+  { number: 1, diagnosis: 'Diabetes Mellitus', icd_x: 'E11' },
+  { number: 2, diagnosis: 'Hipertensi',  icd_x: 'I10' },
+  { number: 3, diagnosis: 'Asma Bronkial', icd_x: 'J45' },
+]
+</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 : {}">
+    <h1 class="mb-1 text-base font-medium">Terapi ke 1</h1>
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base">Form 1</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="checkDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="diagnosis"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="therapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      <DE.Block class="flex items-end h-fit" :col-count="3" :cell-flex="false">        
+        <div>
+          <h1 class="mb-1 font-medium">Frekuensi Terapi</h1>
+          <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+            <p class="">{{ `2` }}</p>
+            <p class="text-muted-foreground">x / Minggu</p>
+          </div>
+        </div>
+        <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+          <p>
+            <span class="text-muted-foreground">Selama</span>
+              {{ `1` }}
+            <span class="text-muted-foreground">Bulan</span>
+          </p>
+        </div>
+        <InputBase
+          field-name="targetPeriodInMonths"
+          label="Waktu mencapai target (Bulan)"
+          placeholder="Masukkan angka"
+          :errors="errors"
+          numeric-only
+        />
+      </DE.Block>
+      <TextAreaInput 
+        field-name="therapyTarget"
+        label="Target Terapi"
+        placeholder="Target Terapi"
+        :errors="errors" />
+    </DE.Block>
+    <Separator class="my-4" />
+
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base font-medium">Form 2</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">        
+        <RadioRelationship
+          field-name="relationshipToPatient"
+          label="Hubungan dengan tertanggung"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+      <TextAreaInput 
+        field-name="anamnesa"
+        label="Anamnesa"
+        placeholder="Anamnesa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="physicalExamination"
+        label="Pemeriksaan Fisik & Uji Fungsi"
+        placeholder="Pemeriksaan Fisik & Uji Fungsi"
+        :errors="errors" />
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Diagnosis Medis (ICD-X)</h1>
+        <PubMyUiDataTable
+          v-bind="medicalDiagnosisConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Diagnosis Fungsional (ICD-X)</h1>
+        <PubMyUiDataTable
+          v-bind="functionalDiagnosisConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Prosedur Tata Laksana (ICD-IX CM)</h1>
+        <PubMyUiDataTable
+          v-bind="proceduralConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+
+      <TextAreaInput 
+        field-name="supportingExamination"
+        label="Pemeriksaan Penunjang"
+        placeholder="Pemeriksaan Penunjang"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="evaluation"
+        label="Evaluasi"
+        placeholder="Evaluasi"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="recommendation"
+        label="Anjuran"
+        placeholder="Anjuran"
+        :errors="errors" />
+      <DE.Cell :col-span="2">        
+        <RadioIllnessBcsWork
+          field-name="illnessBcsWork"
+          label="Suspek penyakit akibat kerja"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+    </DE.Block>
+    <Separator class="my-4" />
+
+    
+    <!-- FORM 3 -->
+    <h1 class="mb-3 text-base">Form 3</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="checkDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form3-diagnosis"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form3-therapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      
+      <DE.Cell class="mt-2" :col-span="2">
+          <FieldArray v-slot="{ fields, push, remove }" name="form3-programActivity">
+            <div v-for="(field, idx) in fields" :key="idx" class="w-1/2 flex items-center gap-3 mb-3">
+              <TextAreaInput 
+                class=""
+                :field-name="`form3-programActivity[${idx}]`"
+                :label="`Program/Kegiatan ${idx + 1}`"
+                :placeholder="`Masukkan Program/Kegiatan ${idx + 1}`"
+                :errors="errors" />
+              <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Program
+            </Button>
+          </FieldArray>
+      </DE.Cell>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/entry-form.vue b/app/components/app/therapy-protocol/entry-form.vue
new file mode 100644
index 00000000..22bae769
--- /dev/null
+++ b/app/components/app/therapy-protocol/entry-form.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { toTypedSchema } from '@vee-validate/zod'
+
+// components
+import { Form } from '~/components/pub/ui/form'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import Separator from '~/components/pub/ui/separator/Separator.vue'
+
+// form field components
+import { BaseTextarea, RadioRelations, SelectExaminationDate, RadioWorkDisease } from './field'
+
+// #region Props & Emits
+interface Props {
+  schema: any
+  initialValues?: any
+  patientId: number
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{}>()
+// #endregion
+
+// #region State & Computed
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+// #endregion region
+
+// #region Utilities & event handlers
+// #endregion
+
+// #region Watchers
+// #endregion
+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 : {}"
+  >
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Anamnesa dan Riwayat Pasien</p>
+    <DE.Block
+      :col-count="3"
+      :cell-flex="false"
+    >
+      <SelectExaminationDate
+        field-name="examinationDate"
+        label="Tanggal Pemeriksaan"
+      />
+      <RadioRelations
+        field-name="relationshipToInsured"
+        label="Hubungan Dengan Tertanggung"
+        :col-span="2"
+      />
+      <BaseTextarea
+        field-name="anamnesis"
+        label="Anamnesa"
+      />
+      <BaseTextarea
+        field-name="medicalHistory"
+        label="Riwayat Penyakit"
+      />
+      <BaseTextarea
+        field-name="medicationHistory"
+        label="Riwayat Obat"
+      />
+    </DE.Block>
+
+    <div class="h-6">
+      <Separator />
+    </div>
+
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Pemeriksaan Penunjang</p>
+    <DE.Block
+      :col-count="2"
+      :cell-flex="false"
+    >
+      <BaseTextarea
+        field-name="supportDiagnosis"
+        label="Diagnosa (ICD-X)"
+      />
+      <BaseTextarea
+        field-name="functionalDiagnosis"
+        label="Diagnosa Fungsional (ICD-X)"
+      />
+      <BaseTextarea
+        field-name="treatmentDiagnosis"
+        label="Diagnosa Tata Laksana (ICD-IX)"
+      />
+      <BaseTextarea
+        field-name="supportExamination"
+        label="Pemeriksaan Penunjang"
+      />
+    </DE.Block>
+
+    <div class="h-6">
+      <Separator />
+    </div>
+
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Anjuran dan Evaluasi</p>
+    <DE.Block
+      :col-count="3"
+      :cell-flex="false"
+    >
+      <BaseTextarea
+        field-name="recommendation"
+        label="Anjuran"
+      />
+      <BaseTextarea
+        field-name="evaluation"
+        label="Evaluasi"
+      />
+      <RadioWorkDisease
+        field-name="isWorkRelatedDisease"
+        label="Suspek Penyakit Akibat Kerja"
+      />
+    </DE.Block>
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/entry.vue b/app/components/app/therapy-protocol/entry.vue
new file mode 100644
index 00000000..48065416
--- /dev/null
+++ b/app/components/app/therapy-protocol/entry.vue
@@ -0,0 +1,204 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+import FunctionalDiagnosisPicker from './picker-dialog/functional-diagnosis/diagnosis-picker.vue'
+import MedicalDiagnosisPicker from './picker-dialog/medical-diagnosis/diagnosis-picker.vue'
+import ArrangementProcedurePicker from './picker-dialog/arrangement-procedure/procedure-picker.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+// const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isFunctionalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isProcedurePickerDialogOpen = ref<boolean>(false)
+
+// function toggleMedicalDiagnosisPickerDialog() {
+//   isMedicalDiagnosisPickerDialogOpen.value = !isMedicalDiagnosisPickerDialogOpen.value
+// }
+// function toggleFunctionalDiagnosisPickerDialog() {
+//   isFunctionalDiagnosisPickerDialogOpen.value = !isFunctionalDiagnosisPickerDialogOpen.value
+// }
+
+// provide(`isDiagnosisPickerDialogOpen`, isDiagnosisPickerDialogOpen)
+// provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)
+
+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 : {}">
+    <h1 class="mb-1 text-base font-medium">Terapi ke 1</h1>
+
+
+    <!-- FORM 1 -->
+    <h1 class="mb-3 text-base">Form 1</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="form1ExaminationDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form1Diagnose"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form1TherapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      <DE.Block class="flex items-end h-fit" :col-count="3" :cell-flex="false">        
+        <div>
+          <h1 class="mb-1 font-medium">Frekuensi Terapi</h1>
+          <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+            <p class="">{{ `2` }}</p>
+            <p class="text-muted-foreground">x / Minggu</p>
+          </div>
+        </div>
+        <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+          <p>
+            <span class="text-muted-foreground">Selama</span>
+              {{ `1` }}
+            <span class="text-muted-foreground">Bulan</span>
+          </p>
+        </div>
+        <InputBase
+          field-name="form1TargetPeriod"
+          label="Waktu mencapai target (Bulan)"
+          placeholder="Masukkan angka"
+          :errors="errors"
+          numeric-only
+        />
+      </DE.Block>
+      <TextAreaInput 
+        field-name="form1TherapyTarget"
+        label="Target Terapi"
+        placeholder="Target Terapi"
+        :errors="errors" />
+    </DE.Block>
+    <Separator class="my-4" />
+
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base font-medium">Form 2</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">        
+        <RadioRelationship
+          field-name="form2RelationshipToInsured"
+          label="Hubungan dengan tertanggung"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+      <TextAreaInput 
+        field-name="anamnesis"
+        label="Anamnesa"
+        placeholder="Anamnesa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form2PhysicalExamination"
+        label="Pemeriksaan Fisik & Uji Fungsi"
+        placeholder="Pemeriksaan Fisik & Uji Fungsi"
+        :errors="errors" />
+      
+      <MedicalDiagnosisPicker
+        field-name="medicalDiagnoses"
+        title="Diagnosis Medis (ICD-X)" />
+      <FunctionalDiagnosisPicker
+        field-name="functionDiagnoses" 
+        title="Diagnosis Fungsional (ICD-X)" />
+      <ArrangementProcedurePicker
+        field-name="procedures"
+        title="Prosedur Tata Laksana (ICD-IX CM)" />
+      
+      <TextAreaInput 
+        field-name="supportingExams"
+        label="Pemeriksaan Penunjang"
+        placeholder="Pemeriksaan Penunjang"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="evaluation"
+        label="Evaluasi"
+        placeholder="Evaluasi"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="instruction"
+        label="Anjuran"
+        placeholder="Anjuran"
+        :errors="errors" />
+      <DE.Cell :col-span="2">        
+        <RadioIllnessBcsWork
+          field-name="workCauseStatus"
+          label="Suspek penyakit akibat kerja"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+    </DE.Block>
+    <Separator class="my-4" />
+
+    
+    <!-- FORM 3 -->
+    <h1 class="mb-3 text-base">Form 3</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="form3ExaminationDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form3Diagnose"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form3TherapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      
+      <DE.Cell class="mt-2" :col-span="2">
+          <FieldArray v-slot="{ fields, push, remove }" name="form3ProgramActivities">
+            <div v-for="(field, idx) in fields" :key="idx" class="w-1/2 flex items-center gap-3 mb-3">
+              <TextAreaInput 
+                class=""
+                :field-name="`form3ProgramActivities[${idx}]`"
+                :label="`Program/Kegiatan ${idx + 1}`"
+                :placeholder="`Masukkan Program/Kegiatan ${idx + 1}`"
+                :errors="errors" />
+              <Button v-if="idx !== 0" type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Program
+            </Button>
+          </FieldArray>
+      </DE.Cell>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/field/base-textarea.vue b/app/components/app/therapy-protocol/field/base-textarea.vue
new file mode 100644
index 00000000..e6e7a63c
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/base-textarea.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  label: string
+  fieldName: string
+  placeholder?: string
+  colSpan?: number
+}>()
+
+const { label, fieldName, placeholder = 'Masukkan catatan' } = props
+</script>
+
+<template>
+  <DE.Cell :col-span="colSpan || 1">
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Textarea
+              v-bind="componentField"
+              :placeholder="placeholder"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/index.ts b/app/components/app/therapy-protocol/field/index.ts
new file mode 100644
index 00000000..f3df2c2d
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/index.ts
@@ -0,0 +1,4 @@
+export { default as RadioRelations } from './radio-relations.vue'
+export { default as SelectExaminationDate } from './select-examination-date.vue'
+export { default as BaseTextarea } from './base-textarea.vue'
+export { default as RadioWorkDisease } from './radio-work-disease.vue'
diff --git a/app/components/app/therapy-protocol/field/radio-relations.vue b/app/components/app/therapy-protocol/field/radio-relations.vue
new file mode 100644
index 00000000..aba12b86
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/radio-relations.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+defineProps<{
+  label: string
+  fieldName: string
+  containerClass?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  colSpan?: number
+}>()
+
+const options = [
+  { label: 'Suami/Istri', value: 'spouse' },
+  { label: 'Anak', value: 'child' },
+]
+</script>
+
+<template>
+  <DE.Cell
+    :class="cn('radio-group-field', containerClass)"
+    :col-span="colSpan || 2"
+  >
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in options"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/radio-work-disease.vue b/app/components/app/therapy-protocol/field/radio-work-disease.vue
new file mode 100644
index 00000000..9eeaa0d8
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/radio-work-disease.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+defineProps<{
+  label: string
+  fieldName: string
+  containerClass?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  colSpan?: number
+}>()
+
+const options = [
+  { label: 'Ya', value: 'YA' },
+  { label: 'Tidak', value: 'TIDAK' },
+]
+</script>
+
+<template>
+  <DE.Cell
+    :class="cn('radio-group-field', containerClass)"
+    :col-span="colSpan || 1"
+  >
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in options"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/select-examination-date.vue b/app/components/app/therapy-protocol/field/select-examination-date.vue
new file mode 100644
index 00000000..6ab232b9
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/select-examination-date.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+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
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+}>()
+
+const { placeholder = 'Pilih tanggal pemeriksaan', class: containerClass, fieldGroupClass, labelClass } = props
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              type="date"
+              min="1980-01-01"
+              :max="new Date().toISOString().split('T')[0]"
+              v-bind="componentField"
+              :placeholder="placeholder"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/history-dialog.vue b/app/components/app/therapy-protocol/history-dialog.vue
new file mode 100644
index 00000000..7bfcac10
--- /dev/null
+++ b/app/components/app/therapy-protocol/history-dialog.vue
@@ -0,0 +1,43 @@
+<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
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<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/therapy-protocol/history-list.cfg.ts b/app/components/app/therapy-protocol/history-list.cfg.ts
new file mode 100644
index 00000000..0467589e
--- /dev/null
+++ b/app/components/app/therapy-protocol/history-list.cfg.ts
@@ -0,0 +1,45 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dp.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 140}, {width: 3},],
+
+  headers: [
+    [
+      { label: 'Tgl Pemeriksaan' },
+      { label: 'DPJP' },
+      { label: 'Anamnesa' },
+      { label: 'Permintaan Terapi' },
+      { label: 'Program/Kegiatan' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['birth_date', 'person.name', 'person.name', 'person.name', 'birth_date', "action"],
+
+  parses: {
+    birth_date: (rec: unknown): unknown => {
+      const { person } = rec as Patient
+
+      if (typeof person.birthDate == 'object' && person.birthDate) {
+        return (person.birthDate as Date).toLocaleDateString('id-ID')
+      } else if (typeof person.birthDate == 'string') {
+        return (person.birthDate as string).substring(0, 10)
+      }
+      return person.birthDate
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+}
diff --git a/app/components/app/therapy-protocol/list.cfg.ts b/app/components/app/therapy-protocol/list.cfg.ts
new file mode 100644
index 00000000..34155752
--- /dev/null
+++ b/app/components/app/therapy-protocol/list.cfg.ts
@@ -0,0 +1,53 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-duvp.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 140}, {width: 3},],
+
+  headers: [
+    [
+      { label: 'Tgl Pemeriksaan' },
+      { label: 'Anamnesa' },
+      { label: 'Permintaan Terapi' },
+      { label: 'Program' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['anamnesis', 'anamnesis', 'anamnesis', 'anamnesis', 'status', 'action'],
+
+  parses: {
+    birth_date: (rec: unknown): unknown => {
+      const { person } = rec as Patient
+
+      if (typeof person.birthDate == 'object' && person.birthDate) {
+        return (person.birthDate as Date).toLocaleDateString('id-ID')
+      } else if (typeof person.birthDate == 'string') {
+        return (person.birthDate as string).substring(0, 10)
+      }
+      return person.birthDate
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/therapy-protocol/list.vue b/app/components/app/therapy-protocol/list.vue
new file mode 100644
index 00000000..0d62cc6c
--- /dev/null
+++ b/app/components/app/therapy-protocol/list.vue
@@ -0,0 +1,31 @@
+<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'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+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/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
new file mode 100644
index 00000000..91e9f72c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<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>>('ap_rec_id')!
+const recAction = inject<Ref<string>>('ap_rec_action')!
+const recItem = inject<Ref<any>>('ap_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</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/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
new file mode 100644
index 00000000..e4836c7c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
@@ -0,0 +1,120 @@
+<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'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './procedure-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 {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'procedure-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'MCU Prosedur',
+  icon: 'i-lucide-clipboard-list',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('ap_rec_id', recId)
+provide('ap_rec_action', recAction)
+provide('ap_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isProcedurePickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class=""
+  />
+  <AppProcedureSrcList
+    :table-config="config"
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"
+  />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
new file mode 100644
index 00000000..4a44a40f
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import ProcedureListDialog from './procedure-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+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'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isProcedurePickerDialogOpen = ref<boolean>(false)
+provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isProcedurePickerDialogOpen = true" size="xs" 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" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="props.fieldName">
+      <ProcedureListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Prosedur</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <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/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
new file mode 100644
index 00000000..67be3075
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
@@ -0,0 +1,108 @@
+<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'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './diagnosis-list-cfg'
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { DiagnoseSrcSchema, type DiagnoseSrcFormData } from '~/schemas/diagnose-src.schema'
+
+// Handlers
+
+// Services
+import { getList, getDetail } from '~/services/diagnose-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'diagnose-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Daftar Diagnosis',
+  icon: 'i-lucide-microscope',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('fd_rec_id', recId)
+provide('fd_rec_action', recAction)
+provide('fd_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isFunctionalPickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class=""
+    />
+    <AppDiagnoseSrcList
+      :data="data"
+      :pagination-meta="paginationMeta"
+      :table-config="config"
+      @page-change="handlePageChange"
+    />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
new file mode 100644
index 00000000..e609450b
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import DiagnosisListDialog from './diagnosis-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+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'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isFunctionalPickerDialogOpen = ref<boolean>(false)
+provide(`isFunctionalPickerDialogOpen`, isFunctionalPickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isFunctionalPickerDialogOpen = true" size="xs" 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" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="fieldName">
+      <DiagnosisListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Diagnosis</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <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/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
new file mode 100644
index 00000000..ac7c8f29
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<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>>('fd_rec_id')!
+const recAction = inject<Ref<string>>('fd_rec_action')!
+const recItem = inject<Ref<any>>('fd_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</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/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
new file mode 100644
index 00000000..d299219f
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
@@ -0,0 +1,107 @@
+<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'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './diagnosis-list-cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { DiagnoseSrcSchema, type DiagnoseSrcFormData } from '~/schemas/diagnose-src.schema'
+
+// Services
+import { getList, getDetail } from '~/services/diagnose-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'diagnose-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Daftar Diagnosis',
+  icon: 'i-lucide-microscope',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('md_rec_id', recId)
+provide('md_rec_action', recAction)
+provide('md_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isMedicalDiagnosisPickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class=""
+    />
+    <AppDiagnoseSrcList
+      :data="data"
+      :pagination-meta="paginationMeta"
+      :table-config="config"
+      @page-change="handlePageChange"
+    />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
new file mode 100644
index 00000000..76ce6dfd
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import DiagnosisListDialog from './diagnosis-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+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'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+provide(`isMedicalDiagnosisPickerDialogOpen`, isMedicalDiagnosisPickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isMedicalDiagnosisPickerDialogOpen = true" size="xs" 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" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="fieldName">
+      <DiagnosisListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Diagnosis</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <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/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
new file mode 100644
index 00000000..a30ca20c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<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>>('md_rec_id')!
+const recAction = inject<Ref<string>>('md_rec_action')!
+const recItem = inject<Ref<any>>('md_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</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/app/therapy-protocol/verify-dialog.vue b/app/components/app/therapy-protocol/verify-dialog.vue
new file mode 100644
index 00000000..d72a96c2
--- /dev/null
+++ b/app/components/app/therapy-protocol/verify-dialog.vue
@@ -0,0 +1,108 @@
+<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 type { InstallationFormData } from '~/schemas/installation.schema'
+import TextCaptcha from './_common/text-captcha.vue'
+
+
+const props = defineProps<{
+  schema: any
+  errors?: FormErrors
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+const captchaRef = ref<InstanceType<typeof TextCaptcha> | null>(null)
+const captchaValid = ref(false)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: InstallationFormData = {
+    name: values.name || '',
+    code: values.code || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+function onCaptchaUpdate(valid: boolean) {
+  captchaValid.value = valid
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+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"
+    validation-mode="onSubmit" 
+  >
+      <div class="border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+
+          <InputBase
+            field-name="name"
+            label="Nama"
+            placeholder="Masukkan Nama"
+            :errors="errors"/>
+          <InputBase
+            field-name="email"
+            label="Email"
+            placeholder="Masukkan Email"
+            :errors="errors"/>
+
+          <div class="mt-2">
+            <Label class="" for="password">Password</Label>
+            <Field class="" id="password" :errors="errors">
+              <FormField v-slot="{ componentField }" name="password">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="password"
+                      v-bind="componentField"
+                      type="password"
+                      class="w-full"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </div>
+
+          <TextCaptcha
+            ref="captchaRef"
+            :length="5"
+            :useSpacing="true"
+            :noiseChars="true"
+            @update:valid="onCaptchaUpdate"
+          />
+
+        </div>
+      </div>
+  </Form>
+</template>
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/chemotherapy/process.vue b/app/components/content/chemotherapy/process.vue
index 7f355b4b..5cd0b452 100644
--- a/app/components/content/chemotherapy/process.vue
+++ b/app/components/content/chemotherapy/process.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import EncounterHome from '~/components/content/encounter/home.vue'
+import Process from '~/components/content/encounter/process.vue'
 </script>
 
 <template>
-  <EncounterHome classes="chemotherapy" />
+  <Process display="menu" class-code="ambulatory" sub-class-code="chemo" />
 </template>
diff --git a/app/components/content/consultation/list.vue b/app/components/content/consultation/list.vue
index cfce5ae3..d581e530 100644
--- a/app/components/content/consultation/list.vue
+++ b/app/components/content/consultation/list.vue
@@ -43,7 +43,7 @@ interface Props {
 }
 const props = defineProps<Props>()
 
-let units = ref<{ value: string; label: string }[]>([])
+const units = ref<{ value: string; label: string }[]>([])
 const encounterId = ref<number>(props?.encounter?.id || 0)
 const title = ref('')
 
diff --git a/app/components/content/control-letter/list.vue b/app/components/content/control-letter/list.vue
index c9353057..5a879eb4 100644
--- a/app/components/content/control-letter/list.vue
+++ b/app/components/content/control-letter/list.vue
@@ -11,8 +11,20 @@ import { getList, remove } from '~/services/control-letter.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 { PagePermission } from '~/models/role'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import { permissions } from '~/const/page-permission/chemoteraphy'
+import { unauthorizedToast } from '~/lib/utils'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import HistoryDialog from '~/components/app/control-letter/history-dialog.vue'
 // #endregion
 
+// #region Permission
+const roleAccess = permissions['/rehab/encounter'] || {}
+const { getPagePermissions } = useRBAC()
+const pagePermission = getPagePermissions(roleAccess)
+
 // #region State
 const props = defineProps<{
   encounter?: Encounter
@@ -24,6 +36,10 @@ const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSe
   fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
   entityName: 'control-letter',
 })
+const historyData = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: ['person', 'person-Addresses'] }),
+  entityName: 'control-letter-history',
+})
 
 const refSearchNav: RefSearchNav = {
   onClick: () => {
@@ -37,6 +53,10 @@ const refSearchNav: RefSearchNav = {
   },
 }
 
+const isHistoryDialogOpen = ref(false)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+
+const isDocPreviewDialogOpen = ref(false)
 const isRecordConfirmationOpen = ref(false)
 const summaryLoading = ref(false)
 const isRequirementsMet = ref(true)
@@ -44,17 +64,20 @@ const isRequirementsMet = ref(true)
 const recId = ref<number>(0)
 const recAction = ref<string>('')
 const recItem = ref<any>(null)
+const timestamp = ref(new Date().toISOString())
 
 const headerPrep: HeaderPrep = {
   title: "Surat Kontrol",
   icon: 'i-lucide-newspaper',
-  addNav: {
+}
+if (pagePermission.canCreate) {
+  headerPrep.addNav = {
     label: "Surat Kontrol",
     onClick: () => navigateTo({
         name: 'rehab-encounter-id-control-letter-add',
         params: { id: encounterId },
       }),
-  },
+  }
 }
 // #endregion
 
@@ -105,11 +128,12 @@ function handleCancelConfirmation() {
 provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
+provide('timestamp', isLoading)
 provide('table_data_loader', isLoading)
 // #endregion
 
 // #region Watchers
-watch([recId, recAction], () => {
+watch([recId, recAction, timestamp], () => {
   switch (recAction.value) {
     case ActionEvents.showDetail:
       navigateTo({
@@ -119,17 +143,22 @@ watch([recId, recAction], () => {
       break
 
     case ActionEvents.showEdit:
-      // TODO: Handle edit action
-      // isFormEntryDialogOpen.value = true
-      navigateTo({
-        name: 'rehab-encounter-id-control-letter-control_letter_id-edit',
-        params: { id: encounterId, "control_letter_id": recId.value },
-      })
+      if(pagePermission.canUpdate){ 
+        navigateTo({
+          name: 'rehab-encounter-id-control-letter-control_letter_id-edit',
+          params: { id: encounterId, "control_letter_id": recId.value },
+        })
+      } else {
+        unauthorizedToast()
+      }
       break
 
     case ActionEvents.showConfirmDelete:
-      // Trigger confirmation modal open
-      isRecordConfirmationOpen.value = true
+      if(pagePermission.canDelete){
+        isRecordConfirmationOpen.value = true
+      } else {
+        unauthorizedToast()
+      }
       break
   }
 })
@@ -151,8 +180,19 @@ watch([recId, recAction], () => {
       :ref-search-nav="refSearchNav"
       @search="handleSearch" />
 
+    <div class="mb-3 flex justify-end items-center">
+      <Button variant="outline"
+        class="gap-1 bg-transparent items-center text-orange-400 border-orange-400"
+        @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">
+      <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 }">
@@ -172,5 +212,13 @@ watch([recId, recAction], () => {
         </div>
       </template>
     </RecordConfirmation>
+    
+      <HistoryDialog
+        v-model:is-modal-open="isHistoryDialogOpen"
+        :data="historyData.data.value"
+        :pagination-meta="historyData.paginationMeta"
+        @page-change="historyData.handlePageChange"
+      />
+
   </div>
 </template>
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/entry.vue b/app/components/content/cprj/entry.vue
new file mode 100644
index 00000000..5769e967
--- /dev/null
+++ b/app/components/content/cprj/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/cprj/form.vue b/app/components/content/cprj/form.vue
new file mode 100644
index 00000000..ef2a51d7
--- /dev/null
+++ b/app/components/content/cprj/form.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { z } from 'zod'
+import Entry from '~/components/app/cprj/entry.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 { CprjSoapiSchema } 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 fungsional = ref([])
+const schema = CprjSoapiSchema
+const payload = ref({
+  encounter_id: 0,
+  time: '',
+  typeCode: 'dev-record',
+  value: '',
+})
+const model = ref({
+  ppa: '',
+  ppa_name: '',
+  subjective: '',
+  objective: '',
+  assesment: '',
+  plan: '',
+  review: '',
+})
+
+const isLoading = reactive<DataTableLoader>({
+  isTableLoading: false,
+})
+
+onMounted(() => {})
+
+const cprjRef = ref()
+async function actionHandler(type: string) {
+  if (type === 'back') {
+    backToList()
+    return
+  }
+  const result = await cprjRef.value?.validate()
+  console.log('result', result)
+  if (result?.valid) {
+    console.log('data', result.data)
+    handleActionSave(
+      {
+        ...payload.value,
+        value: JSON.stringify(result.data),
+        encounter_id: +route.params.id,
+        time: new Date().toISOString(),
+      },
+      {},
+      toast,
+    )
+  } else {
+    console.log('Ada error di form', result)
+  }
+}
+
+provide('table_data_loader', isLoading)
+</script>
+<template>
+  <Entry
+    ref="cprjRef"
+    v-model="model"
+    :schema="schema"
+    type="function"
+  />
+  <div class="my-2 flex justify-end py-2">
+    <Action @click="actionHandler" />
+  </div>
+</template>
diff --git a/app/components/content/cprj/list.vue b/app/components/content/cprj/list.vue
new file mode 100644
index 00000000..6da61716
--- /dev/null
+++ b/app/components/content/cprj/list.vue
@@ -0,0 +1,183 @@
+<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/soapi/list.vue'
+import Entry from '~/components/app/cprj/entry.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/consultation.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 {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getMyList,
+} = usePaginatedList({
+  fetchFn: async ({ page, search }) => {
+    const result = await getList({
+      'encounter-id': id,
+      'type-code': 'dev-record',
+      includes: 'encounter',
+      search,
+      page,
+    })
+    if (result.success) {
+      data.value = result.body.data
+    }
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'cprj',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'CPRJ',
+  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
+  }
+}
+
+// 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"
+  />
+
+  <List
+    :data="data"
+    :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/document-upload/list.vue b/app/components/content/document-upload/list.vue
index d1f6fbad..7f7631d9 100644
--- a/app/components/content/document-upload/list.vue
+++ b/app/components/content/document-upload/list.vue
@@ -20,8 +20,8 @@ const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
 const { getPagePermissions } = useRBAC()
 const pagePermission = getPagePermissions(roleAccess)
 
-const {user,userRole} = useUserStore()
-const {getUserPermissions} = useRBAC()
+// const {user,userRole} = useUserStore()
+// const {getUserPermissions} = useRBAC()
 // #endregion
 
 // #region State
@@ -121,6 +121,7 @@ watch([recId, recAction, timestamp], () => {
     case ActionEvents.showDetail:
       isDocPreviewDialogOpen.value = true
       break
+
     case ActionEvents.showEdit:
       if(pagePermission.canUpdate){
         navigateTo({
@@ -131,22 +132,13 @@ watch([recId, recAction, timestamp], () => {
         unauthorizedToast()
       }
       break
+
     case ActionEvents.showConfirmDelete:
       if(pagePermission.canDelete){
         isRecordConfirmationOpen.value = true
       } else {
         unauthorizedToast()
       }
-      navigateTo(recItem.value.filePath, { external: true, open: { target: '_blank' } })
-      break
-    case ActionEvents.showEdit:
-      navigateTo({
-        name: 'rehab-encounter-id-document-upload-document_id-edit',
-        params: { id: encounterId, "document_id": recId.value },
-      })
-      break
-    case ActionEvents.showConfirmDelete:
-      isRecordConfirmationOpen.value = true
       break
   }
 })
diff --git a/app/components/content/encounter/detail.vue b/app/components/content/encounter/detail.vue
new file mode 100644
index 00000000..5f2255c5
--- /dev/null
+++ b/app/components/content/encounter/detail.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { computed, ref, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+// Components
+import EncounterPatientInfo from '~/components/app/encounter/patient-info.vue'
+
+// Models
+import { genEncounter } from '~/models/encounter'
+
+// Handlers
+import { getEncounterData } from '~/handlers/encounter-process.handler'
+
+const route = useRoute()
+const router = useRouter()
+
+const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const data = ref<any>(genEncounter())
+const isShowPatient = computed(() => data.value && data.value?.patient?.person)
+
+async function getData() {
+  data.value = await getEncounterData(id)
+}
+
+onMounted(async () => {
+  await getData()
+})
+
+function handleClick(type: string) {
+  if (type === 'draft') {
+    router.back()
+  }
+}
+</script>
+
+<template>
+  <div class="w-full">
+    <div class="mb-4">
+      <PubMyUiNavContentBa label="Kembali ke Daftar Kunjungan" @click="handleClick" />
+    </div>
+    <EncounterPatientInfo v-if="isShowPatient" :data="data" />
+  </div>
+</template>
diff --git a/app/components/content/encounter/entry.vue b/app/components/content/encounter/entry.vue
index 78297754..a06a4165 100644
--- a/app/components/content/encounter/entry.vue
+++ b/app/components/content/encounter/entry.vue
@@ -1,43 +1,18 @@
 <script setup lang="ts">
 // Components
-import { toast } from '~/components/pub/ui/toast'
 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'
-
-// Types
-import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
-import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
-
-// Constants
-import { paymentTypes, sepRefTypeCodes, participantGroups } from '~/lib/constants.vclaim'
-
-// Services
-import {
-  getList as getSpecialistList,
-  getValueTreeItems as getSpecialistTreeItems,
-} from '~/services/specialist.service'
-import { getValueLabelList as getDoctorValueLabelList } from '~/services/doctor.service'
-import { create as createEncounter, getDetail as getEncounterDetail, update as updateEncounter } from '~/services/encounter.service'
-import { getList as getSepList } from '~/services/vclaim-sep.service'
+import AppViewHistory from '~/components/app/sep/view-history.vue'
 
 // Helpers
 import { refDebounced } from '@vueuse/core'
 
 // Handlers
-import {
-  patients,
-  selectedPatient,
-  selectedPatientObject,
-  paginationMeta,
-  getPatientsList,
-  getPatientCurrent,
-  getPatientByIdentifierSearch,
-} from '~/handlers/patient.handler'
-
-// Stores
-import { useUserStore } from '~/stores/user'
+import { useEncounterEntry } from '~/handlers/encounter-entry.handler'
+import { useIntegrationSepEntry } from '~/handlers/integration-sep-entry.handler'
 
+// Props
 const props = defineProps<{
   id: number
   classCode?: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
@@ -46,54 +21,48 @@ const props = defineProps<{
 }>()
 
 const route = useRoute()
-const userStore = useUserStore()
-const openPatient = ref(false)
-const isLoading = reactive<DataTableLoader>({
-  isTableLoading: false,
-})
-const paymentsList = ref<Array<{ value: string; label: string }>>([])
-const sepsList = ref<Array<{ value: string; label: string }>>([])
-const participantGroupsList = ref<Array<{ value: string; label: string }>>([])
-const specialistsTree = ref<TreeItem[]>([])
-const specialistsData = ref<any[]>([]) // Store full specialist data with id
-const doctorsList = ref<Array<{ value: string; label: string }>>([])
-const recSelectId = ref<number | null>(null)
-const isSaving = ref(false)
-const isLoadingDetail = ref(false)
 const formRef = ref<InstanceType<typeof AppEncounterEntryForm> | null>(null)
-const encounterData = ref<any>(null)
-const formObjects = ref<any>({})
 
-// SEP validation state
-const isSepValid = ref(false)
-const isCheckingSep = ref(false)
-const sepNumber = ref('')
+const {
+  paymentsList,
+  sepNumber,
+  sepsList,
+  participantGroupsList,
+  specialistsTree,
+  doctorsList,
+  recSelectId,
+  isLoadingDetail,
+  formObjects,
+  openPatient,
+  isMemberValid,
+  isSepValid,
+  isCheckingSep,
+  isSaveDisabled,
+  isLoading,
+  patients,
+  selectedDoctor,
+  selectedPatient,
+  selectedPatientObject,
+  paginationMeta,
+  toNavigateSep,
+  getListPath,
+  handleInit,
+  getFetchEncounterDetail,
+  handleSaveEncounter,
+  getPatientsList,
+  getPatientCurrent,
+  getPatientByIdentifierSearch,
+  // getIsSubspecialist,
+  getDoctorInfo,
+  getValidateMember,
+  getValidateSepNumber,
+  handleFetchDoctors,
+} = useEncounterEntry(props)
+const { recSepId, openHistory, histories, getMonitoringHistoryMappers } = useIntegrationSepEntry()
+
 const debouncedSepNumber = refDebounced(sepNumber, 500)
 
-// Computed for edit mode
-const isEditMode = computed(() => props.id > 0)
-
-// Computed for save button disable state
-const isSaveDisabled = computed(() => {
-  return !selectedPatient.value || !selectedPatientObject.value || isSaving.value || isLoadingDetail.value
-})
-
-function getListPath(): string {
-  if (props.classCode === 'ambulatory' && props.subClassCode === 'rehab') {
-    return '/rehab/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'
-  }
-  return '/encounter' // fallback
-}
-
+///// Functions
 function handleSavePatient() {
   selectedPatientObject.value = null
   setTimeout(() => {
@@ -101,140 +70,15 @@ function handleSavePatient() {
   }, 150)
 }
 
-function toKebabCase(str: string): string {
-  return str.replace(/([A-Z])/g, '-$1').toLowerCase()
+function handleSaveClick() {
+  if (formRef.value && typeof formRef.value.submitForm === 'function') {
+    formRef.value.submitForm()
+  }
 }
 
-function toNavigateSep(values: any) {
-  const queryParams = new URLSearchParams()
-  if (values['subSpecialistCode']) {
-    const isSub = isSubspecialist(values['subSpecialistCode'], specialistsTree.value)
-    if (!isSub) {
-      values['specialistCode'] = values['subSpecialistCode']
-      delete values['subSpecialistCode']
-    }
-  }
-
-  Object.keys(values).forEach((field) => {
-    if (values[field]) {
-      queryParams.append(toKebabCase(field), values[field])
-    }
-  })
-
-  navigateTo('/integration/bpjs/sep/add' + `?${queryParams.toString()}`)
-}
-
-async function handleSaveEncounter(formValues: any) {
-  // Validate patient is selected
-  if (!selectedPatient.value || !selectedPatientObject.value) {
-    toast({
-      title: 'Gagal',
-      description: 'Pasien harus dipilih terlebih dahulu',
-      variant: 'destructive',
-    })
-    return
-  }
-
-  try {
-    isSaving.value = true
-
-    // Get employee_id from user store
-    const employeeId = userStore.user?.employee_id || userStore.user?.employee?.id || 0
-
-    // Format date to ISO format
-    const formatDate = (dateString: string): string => {
-      if (!dateString) return ''
-      const date = new Date(dateString)
-      return date.toISOString()
-    }
-
-    // Get specialist_id and subspecialist_id from TreeSelect value (code)
-    const { specialist_id, subspecialist_id } = getSpecialistIdsFromCode(formValues.subSpecialistId || '')
-
-    // Build payload
-    const payload: any = {
-      patient_id: selectedPatientObject.value?.id || Number(selectedPatient.value),
-      registeredAt: formatDate(formValues.registerDate),
-      visitDate: formatDate(formValues.registerDate),
-      class_code: props.classCode || '',
-      subClass_code: props.subClassCode || '',
-      infra_id: null,
-      unit_id: null,
-      appointment_doctor_id: Number(formValues.doctorId),
-      responsible_doctor_id: Number(formValues.doctorId),
-      paymentType: formValues.paymentType,
-      cardNumber: formValues.cardNumber,
-      refSource_name: '',
-      appointment_id: null,
-    }
-
-    if (employeeId && employeeId > 0) {
-      payload.adm_employee_id = employeeId
-    }
-
-    // Add specialist_id and subspecialist_id if available
-    if (specialist_id) {
-      payload.specialist_id = specialist_id
-    }
-    if (subspecialist_id) {
-      payload.subspecialist_id = subspecialist_id
-    }
-
-    let paymentMethod = 'cash'
-    if (formValues.paymentType === 'jkn' || formValues.paymentType === 'jkmm') {
-      paymentMethod = 'insurance'
-    } else if (formValues.paymentType === 'spm') {
-      paymentMethod = 'cash'
-    } else if (formValues.paymentType === 'pks') {
-      paymentMethod = 'membership'
-    }
-
-    if (paymentMethod === 'insurance') {
-      payload.paymentMethod_code = paymentMethod
-      payload.insuranceCompany_id = null
-      payload.member_number = formValues.cardNumber
-      payload.ref_number = formValues.sepNumber
-    }
-
-    // Add visitMode_code and allocatedVisitCount only if classCode is ambulatory
-    if (props.classCode === 'ambulatory') {
-      payload.visitMode_code = 'adm'
-      payload.allocatedVisitCount = 0
-    }
-
-    // Call encounter service - use update if edit mode, create otherwise
-    let result
-    if (isEditMode.value) {
-      result = await updateEncounter(props.id, payload)
-    } else {
-      result = await createEncounter(payload)
-    }
-
-    if (result.success) {
-      toast({
-        title: 'Berhasil',
-        description: isEditMode.value ? 'Kunjungan berhasil diperbarui' : 'Kunjungan berhasil dibuat',
-        variant: 'default',
-      })
-      // Redirect to list page
-      await navigateTo(getListPath())
-    } else {
-      const errorMessage = result.body?.message || (isEditMode.value ? 'Gagal memperbarui kunjungan' : 'Gagal membuat kunjungan')
-      toast({
-        title: 'Gagal',
-        description: errorMessage,
-        variant: 'destructive',
-      })
-    }
-  } catch (error: any) {
-    console.error('Error saving encounter:', error)
-    toast({
-      title: 'Gagal',
-      description: error?.message || (isEditMode.value ? 'Gagal memperbarui kunjungan' : 'Gagal membuat kunjungan'),
-      variant: 'destructive',
-    })
-  } finally {
-    isSaving.value = false
+function handleFetch(value?: any) {
+  if (value?.subSpecialistId) {
+    handleFetchDoctors(value.subSpecialistId)
   }
 }
 
@@ -246,22 +90,33 @@ async function handleEvent(menu: string, value?: any) {
   } else if (menu === 'add') {
     navigateTo('/client/patient/add')
   } else if (menu === 'add-sep') {
-    // If SEP is already valid, don't navigate
     if (isSepValid.value) {
       return
     }
-    recSelectId.value = null
     toNavigateSep({
       isService: 'false',
+      encounterId: props.id || null,
       sourcePath: route.path,
       resource: `${props.classCode}-${props.subClassCode}`,
       ...value,
     })
   } else if (menu === 'sep-number-changed') {
-    // Update sepNumber when it changes in form (only if different to prevent loop)
-    if (sepNumber.value !== value) {
-      sepNumber.value = 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') {
@@ -269,433 +124,37 @@ async function handleEvent(menu: string, value?: any) {
   }
 }
 
-// Handle save button click
-function handleSaveClick() {
-  console.log('🔵 handleSaveClick called')
-  console.log('🔵 formRef:', formRef.value)
-  console.log('🔵 isSaveDisabled:', isSaveDisabled.value)
-  console.log('🔵 selectedPatient:', selectedPatient.value)
-  console.log('🔵 selectedPatientObject:', selectedPatientObject.value)
-  console.log('🔵 isSaving:', isSaving.value)
-  console.log('🔵 isLoadingDetail:', isLoadingDetail.value)
-  
-  if (formRef.value && typeof formRef.value.submitForm === 'function') {
-    console.log('🔵 Calling formRef.value.submitForm()')
-    formRef.value.submitForm()
-  } else {
-    console.error('❌ formRef.value is null or submitForm is not a function')
-  }
-}
+provide('rec_select_id', recSelectId)
+provide('rec_sep_id', recSepId)
+provide('table_data_loader', isLoading)
 
-/**
- * Validate SEP number
- */
-async function validateSepNumber(sepNumberValue: string) {
-  // Reset validation if SEP number is empty
-  if (!sepNumberValue || sepNumberValue.trim() === '') {
-    isSepValid.value = false
-    isCheckingSep.value = false
-    return
-  }
-
-  // Only check if payment type is JKN
-  // We need to check from formObjects
-  const paymentType = formObjects.value?.paymentType
-  if (paymentType !== 'jkn') {
-    isSepValid.value = false
-    return
-  }
-
-  try {
-    isCheckingSep.value = true
-    const result = await getSepList({ number: sepNumberValue.trim() })
-    
-    // Check if SEP is found
-    // If response is not null, SEP is found
-    // If response is null with metaData code "201", SEP is not found
-    if (result.success && result.body?.response !== null) {
-      isSepValid.value = true
-    } else {
-      // SEP not found (response null with metaData code "201")
-      isSepValid.value = false
-    }
-  } catch (error) {
-    console.error('Error checking SEP:', error)
-    isSepValid.value = false
-  } finally {
-    isCheckingSep.value = false
-  }
-}
-
-// Watch debounced SEP number to validate
 watch(debouncedSepNumber, async (newValue) => {
-  await validateSepNumber(newValue)
+  await getValidateSepNumber(newValue)
 })
 
-// Watch payment type to reset SEP validation
 watch(
   () => formObjects.value?.paymentType,
   (newValue) => {
     isSepValid.value = false
-    // If payment type is not JKN, clear SEP number
     if (newValue !== 'jkn') {
       sepNumber.value = ''
     }
   },
 )
 
-async function handleFetchSpecialists() {
-  try {
-    const specialistsResult = await getSpecialistList({ 'page-size': 100, includes: 'subspecialists' })
-    if (specialistsResult.success) {
-      const specialists = specialistsResult.body?.data || []
-      specialistsData.value = specialists // Store full data for mapping
-      specialistsTree.value = getSpecialistTreeItems(specialists)
+watch(
+  () => props.id,
+  async (newId) => {
+    if (props.formType === 'edit' && newId > 0) {
+      await getFetchEncounterDetail()
     }
-  } catch (error) {
-    console.error('Error fetching specialist-subspecialist tree:', error)
-  }
-}
-
-/**
- * Helper function to check if a value exists in the specialistsTree
- * Returns true if it's a leaf node (subspecialist), false if parent node (specialist)
- */
-function isSubspecialist(value: string, items: TreeItem[]): boolean {
-  for (const item of items) {
-    if (item.value === value) {
-      // If this item has children, it's not selected, so skip
-      // If this is the selected item, check if it has children in the tree
-      return false // This means it's a specialist, not a subspecialist
-    }
-    if (item.children) {
-      for (const child of item.children) {
-        if (child.value === value) {
-          // This is a subspecialist (leaf node)
-          return true
-        }
-      }
-    }
-  }
-  return false
-}
-
-/**
- * Helper function to get specialist/subspecialist code from ID
- * Returns code string or null if not found
- */
-function getSpecialistCodeFromId(id: number | null | undefined): string | null {
-  if (!id) return null
-
-  // First check if encounter has specialist object with code
-  if (encounterData.value?.specialist?.id === id) {
-    return encounterData.value.specialist.code || null
-  }
-
-  // Search in specialistsData
-  for (const specialist of specialistsData.value) {
-    if (specialist.id === id) {
-      return specialist.code || null
-    }
-    // Check subspecialists
-    if (specialist.subspecialists && Array.isArray(specialist.subspecialists)) {
-      for (const subspecialist of specialist.subspecialists) {
-        if (subspecialist.id === id) {
-          return subspecialist.code || null
-        }
-      }
-    }
-  }
-
-  return null
-}
-
-/**
- * Helper function to get subspecialist code from ID
- * Returns code string or null if not found
- */
-function getSubspecialistCodeFromId(id: number | null | undefined): string | null {
-  if (!id) return null
-
-  // First check if encounter has subspecialist object with code
-  if (encounterData.value?.subspecialist?.id === id) {
-    return encounterData.value.subspecialist.code || null
-  }
-
-  // Search in specialistsData
-  for (const specialist of specialistsData.value) {
-    if (specialist.subspecialists && Array.isArray(specialist.subspecialists)) {
-      for (const subspecialist of specialist.subspecialists) {
-        if (subspecialist.id === id) {
-          return subspecialist.code || null
-        }
-      }
-    }
-  }
-
-  return null
-}
-
-/**
- * Helper function to find specialist_id and subspecialist_id from TreeSelect value (code)
- * Returns { specialist_id: number | null, subspecialist_id: number | null }
- */
-function getSpecialistIdsFromCode(code: string): { specialist_id: number | null; subspecialist_id: number | null } {
-  if (!code) {
-    return { specialist_id: null, subspecialist_id: null }
-  }
-
-  // Check if it's a subspecialist
-  const isSub = isSubspecialist(code, specialistsTree.value)
-
-  if (isSub) {
-    // Find subspecialist and its parent specialist
-    for (const specialist of specialistsData.value) {
-      if (specialist.subspecialists && Array.isArray(specialist.subspecialists)) {
-        for (const subspecialist of specialist.subspecialists) {
-          if (subspecialist.code === code) {
-            return {
-              specialist_id: specialist.id ? Number(specialist.id) : null,
-              subspecialist_id: subspecialist.id ? Number(subspecialist.id) : null,
-            }
-          }
-        }
-      }
-    }
-  } else {
-    // It's a specialist
-    for (const specialist of specialistsData.value) {
-      if (specialist.code === code) {
-        return {
-          specialist_id: specialist.id ? Number(specialist.id) : null,
-          subspecialist_id: null,
-        }
-      }
-    }
-  }
-
-  return { specialist_id: null, subspecialist_id: null }
-}
-
-async function handleFetchDoctors(subSpecialistId: string | null = null) {
-  try {
-    // Build filter based on selection type
-    const filterParams: any = { 'page-size': 100, includes: 'employee-Person' }
-
-    if (!subSpecialistId) {
-      const doctors = await getDoctorValueLabelList(filterParams)
-      doctorsList.value = doctors
-      return
-    }
-
-    // Check if the selectd value is a subspecialist or specialist
-    const isSub = isSubspecialist(subSpecialistId, specialistsTree.value)
-
-    if (isSub) {
-      // If selected is subspecialist, filter by subspecialist-id
-      filterParams['subspecialist-id'] = subSpecialistId
-    } else {
-      // If selected is specialist, filter by specialist-id
-      filterParams['specialist-id'] = subSpecialistId
-    }
-
-    const doctors = await getDoctorValueLabelList(filterParams)
-    doctorsList.value = doctors
-  } catch (error) {
-    console.error('Error fetching doctors:', error)
-    doctorsList.value = []
-  }
-}
-
-function handleFetch(value?: any) {
-  if (value?.subSpecialistId) {
-    // handleFetchDoctors(value.subSpecialistId)
-  }
-}
-
-async function handleInit() {
-  selectedPatientObject.value = null
-  paymentsList.value = Object.keys(paymentTypes).map((item) => ({
-    value: item.toString(),
-    label: paymentTypes[item],
-  })) as any
-  sepsList.value = Object.keys(sepRefTypeCodes).map((item) => ({
-    value: item.toString(),
-    label: sepRefTypeCodes[item],
-  })) as any
-  participantGroupsList.value = Object.keys(participantGroups).map((item) => ({
-    value: item.toString(),
-    label: participantGroups[item],
-  })) as any
-  // Fetch tree data
-  await handleFetchDoctors()
-  await handleFetchSpecialists()
-}
-
-/**
- * Load encounter detail data for edit mode
- */
-async function loadEncounterDetail() {
-  if (!isEditMode.value || props.id <= 0) {
-    return
-  }
-
-  try {
-    isLoadingDetail.value = true
-    // Include patient, person, specialist, and subspecialist in the response
-    const result = await getEncounterDetail(props.id, {
-      includes: 'patient,patient-person,specialist,subspecialist',
-    })
-    if (result.success && result.body?.data) {
-      encounterData.value = result.body.data
-      await mapEncounterToForm(encounterData.value)
-      // Set loading to false after mapping is complete
-      isLoadingDetail.value = false
-    } else {
-      toast({
-        title: 'Gagal',
-        description: 'Gagal memuat data kunjungan',
-        variant: 'destructive',
-      })
-      // Redirect to list page if encounter not found
-      await navigateTo(getListPath())
-    }
-  } catch (error: any) {
-    console.error('Error loading encounter detail:', error)
-    toast({
-      title: 'Gagal',
-      description: error?.message || 'Gagal memuat data kunjungan',
-      variant: 'destructive',
-    })
-    // Redirect to list page on error
-    await navigateTo(getListPath())
-  } finally {
-    isLoadingDetail.value = false
-  }
-}
-
-/**
- * Map encounter data to form fields
- */
-async function mapEncounterToForm(encounter: any) {
-  if (!encounter) return
-
-  // Set patient data - use data from response if available
-  if (encounter.patient) {
-    selectedPatient.value = String(encounter.patient.id)
-    selectedPatientObject.value = encounter.patient
-    // Only fetch patient if person data is missing
-    if (!encounter.patient.person) {
-      await getPatientCurrent(selectedPatient.value)
-    }
-  }
-
-  // Map form fields
-  const formData: any = {}
-
-  // Patient data (readonly, populated from selected patient)
-  // Use encounter.patient.person which is already in the response
-  if (encounter.patient?.person) {
-    formData.patientName = encounter.patient.person.name || ''
-    formData.nationalIdentity = encounter.patient.person.residentIdentityNumber || ''
-    formData.medicalRecordNumber = encounter.patient.number || ''
-  } else if (selectedPatientObject.value?.person) {
-    // Fallback to selectedPatientObject if encounter.patient.person is not available
-    formData.patientName = selectedPatientObject.value.person.name || ''
-    formData.nationalIdentity = selectedPatientObject.value.person.residentIdentityNumber || ''
-    formData.medicalRecordNumber = selectedPatientObject.value.number || ''
-  }
-
-  // Doctor ID
-  const doctorId = encounter.appointment_doctor_id || encounter.responsible_doctor_id
-  if (doctorId) {
-    formData.doctorId = String(doctorId)
-  }
-
-  // Specialist/Subspecialist - use helper function to get code from ID
-  // Priority: subspecialist_id > specialist_id
-  if (encounter.subspecialist_id) {
-    const subspecialistCode = getSubspecialistCodeFromId(encounter.subspecialist_id)
-    if (subspecialistCode) {
-      formData.subSpecialistId = subspecialistCode
-    }
-  } else if (encounter.specialist_id) {
-    const specialistCode = getSpecialistCodeFromId(encounter.specialist_id)
-    if (specialistCode) {
-      formData.subSpecialistId = specialistCode
-    }
-  }
-  
-  // Fallback: if encounter has specialist/subspecialist object with code
-  if (!formData.subSpecialistId) {
-    if (encounter.subspecialist?.code) {
-      formData.subSpecialistId = encounter.subspecialist.code
-    } else if (encounter.specialist?.code) {
-      formData.subSpecialistId = encounter.specialist.code
-    }
-  }
-
-  // Register date
-  if (encounter.registeredAt) {
-    // Convert ISO date to local date string (YYYY-MM-DD)
-    const date = new Date(encounter.registeredAt)
-    formData.registerDate = date.toISOString().split('T')[0]
-  } else if (encounter.visitDate) {
-    const date = new Date(encounter.visitDate)
-    formData.registerDate = date.toISOString().split('T')[0]
-  }
-
-  // Payment data - use fields directly from encounter
-  // Map paymentMethod_code to paymentType
-  if (encounter.paymentMethod_code) {
-    // Map paymentMethod_code to paymentType
-    // 'insurance' typically means JKN/JKMM
-    if (encounter.paymentMethod_code === 'insurance') {
-      formData.paymentType = 'jkn' // Default to JKN for insurance
-    } else {
-      // For other payment methods, use the code directly if it matches
-      // Otherwise default to 'spm'
-      const validPaymentTypes = ['jkn', 'jkmm', 'spm', 'pks']
-      if (validPaymentTypes.includes(encounter.paymentMethod_code)) {
-        formData.paymentType = encounter.paymentMethod_code
-      } else {
-        formData.paymentType = 'spm' // Default to SPM
-      }
-    }
-  } else {
-    // If paymentMethod_code is empty or null, default to 'spm'
-    formData.paymentType = 'spm'
-  }
-
-  // Map payment fields directly from encounter
-  formData.cardNumber = encounter.member_number || ''
-  formData.sepNumber = encounter.ref_number || ''
-
-  // Note: patientCategory and sepType might not be available in the response
-  // These fields might need to be set manually or fetched from other sources
-
-  // Set form objects for the form component
-  formObjects.value = formData
-
-  // Update sepNumber for validation
-  if (formData.sepNumber) {
-    sepNumber.value = formData.sepNumber
-  }
-
-  // Fetch doctors based on specialist/subspecialist selection
-  if (formData.subSpecialistId) {
-    await handleFetchDoctors(formData.subSpecialistId)
-  }
-}
-
-provide('rec_select_id', recSelectId)
-provide('table_data_loader', isLoading)
+  },
+)
 
 onMounted(async () => {
   await handleInit()
-  // Load encounter detail if in edit mode
-  if (isEditMode.value) {
-    await loadEncounterDetail()
+  if (props.formType === 'edit' && props.id > 0) {
+    await getFetchEncounterDetail()
   }
 })
 </script>
@@ -706,26 +165,29 @@ onMounted(async () => {
       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"
     :seps="sepsList"
     :participant-groups="participantGroupsList"
     :specialists="specialistsTree"
-    :doctor="doctorsList"
+    :doctorItems="doctorsList"
+    :selectedDoctor="selectedDoctor"
     :patient="selectedPatientObject"
     :objects="formObjects"
+    @on-select-doctor="getDoctorInfo"
     @event="handleEvent"
     @fetch="handleFetch"
   />
-
   <AppViewPatient
     v-model:open="openPatient"
     v-model:selected="selectedPatient"
@@ -744,7 +206,11 @@ onMounted(async () => {
     "
     @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/home.vue b/app/components/content/encounter/home.vue
deleted file mode 100644
index 1f2c2943..00000000
--- a/app/components/content/encounter/home.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-
-import { getDetail } from '~/services/encounter.service'
-
-import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
-import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
-
-// PLASE ORDER BY TAB POSITION
-import Status from '~/components/content/encounter/status.vue'
-import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
-import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
-import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
-import PrescriptionList from '~/components/content/prescription/list.vue'
-import Consultation from '~/components/content/consultation/list.vue'
-import ProtocolList from '~/components/app/chemotherapy/list.protocol.vue'
-import MedicineProtocolList from '~/components/app/chemotherapy/list.medicine.vue'
-
-const route = useRoute()
-const router = useRouter()
-
-const props = defineProps<{
-  classes?: string
-}>()
-
-// activeTab selalu sinkron dengan query param
-const activeTab = computed({
-  get: () => (route.query?.tab && typeof route.query.tab === 'string' ? route.query.tab : 'status'),
-  set: (val: string) => {
-    router.replace({ path: route.path, query: { tab: val } })
-  },
-})
-
-const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
-// const dataRes = await getDetail(id, {
-//   includes:
-//     'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person',
-// })
-// const dataResBody = dataRes.body ?? null
-// const data = dataResBody?.data ?? null
-
-// Dummy data so AppEncounterQuickInfo can render in development/storybook
-// Replace with real API result when available (see commented fetch below)
-const data = ref<any>({
-  patient: {
-    number: 'RM-2025-0001',
-    person: {
-      name: 'John Doe',
-      birthDate: '1980-01-01T00:00:00Z',
-      gender_code: 'M',
-      addresses: [{ address: 'Jl. Contoh No.1, Jakarta' }],
-      frontTitle: '',
-      endTitle: '',
-    },
-  },
-  visitDate: new Date().toISOString(),
-  unit: { name: 'Onkologi' },
-  responsible_doctor: null,
-  appointment_doctor: { employee: { person: { name: 'Dr. Clara Smith', frontTitle: 'Dr.', endTitle: 'Sp.OG' } } },
-})
-
-// Dummy rows for ProtocolList (matches keys expected by list-cfg.protocol)
-const protocolRows = [
-  {
-    number: '1',
-    tanggal: new Date().toISOString().substring(0, 10),
-    siklus: 'I',
-    periode: 'Siklus I',
-    kehadiran: 'Hadir',
-    action: '',
-  },
-  {
-    number: '2',
-    tanggal: new Date().toISOString().substring(0, 10),
-    siklus: 'II',
-    periode: 'Siklus II',
-    kehadiran: 'Tidak Hadir',
-    action: '',
-  },
-]
-
-const paginationMeta = {
-  recordCount: protocolRows.length,
-  page: 1,
-  pageSize: 10,
-  totalPage: 1,
-  hasNext: false,
-  hasPrev: false,
-}
-
-const tabsRaws: TabItem[] = [
-  {
-    value: 'status',
-    label: 'Status Masuk/Keluar',
-    groups: ['ambulatory', 'rehabilitation', 'chemotherapy'],
-    component: Status,
-    props: { encounter: data },
-  },
-  {
-    value: 'early-medical-assessment',
-    label: 'Pengkajian Awal Medis',
-    groups: ['ambulatory', 'rehabilitation', 'chemotherapy'],
-    component: EarlyMedicalAssesmentList,
-  },
-  {
-    value: 'rehab-medical-assessment',
-    label: 'Pengkajian Awal Medis Rehabilitasi Medis',
-    groups: ['ambulatory', 'rehabilitation', 'chemotherapy'],
-    component: EarlyMedicalRehabList,
-  },
-  {
-    value: 'function-assessment',
-    label: 'Asesmen Fungsi',
-    groups: ['ambulatory', 'rehabilitation'],
-    component: AssesmentFunctionList,
-  },
-  { value: 'therapy-protocol', groups: ['ambulatory', 'rehabilitation'], label: 'Protokol Terapi' },
-  {
-    value: 'chemotherapy-protocol',
-    label: 'Protokol Kemoterapi',
-    groups: ['chemotherapy'],
-    component: ProtocolList,
-    props: { data: protocolRows, paginationMeta },
-  },
-  {
-    value: 'chemotherapy-medicine',
-    label: 'Protokol Obat Kemoterapi',
-    groups: ['chemotherapy'],
-    component: MedicineProtocolList,
-    props: { data: protocolRows, paginationMeta },
-  },
-  { value: 'report', label: 'Laporan Tindakan', groups: ['chemotherapy'] },
-  { value: 'patient-note', label: 'CPRJ', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  {
-    value: 'education-assessment',
-    label: 'Asesmen Kebutuhan Edukasi',
-    groups: ['ambulatory', 'rehabilitation', 'chemotherapy'],
-  },
-  { value: 'consent', label: 'General Consent', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'patient-note', label: 'CPRJ', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  {
-    value: 'prescription',
-    label: 'Order Obat',
-    groups: ['ambulatory', 'rehabilitation', 'chemotherapy'],
-    component: PrescriptionList,
-  },
-  { value: 'device', label: 'Order Alkes', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'mcu-radiology', label: 'Order Radiologi', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'mcu-lab-pc', label: 'Order Lab PK', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'mcu-lab-micro', label: 'Order Lab Mikro', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'mcu-lab-pa', label: 'Order Lab PA', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'medical-action', label: 'Order Ruang Tindakan', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'mcu-result', label: 'Hasil Penunjang', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  {
-    value: 'consultation',
-    label: 'Konsultasi',
-    groups: ['ambulatory', 'rehabilitation', 'chemotherapy'],
-    component: Consultation,
-    props: { encounter: data },
-  },
-  { value: 'resume', label: 'Resume', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'control', label: 'Surat Kontrol', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'screening', label: 'Skrinning MPP', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-  { value: 'supporting-document', label: 'Upload Dokumen Pendukung', groups: ['ambulatory', 'rehabilitation'] },
-  { value: 'price-list', label: 'Tarif Tindakan', groups: ['ambulatory', 'rehabilitation', 'chemotherapy'] },
-]
-
-const tabs = computed(() => {
-  return tabsRaws
-    .filter((tab: TabItem) => tab.groups ? tab.groups.some((group: string) => props.classes?.includes(group)) : true)
-    .map((tab: TabItem) => {
-      return { ...tab, props: { ...tab.props, encounter: data } }
-    })
-})
-</script>
-
-<template>
-  <div class="w-full">
-    <div class="mb-4">
-      <PubMyUiNavContentBa label="Kembali ke Daftar Kunjungan" />
-    </div>
-    <AppEncounterQuickInfo :data="data" />
-    <CompTab
-      :data="tabs"
-      :initial-active-tab="activeTab"
-      @change-tab="activeTab = $event"
-    />
-  </div>
-</template>
diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index 655a553d..3aeb1254 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -1,31 +1,51 @@
 <script setup lang="ts">
-// Components
-import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
-import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
-import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
-import Header from '~/components/pub/my-ui/nav-header/prep.vue'
-import Filter from '~/components/pub/my-ui/nav-header/filter.vue'
-import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
-
-// Types
+///// Imports
+// Pub components
 import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
-import type { Summary } from '~/components/pub/my-ui/summary-card/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import { toast } from '~/components/pub/ui/toast'
 import { ActionEvents } from '~/components/pub/my-ui/data/types'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import * as CH from '~/components/pub/my-ui/content-header'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { useSidebar } from '~/components/pub/ui/sidebar/utils'
+
+// App libs
+import { getServicePosition } from '~/lib/roles' // previously getPositionAs
 
 // Services
-import { getList as getEncounterList, remove as removeEncounter } from '~/services/encounter.service'
+import {
+  getList as getEncounterList,
+  remove as removeEncounter,
+  cancel as cancelEncounter,
+} from '~/services/encounter.service'
 
-// UI
-import { toast } from '~/components/pub/ui/toast'
+// Apps
+import Content from '~/components/app/encounter/list.vue'
+import FilterNav from '~/components/app/encounter/filter-nav.vue'
+import FilterForm from '~/components/app/encounter/filter-form.vue'
 
+// Props
 const props = defineProps<{
-  classCode?: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
+  classCode?: 'ambulatory' | 'emergency' | 'inpatient'
   subClassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
-  type: string
+  canCreate?: boolean
+  canUpdate?: boolean
+  canDelete?: boolean
 }>()
 
+///// Declarations and Flows
+// Sidebar automation
+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,
@@ -33,79 +53,104 @@ const isLoading = reactive<DataTableLoader>({
 const recId = ref<number>(0)
 const recAction = ref<string>('')
 const recItem = ref<any>(null)
-const isFormEntryDialogOpen = ref(false)
+const isFilterFormDialogOpen = ref(false)
 const isRecordConfirmationOpen = ref(false)
+const isRecordCancelOpen = ref(false)
 
-const hreaderPrep: HeaderPrep = {
+// Headers
+const hreaderPrep: CH.Config = {
   title: 'Kunjungan',
   icon: 'i-lucide-users',
   addNav: {
     label: 'Tambah',
     onClick: () => {
-      if (props.classCode === 'ambulatory' && props.subClassCode === 'rehab') {
-        navigateTo('/rehab/encounter/add')
-      }
-      if (props.classCode === 'ambulatory' && props.subClassCode === 'reg') {
-        navigateTo('/outpatient/encounter/add')
-      }
-      if (props.classCode === 'emergency') {
-        navigateTo('/emergency/encounter/add')
-      }
-      if (props.classCode === 'inpatient') {
-        navigateTo('/inpatient/encounter/add')
-      }
+      navigateTo(`/${props.classCode}/encounter/add`)
     },
   },
 }
-
-const refSearchNav: RefSearchNav = {
-  onClick: () => {
-    // open filter modal
-    isFormEntryDialogOpen.value = true
-    console.log(' 1open filter modal')
-  },
-  onInput: (_val: string) => {
-    // filter patient list
-  },
-  onClear: () => {
-    // clear url param
-  },
+if (!props.canCreate) {
+  delete hreaderPrep.addNav
 }
 
-// Loading state management
+// Filters
+const filter = ref<{
+  installation: {
+    msg: {
+      placeholder: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+  schema: any
+  initialValues?: Partial<any>
+  errors?: any
+}>({
+  installation: {
+    msg: {
+      placeholder: 'Pilih',
+    },
+    items: [],
+  },
+  schema: {},
+})
 
-/**
- * Get base path for encounter routes based on classCode and subClassCode
- */
-function getBasePath(): string {
-  if (props.classCode === 'ambulatory' && props.subClassCode === 'rehab') {
-    return '/rehab/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'
-  }
-  return '/encounter' // fallback
-}
+// Recrod reactivities
+provide('activeServicePosition', activeServicePosition)
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
 
+watch(getActiveRole, (role?: string) => {
+  activeServicePosition.value = getServicePosition(role)
+})
+
+watch(
+  () => recAction.value,
+  () => {
+    const basePath = `/${props.classCode}/encounter`
+    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()
+})
+
+/////// 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)
@@ -114,6 +159,52 @@ 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) {
+    try {
+      const result = await cancelEncounter(record.id)
+      if (result.success) {
+        toast({
+          title: 'Berhasil',
+          description: 'Kunjungan berhasil dibatalkan',
+          variant: 'default',
+        })
+        await getPatientList() // Refresh list
+      } else {
+        const errorMessage = result.body?.message || 'Gagal membatalkan kunjungan'
+        toast({
+          title: 'Gagal',
+          description: errorMessage,
+          variant: 'destructive',
+        })
+      }
+    } catch (error: any) {
+      console.error('Error cancellation encounter:', error)
+      toast({
+        title: 'Gagal',
+        description: error?.message || 'Gagal membatalkan kunjungan',
+        variant: 'destructive',
+      })
+    } finally {
+      // Reset state
+      recId.value = 0
+      recAction.value = ''
+      recItem.value = null
+      isRecordCancelOpen.value = false
+    }
+  }
+}
+
 // Handle confirmation result
 async function handleConfirmDelete(record: any, action: string) {
   if (action === 'delete' && record?.id) {
@@ -156,90 +247,74 @@ function handleCancelConfirmation() {
   recId.value = 0
   recAction.value = ''
   recItem.value = null
-  isRecordConfirmationOpen.value = false
+  isRecordCancelOpen.value = false
 }
 
-watch(
-  () => recAction.value,
-  () => {
-    if (recAction.value === ActionEvents.showConfirmDelete) {
-      isRecordConfirmationOpen.value = true
-      return
-    }
-    
-    const basePath = getBasePath()
-    
-    if (props.type === 'encounter') {
-      if (recAction.value === 'showDetail') {
-        navigateTo(`${basePath}/${recId.value}/detail`)
-      } else if (recAction.value === 'showEdit') {
-        navigateTo(`${basePath}/${recId.value}/edit`)
-      } else if (recAction.value === 'showProcess') {
-        navigateTo(`${basePath}/${recId.value}/process`)
-      } else {
-        // handle other actions
-      }
-    } else if (props.type === 'registration') {
-      // Handle registration type if needed
-      if (recAction.value === 'showDetail') {
-        navigateTo(`${basePath.replace('/encounter', '/registration')}/${recId.value}/detail`)
-      } else if (recAction.value === 'showEdit') {
-        navigateTo(`${basePath.replace('/encounter', '/registration')}/${recId.value}/edit`)
-      } else if (recAction.value === 'showProcess') {
-        navigateTo(`${basePath.replace('/encounter', '/registration')}/${recId.value}/process`)
-      } else {
-        // handle other actions
-      }
-    }
-  },
-)
-
-provide('rec_id', recId)
-provide('rec_action', recAction)
-provide('rec_item', recItem)
-provide('table_data_loader', isLoading)
-
-onMounted(() => {
-  getPatientList()
-})
+function handleRemoveConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+  isRecordConfirmationOpen.value = false
+}
 </script>
 
 <template>
-  <Header
-    :prep="{ ...hreaderPrep }"
-    :ref-search-nav="refSearchNav"
-  />
-  <Separator class="my-4 xl:my-5" />
+  <CH.ContentHeader v-bind="hreaderPrep">
+    <FilterNav
+      :active-positon="activeServicePosition"
+      @apply="handleFilterApply"
+      @onExportPdf="() => {}"
+      @onExportExcel="() => {}"
+      @nExportCsv="() => {}"
+    />
+  </CH.ContentHeader>
 
-  <Filter
-    :prep="hreaderPrep"
-    :ref-search-nav="refSearchNav"
-  />
-
-  <AppEncounterList :data="data" />
+  <Content :data="data" />
 
+  <!-- Filter -->
   <Dialog
-    v-model:open="isFormEntryDialogOpen"
+    v-model:open="isFilterFormDialogOpen"
     title="Filter"
     size="lg"
     prevent-outside
   >
-    <AppEncounterFilter
-      :installation="{
-        msg: { placeholder: 'Pilih' },
-        items: [],
-      }"
-      :schema="{}"
-    />
+    <FilterForm v-bind="filter" />
   </Dialog>
 
-  <!-- Record Confirmation Modal -->
+  <!-- Batal -->
   <RecordConfirmation
+    v-if="canDelete"
+    v-model:open="isRecordCancelOpen"
+    custom-title="Batalkan Kunjungan"
+    custom-message="Apakah anda yakin ingin membatalkan kunjungan pasien berikut?"
+    action="deactivate"
+    :record="recItem"
+    @confirm="handleConfirmCancel"
+    @cancel="handleCancelConfirmation"
+  >
+    <template #default="{ record }">
+      <div class="text-sm">
+        <p v-if="record?.patient?.person?.name">
+          <strong>Nama:</strong>
+          {{ record.patient.person.name }}
+        </p>
+        <p v-if="record?.medical_record_number">
+          <strong>No RM:</strong>
+          {{ record.medical_record_number }}
+        </p>
+      </div>
+    </template>
+  </RecordConfirmation>
+
+  <!-- Hapus -->
+  <RecordConfirmation
+    v-if="canDelete"
     v-model:open="isRecordConfirmationOpen"
     action="delete"
     :record="recItem"
     @confirm="handleConfirmDelete"
-    @cancel="handleCancelConfirmation"
+    @cancel="handleRemoveConfirmation"
   >
     <template #default="{ record }">
       <div class="text-sm">
@@ -258,4 +333,11 @@ onMounted(() => {
       </div>
     </template>
   </RecordConfirmation>
+  <Dialog
+    title="Hapus data"
+    size="md"
+    v-model:open="isRecordConfirmationOpen"
+  >
+    Hak akses tidak memenuhi kriteria untuk proses ini.
+  </Dialog>
 </template>
diff --git a/app/components/content/encounter/process-bu.vue b/app/components/content/encounter/process-bu.vue
new file mode 100644
index 00000000..8285d5e6
--- /dev/null
+++ b/app/components/content/encounter/process-bu.vue
@@ -0,0 +1,116 @@
+<script setup lang="ts">
+//
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+import { getDetail } from '~/services/encounter.service'
+
+//
+import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
+import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
+
+import { genEncounter } from '~/models/encounter'
+
+// PLASE ORDER BY TAB POSITION
+import Status from '~/components/content/encounter/status.vue'
+import AssesmentFunctionList from '~/components/content/soapi/entry.vue'
+import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
+import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
+import DeviceOrder from '~/components/content/device-order/main.vue'
+import Prescription from '~/components/content/prescription/main.vue'
+import CpLabOrder from '~/components/content/cp-lab-order/main.vue'
+import Radiology from '~/components/content/radiology-order/main.vue'
+import Consultation from '~/components/content/consultation/list.vue'
+import Cprj from '~/components/content/cprj/entry.vue'
+import DocUploadList from '~/components/content/document-upload/list.vue'
+import GeneralConsentList from '~/components/content/general-consent/entry.vue'
+import ResumeList from '~/components/content/resume/list.vue'
+import ControlLetterList from '~/components/content/control-letter/list.vue'
+import VaccineDataList from '~/components/content/vaccine-data/list.vue'
+
+const route = useRoute()
+const router = useRouter()
+
+// activeTab selalu sinkron dengan query param
+const activeTab = computed({
+  get: () => (route.query?.tab && typeof route.query.tab === 'string' ? route.query.tab : 'status'),
+  set: (val: string) => {
+    router.replace({ path: route.path, query: { tab: val } })
+  },
+})
+
+const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const data = ref(genEncounter())
+
+async function fetchDetail() {
+  const res = await getDetail(id, {
+    includes:
+      'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person,EncounterDocuments',
+  })
+  if (res.body?.data) data.value = res.body?.data
+}
+
+onMounted(() => {
+  fetchDetail()
+})
+
+const tabs: TabItem[] = [
+  { value: 'status', label: 'Status Masuk/Keluar', component: Status, props: { encounter: data } },
+  {
+    value: 'early-medical-assessment',
+    label: 'Pengkajian Awal Medis',
+    component: EarlyMedicalAssesmentList,
+    props: { encounter: data, type: 'early-medic', label: 'Pengkajian Awal Medis' },
+  },
+  {
+    value: 'rehab-medical-assessment',
+    label: 'Pengkajian Awal Medis Rehabilitasi Medis',
+    component: EarlyMedicalRehabList,
+    props: { encounter: data, type: 'early-rehab', label: 'Pengkajian Awal Medis Rehabilitasi Medis' },
+  },
+  {
+    value: 'function-assessment',
+    label: 'Asesmen Fungsi',
+    component: AssesmentFunctionList,
+    props: { encounter: data, type: 'function', label: 'Asesmen Fungsi' },
+  },
+  { value: 'therapy-protocol', label: 'Protokol Terapi' },
+  { value: 'education-assessment', label: 'Asesmen Kebutuhan Edukasi' },
+  { value: 'patient-note', label: 'CPRJ', component: Cprj, props: { encounter: data } },
+  { value: 'consent', label: 'General Consent', component: GeneralConsentList, props: { encounter: data } },
+  { value: 'prescription', label: 'Order Obat', component: Prescription, props: { encounter_id: data.value.id } },
+  { value: 'device-order', label: 'Order Alkes', component: DeviceOrder, props: { encounter_id: data.value.id } },
+  { value: 'device', label: 'Order Alkes' },
+  { value: 'mcu-radiology', label: 'Order Radiologi', component: Radiology, props: { encounter_id: data.id } },
+  { value: 'mcu-lab-cp', label: 'Order Lab PK', component: CpLabOrder, props: { encounter_id: data.id } },
+  { value: 'mcu-lab-micro', label: 'Order Lab Mikro' },
+  { value: 'mcu-lab-pa', label: 'Order Lab PA' },
+  { value: 'medical-action', label: 'Order Ruang Tindakan' },
+  { value: 'mcu-result', label: 'Hasil Penunjang' },
+  { value: 'consultation', label: 'Konsultasi', component: Consultation, props: { encounter: data } },
+  { value: 'resume', label: 'Resume', component: ResumeList, props: { encounter: data } },
+  { value: 'control', label: 'Surat Kontrol', component: ControlLetterList, props: { encounter: data } },
+  { value: 'screening', label: 'Skrinning MPP' },
+  {
+    value: 'supporting-document',
+    label: 'Upload Dokumen Pendukung',
+    component: DocUploadList,
+    props: { encounter: data },
+  },
+  { value: 'vaccine-data', label: 'Data Vaksin', component: VaccineDataList, props: { encounter: data } },
+]
+</script>
+
+<template>
+  <div class="w-full">
+    <div class="mb-4">
+      <PubMyUiNavContentBa label="Kembali ke Daftar Kunjungan" />
+    </div>
+    <AppEncounterQuickInfo :data="data" />
+    <CompTab
+      :data="tabs"
+      :initial-active-tab="activeTab"
+      @change-tab="activeTab = $event"
+    />
+  </div>
+</template>
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 4e0da61b..fcfc3671 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -1,15 +1,22 @@
 <script setup lang="ts">
-//
 import { computed } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+///// Imports
+// Pubs components
+import ContentSwitcher from '~/components/pub/my-ui/content-switcher/content-switcher.vue'
+import { useSidebar } from '~/components/pub/ui/sidebar/utils'
+import SubMenu from '~/components/pub/my-ui/menus/submenu.vue'
+import ContentNavBa from '~/components/pub/my-ui/nav-content/ba.vue'
 
-import { getDetail } from '~/services/encounter.service'
+// App libs
+import { getServicePosition } from '~/lib/roles' // previously getPositionAs
 
-//
-import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
-import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
+// App Models
+import { genEncounter, type Encounter } from '~/models/encounter'
 
-import { genEncounter } from '~/models/encounter'
+// Handlers
+import type { EncounterProps } from '~/handlers/encounter-init.handler'
+import { getEncounterData } from '~/handlers/encounter-process.handler'
+import { getMenuItems } from '~/handlers/encounter-init.handler'
 
 // PLASE ORDER BY TAB POSITION
 import Status from '~/components/content/encounter/status.vue'
@@ -21,43 +28,63 @@ import Prescription from '~/components/content/prescription/main.vue'
 import CpLabOrder from '~/components/content/cp-lab-order/main.vue'
 import Radiology from '~/components/content/radiology-order/main.vue'
 import Consultation from '~/components/content/consultation/list.vue'
+import Cprj from '~/components/content/cprj/entry.vue'
 import DocUploadList from '~/components/content/document-upload/list.vue'
 import GeneralConsentList from '~/components/content/general-consent/entry.vue'
 import ResumeList from '~/components/content/resume/list.vue'
 import ControlLetterList from '~/components/content/control-letter/list.vue'
+import InitialNursingStudy from '~/components/content/initial-nursing/entry.vue'
+// App Components
+import EncounterPatientInfo from '~/components/app/encounter/quick-info.vue'
+import EncounterHistoryButtonMenu from '~/components/app/encounter/quick-shortcut.vue'
 
+///// Declarations and Flows
+// Props
+const props = defineProps<{
+  classCode: EncounterProps['classCode']
+  subClassCode?: EncounterProps['subClassCode']
+  canCreate?: boolean
+  canRead?: boolean
+  canUpdate?: boolean
+  canDelete?: boolean
+}>()
+
+// Common preparations
 const route = useRoute()
 const router = useRouter()
 
-// activeTab selalu sinkron dengan query param
-const activeTab = computed({
-  get: () => (route.query?.tab && typeof route.query.tab === 'string' ? route.query.tab : 'status'),
-  set: (val: string) => {
-    router.replace({ path: route.path, query: { tab: val } })
+const { user, userActiveRole, getActiveRole } = useUserStore()
+const activeRole = getActiveRole()
+const activePosition = ref(getServicePosition(activeRole))
+const menus = ref([] as any)
+const activeMenu = computed({
+  get: () => (route.query?.menu && typeof route.query.menu === 'string' ? route.query.menu : 'status'),
+  set: (value: string) => {
+    router.replace({ path: route.path, query: { menu: value } })
   },
 })
 
 const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
-const data = ref(genEncounter())
+const data = ref<Encounter>(genEncounter())
+const isShowPatient = computed(() => data.value && data.value?.patient?.person)
 
-async function fetchDetail() {
-  const res = await getDetail(id, {
-    includes: 'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person,EncounterDocuments',
-  })
-  if(res.body?.data) data.value = res.body?.data
+const { setOpen } = useSidebar()
+setOpen(false)
+
+if (activePosition.value === 'none') {
+  // if user position is none, redirect to home page
+  router.push('/')
 }
 
-onMounted(() => {
-  fetchDetail()
-})
-
-const tabs: TabItem[] = [
-  { value: 'status', label: 'Status Masuk/Keluar', component: Status, props: { encounter: data } },
+// Dummy rows for ProtocolList (matches keys expected by list-cfg.protocol)
+const protocolRows = [
   {
-    value: 'early-medical-assessment',
-    label: 'Pengkajian Awal Medis',
-    component: EarlyMedicalAssesmentList,
-    props: { encounter: data, type: 'early-medic', label: 'Pengkajian Awal Medis' },
+    number: '1',
+    tanggal: new Date().toISOString().substring(0, 10),
+    siklus: 'I',
+    periode: 'Siklus I',
+    kehadiran: 'Hadir',
+    action: '',
   },
   {
     value: 'rehab-medical-assessment',
@@ -73,10 +100,17 @@ const tabs: TabItem[] = [
   },
   { value: 'therapy-protocol', label: 'Protokol Terapi' },
   { value: 'education-assessment', label: 'Asesmen Kebutuhan Edukasi' },
+  { value: 'patient-note', label: 'CPRJ', component: Cprj, props: { encounter: data } },
   { value: 'consent', label: 'General Consent', component: GeneralConsentList, props: { encounter: data } },
-  { value: 'patient-note', label: 'CPRJ' },
+  {
+    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.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' },
@@ -87,20 +121,91 @@ const tabs: TabItem[] = [
   { value: 'resume', label: 'Resume', component: ResumeList, props: { encounter: data } },
   { value: 'control', label: 'Surat Kontrol', component: ControlLetterList, props: { encounter: data } },
   { value: 'screening', label: 'Skrinning MPP' },
-  { value: 'supporting-document', label: 'Upload Dokumen Pendukung', component: DocUploadList, props: { encounter: data },  },
+  {
+    value: 'supporting-document',
+    label: 'Upload Dokumen Pendukung',
+    component: DocUploadList,
+    props: { encounter: data },
+    number: '2',
+    tanggal: new Date().toISOString().substring(0, 10),
+    siklus: 'II',
+    periode: 'Siklus II',
+    kehadiran: 'Tidak Hadir',
+    action: '',
+  },
 ]
+
+const paginationMeta = {
+  recordCount: protocolRows.length,
+  page: 1,
+  pageSize: 10,
+  totalPage: 1,
+  hasNext: false,
+  hasPrev: false,
+}
+
+// Reacrtivities
+watch(getActiveRole, () => {
+  activePosition.value = getServicePosition(userActiveRole)
+  initMenus()
+})
+
+onMounted(async () => {
+  await getData()
+  initMenus()
+})
+
+///// Functions
+function handleClick(type: string) {
+  if (type === 'draft') {
+    router.push(`/${props.classCode}/encounter`)
+  }
+}
+
+function initMenus() {
+  menus.value = getMenuItems(
+    id,
+    props,
+    user,
+    {
+      encounter: data.value,
+    } as any,
+    {
+      protocolTheraphy: paginationMeta,
+      protocolChemotherapy: paginationMeta,
+      medicineProtocolChemotherapy: paginationMeta,
+    },
+  )
+}
+
+async function getData() {
+  data.value = await getEncounterData(id)
+}
 </script>
 
 <template>
   <div class="w-full">
-    <div class="mb-4">
-      <PubMyUiNavContentBa label="Kembali ke Daftar Kunjungan" />
+    <div class="bg-white dark:bg-slate-800">
+      <div class="p-3 2xl:p-4 border-b border-slate-300  dark:border-slate-700">
+        <ContentNavBa label="Kembali Ke Daftar" @click="handleClick" />
+      </div>
+      <ContentSwitcher :active="1" class="h-[130px] 2xl:h-[160px]">
+        <template v-slot:content1>
+          <EncounterPatientInfo v-if="isShowPatient" :data="data" />
+        </template>
+        <template v-slot:content2>
+          <EncounterHistoryButtonMenu v-if="isShowPatient" />
+        </template>
+      </ContentSwitcher>
     </div>
-    <AppEncounterQuickInfo :data="data" />
-    <CompTab
-      :data="tabs"
-      :initial-active-tab="activeTab"
-      @change-tab="activeTab = $event"
+    <SubMenu
+      :data="menus"
+      :initial-active-menu="activeMenu"
+      @change-menu="activeMenu = $event"
+      :can-create="canCreate"
+      :can-read="canRead"
+      :can-update="canUpdate"
+      :can-delete="canDelete"
     />
   </div>
 </template>
diff --git a/app/components/content/encounter/status.vue b/app/components/content/encounter/status.vue
index 513a7ab5..371008e4 100644
--- a/app/components/content/encounter/status.vue
+++ b/app/components/content/encounter/status.vue
@@ -5,6 +5,7 @@ import { getValueLabelList as getEmployeeValueLabelList } from '~/services/emplo
 import { getValueLabelList as getUnitValueLabelList } from '~/services/unit.service'
 import type { CheckInFormData, CheckOutFormData } from '~/schemas/encounter.schema'
 import { CheckInSchema, CheckOutSchema } from '~/schemas/encounter.schema'
+import { getEncounterData } from '~/handlers/encounter-process.handler'
 
 //
 import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
@@ -18,10 +19,12 @@ import { checkIn } from '~/services/encounter.service'
 //
 const props = defineProps<{
   encounter: Encounter
+  canUpdate?: boolean
 }>()
 
 // doctors
-const doctors = await getDoctorValueLabelList({'includes': 'employee,employee-person'})
+const localEncounter = ref<Encounter>(props.encounter)
+const doctors = await getDoctorValueLabelList({'includes': 'employee,employee-person'}, true)
 const employees = await getEmployeeValueLabelList({'includes': 'person', 'position-code': 'reg'})
 const units = await getUnitValueLabelList()
 
@@ -32,7 +35,7 @@ const checkInValues = ref<any>({
   // registeredAt: '',
 })
 const checkInIsLoading = ref(false)
-const checkInIsReadonly = ref(false)
+const checkInIsReadonly = ref(props.canUpdate )
 const checkInDialogOpen = ref(false)
 
 // check out
@@ -49,8 +52,15 @@ function editCheckIn() {
   checkInDialogOpen.value = true
 }
 
-function submitCheckIn(values: CheckInFormData) {
-  checkIn(props.encounter.id, values)
+async function submitCheckIn(values: CheckInFormData) {
+  const res = await checkIn(props.encounter.id, values)
+  if (res.success) {
+    checkInDialogOpen.value = false
+    const resEnc = await getEncounterData(props.encounter.id)
+    if (resEnc.success) {
+      localEncounter.value = resEnc.body.data
+    }
+  }
 }
 
 function editCheckOut() {
@@ -67,9 +77,8 @@ function submitCheckOut(values: CheckOutFormData) {
     <div class="border-r lg:pe-4 xl:pe-5 mb-10">
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
       <CheckInView
-        :encounter="encounter"
-        :is-loading="checkInIsLoading"
-        :is-readonly="checkInIsReadonly"
+        :encounter="localEncounter"
+        :can-update="canUpdate"
         @edit="editCheckIn"
       />
     </div>
@@ -77,9 +86,8 @@ function submitCheckOut(values: CheckOutFormData) {
       <Separator class="lg:hidden my-4 xl:my-5" />
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
       <CheckOutView
-        :encounter="encounter"
-        :is-loading="checkOutIsLoading"
-        :is-readonly="checkOutIsReadonly"
+        :encounter="localEncounter"
+        :can-update="canUpdate"
         @edit="editCheckOut"
       />
     </div>
@@ -122,4 +130,4 @@ function submitCheckOut(values: CheckOutFormData) {
       @cancel="checkInDialogOpen = false"
     />
   </Dialog>
-</template>
\ No newline at end of file
+</template>
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/kfr/entry.vue b/app/components/content/kfr/entry.vue
new file mode 100644
index 00000000..a2352c1a
--- /dev/null
+++ b/app/components/content/kfr/entry.vue
@@ -0,0 +1,146 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { ExposedForm } from '~/types/form'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import { toast } from '~/components/pub/ui/toast'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { KfrSchema, } from '~/schemas/kfr.schema'
+import { handleActionSave, handleActionEdit } from '~/handlers/kfr.handler'
+import { getDetail } from '~/services/kfr.service';
+
+// #region Props & Emits
+const props = withDefaults(defineProps<{
+  callbackUrl?: string
+  mode?: 'add' | 'edit'
+}>(), {
+  mode: "add",
+})
+
+// form related state
+const route = useRoute()
+
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const kfrId = typeof route.params.kfr_id == 'string' ? parseInt(route.params.kfr_id) : 0
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  if(props.mode === `edit`) init()
+})
+// #endregion
+
+// #region Functions
+async function init(){
+  const result = await getDetail(kfrId)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    inputForm.value?.setValues(currentValue)
+  }
+}
+
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = props.mode === `add` 
+  ? await handleActionSave(
+      inputData,
+      () => { },
+      () => { },
+      toast,
+    )
+  : await handleActionEdit(
+      kfrId,
+      inputData,
+      () => { },
+      () => { },
+      toast,
+    )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+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
+  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) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+
+const initial = {
+  // subjective: '',
+  // objective: '',
+  // assesment: '',
+  // planningGoal: '',
+  // planningAction: '',
+  // planningEducation: '',
+  planningFrequency: 2,
+  followUpPlan: 'EVALUASI', 
+  // followUpPlanDesc: '',
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">
+    {{ props.mode === "add" ? `Tambah` : `Update` }} Formulir Rawat Jalan KFR
+  </div>
+  <AppKfrEntry
+    ref="inputForm"
+    :schema="KfrSchema"
+    :initial-values="initial"
+  />
+  
+  <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>
diff --git a/app/components/content/kfr/list.vue b/app/components/content/kfr/list.vue
new file mode 100644
index 00000000..4a4613e9
--- /dev/null
+++ b/app/components/content/kfr/list.vue
@@ -0,0 +1,372 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Imports
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getList, remove } from '~/services/kfr.service'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import type { ExposedForm } from '~/types/form'
+import { VerificationSchema } from '~/schemas/verification.schema'
+import { handleActionSave } from '~/handlers/kfr.handler'
+import { toast } from '~/components/pub/ui/toast'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { CalendarDate } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+// #endregion
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const kfrId = typeof route.params.kfr_id == 'string' ? parseInt(route.params.kfr_id) : 0
+// #endregion
+
+// #region State
+const { getActiveRole } = useUserStore()
+const isVerifyDialogOpen = ref(false)
+const isValidateDialogOpen = ref(false)
+const isHistoryDialogOpen = ref(false)
+const isPatientInTherapy = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'kfr',
+})
+const historyData = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'kfr-history',
+})
+
+const dummy = [
+  {
+    id: 11,
+    date: new Date(),
+    result: {
+      s: `Example`,
+      o: `Example`,
+      a: `Example`,
+      p: {
+        goal: `Example`,
+        action: `Example`,
+        education: `Example`,
+        frequency: `Example`,
+      },
+      plan: `Example`,
+      planDesc: `Description`,
+    },
+    type: `Asesmen`,
+    status: {
+      verified: 1,
+      validated: 0,
+    },
+  }
+]
+
+const isRecordConfirmationOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const summaryLoading = ref(false)
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<number>(0)
+
+const isAssessment = ref<boolean>(false)
+const isTherapyProtocol = ref<boolean>(false)
+const isReassessment = ref<boolean>(true)
+const isInOrBeyondAssessmentPeriod = ref<boolean>(true)
+
+const isDoctor = computed(() => getActiveRole() === 'emp|doc')
+const isAdmin = computed(() => getActiveRole() === 'system')
+
+const isCaptchaValid = ref(false)
+provide('isCaptchaValid', isCaptchaValid)
+
+const addBtnTxt = computed(() => {
+  if (isAssessment.value) {
+    return `Tambah Asesmen`
+  } else if (isTherapyProtocol.value) {
+    return `Tambah Protokol Terapi`
+  } else if (isReassessment.value) {
+    return `Tambah Re-Asesmen`
+  }
+  return `Tambah Asesmen`
+})
+
+  const headerPrep: HeaderPrep = {
+    title: "Formulir Rawat Jalan KFR",
+    icon: 'i-lucide-newspaper',
+  }
+if(isDoctor.value || isAdmin.value) {
+  headerPrep.addNav = {
+    label: addBtnTxt.value,
+    onClick: () => navigateTo({
+      name: 'rehab-encounter-id-kfr-add',
+    }),
+  }
+}
+if(!isAssessment.value) {
+  headerPrep.components = [
+    {
+      component: defineAsyncComponent(() => import('~/components/app/kfr/_common/btn-history.vue')),
+      props: {  }
+    },
+  ];
+}
+
+  
+const defaultDate = {
+  start: new CalendarDate(2025, 1, 20),
+  end: new CalendarDate(2025, 1, 20).add({ days: 20 }),
+}
+const historyDateValue = ref(defaultDate) as Ref<DateRange>
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+
+  const isInTherapy = false // TODO: determine if patient is in therapy
+  handleIsPatientInTherapy(isInTherapy)
+})
+// #endregion
+
+// #region Functions
+function handleIsInAssesmentPeriood(value: boolean) {
+  if (value) {
+    isInOrBeyondAssessmentPeriod.value = true
+  } else {
+    isInOrBeyondAssessmentPeriod.value = false
+  }
+}
+function handleIsPatientInTherapy(value: boolean) {
+  if (value) {
+    isPatientInTherapy.value = true
+  } else {
+    isPatientInTherapy.value = false
+  }
+}
+
+async function handleOpenHistory() {
+  isHistoryDialogOpen.value = true
+}
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+function toggleHistoryDialog() {
+  isHistoryDialogOpen.value = !isHistoryDialogOpen.value
+}
+
+function handleVerify() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleConfirmVerify() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  isVerifyDialogOpen.value = false
+}
+
+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
+  // formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+
+async function handleConfirmValidate() {  
+    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 handleCancelValidate() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+
+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
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    handleConfirmVerify()
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.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:
+      // if(pagePermission.canUpdate) { 
+      navigateTo({
+        name: 'rehab-encounter-id-kfr-kfr_id-edit',
+        params: {
+          kfr_id: kfrId
+        }
+      })
+      // } else {
+      //   unauthorizedToast()
+      // }
+      break
+    case ActionEvents.showVerify:
+      // if(pagePermission.canUpdate) { 
+      handleVerify()
+      // } else {
+      //   unauthorizedToast()
+      // }
+      break
+    case ActionEvents.showValidate:
+      // if(pagePermission.canUpdate) {        
+      isValidateDialogOpen.value = true
+      // } else {
+      //   unauthorizedToast()
+      // }
+      break
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true
+      break
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <AppKfrCommonBannerPatientInTherapy v-if="isInOrBeyondAssessmentPeriod" class="mb-5" />
+
+  <AppKfrList :data="dummy" />
+
+  <Dialog v-model:open="isVerifyDialogOpen" title="Verifikasi">
+    <AppKfrVerifyDialog ref="inputForm" :schema="VerificationSchema" />
+    <div class="flex justify-end">
+      <Action v-show="isCaptchaValid" :enable-draft="false" @click="handleActionClick" />
+    </div>
+  </Dialog>
+
+  <Confirmation
+    v-model:open="isValidateDialogOpen"
+    title="Validasi Data"
+    message="Apakah Anda yakin ingin Validasi data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmValidate"
+    @cancel="handleCancelValidate"
+  />
+
+  <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+    <AppKfrHistoryList
+      :data="dummy"
+      v-model:date-value="historyDateValue"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange" />
+  </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>
+      </div>
+    </template>
+  </RecordConfirmation>
+
+  <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+    <!-- <DocPreviewDialog :link="recItem.url" /> -->
+    <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+  </Dialog>
+</template>
\ No newline at end of file
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 3a916c4d..d1d6599a 100644
--- a/app/components/content/sep/entry.vue
+++ b/app/components/content/sep/entry.vue
@@ -1,486 +1,73 @@
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import { useRoute } from 'vue-router'
+import { onMounted } from 'vue'
 
 // Components
 import AppSepEntryForm from '~/components/app/sep/entry-form.vue'
 import AppViewPatient from '~/components/app/patient/view-patient.vue'
 import AppViewHistory from '~/components/app/sep/view-history.vue'
 import AppViewLetter from '~/components/app/sep/view-letter.vue'
-import { toast } from '~/components/pub/ui/toast'
 
-// Types
-import type { SepHistoryData } from '~/components/app/sep/list-cfg.history'
-import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
+// Handler
+import { useIntegrationSepEntry } from '~/handlers/integration-sep-entry.handler'
+import { useIntegrationSepDetail } from '~/handlers/integration-sep-detail.handler'
 
-// Constants
-import {
-  serviceTypes,
-  serviceAssessments,
-  registerMethods,
-  trafficAccidents,
-  supportCodes,
-  procedureTypes,
-  purposeOfVisits,
-  classLevels,
-  classLevelUpgrades,
-  classPaySources,
-} from '~/lib/constants.vclaim'
-
-// Services
-import {
-  getList as getSpecialistList,
-  getValueTreeItems as getSpecialistTreeItems,
-} from '~/services/specialist.service'
-import { getValueLabelList as getProvinceList } from '~/services/vclaim-region-province.service'
-import { getValueLabelList as getCityList } from '~/services/vclaim-region-city.service'
-import { getValueLabelList as getDistrictList } from '~/services/vclaim-region-district.service'
-import { getValueLabelList as getDoctorLabelList } from '~/services/vclaim-doctor.service'
-import { getValueLabelList as getHealthFacilityLabelList } from '~/services/vclaim-healthcare.service'
-import { getValueLabelList as getDiagnoseLabelList } from '~/services/vclaim-diagnose.service'
-import { getList as getMemberList } from '~/services/vclaim-member.service'
-import { getList as getHospitalLetterList } from '~/services/vclaim-reference-hospital-letter.service'
-import { getList as getControlLetterList } from '~/services/vclaim-control-letter.service'
-import { getList as getMonitoringHistoryList } from '~/services/vclaim-monitoring-history.service'
-import { create as createSep, makeSepData } from '~/services/vclaim-sep.service'
-
-// Handlers
-import {
+const {
+  histories,
+  letters,
   patients,
+  doctors,
+  diagnoses,
+  facilitiesFrom,
+  facilitiesTo,
+  supportCodesList,
+  serviceTypesList,
+  registerMethodsList,
+  accidentsList,
+  purposeOfVisitsList,
+  proceduresList,
+  assessmentsList,
+  provincesList,
+  citiesList,
+  districtsList,
+  classLevelsList,
+  classLevelUpgradesList,
+  classPaySourcesList,
+  isServiceHidden,
+  isSaveLoading,
+  isLetterReadonly,
+  isLoadingPatient,
+  openPatient,
+  openLetter,
+  openHistory,
+  selectedLetter,
+  selectedObjects,
+  selectedServiceType,
+  selectedAdmissionType,
+  specialistsTree,
   selectedPatient,
-  selectedPatientObject,
   paginationMeta,
+  getLetterMappers,
   getPatientsList,
-  getPatientCurrent,
   getPatientByIdentifierSearch,
-} from '~/handlers/patient.handler'
+  handleSaveLetter,
+  handleSavePatient,
+  handleEvent,
+  handleFetch,
+  handleInit,
+} = useIntegrationSepEntry()
 
-const route = useRoute()
-const openPatient = ref(false)
-const openLetter = ref(false)
-const openHistory = ref(false)
-const selectedLetter = ref('')
-const selectedObjects = ref<any>({})
-const selectedServiceType = ref<string>('')
-const selectedAdmissionType = ref<string>('')
-const histories = ref<Array<SepHistoryData>>([])
-const letters = ref<Array<any>>([])
-const doctors = ref<Array<{ value: string | number; label: string }>>([])
-const diagnoses = ref<Array<{ value: string | number; label: string }>>([])
-const facilitiesFrom = ref<Array<{ value: string | number; label: string }>>([])
-const facilitiesTo = ref<Array<{ value: string | number; label: string }>>([])
-const supportCodesList = ref<Array<{ value: string; label: string }>>([])
-const serviceTypesList = ref<Array<{ value: string; label: string }>>([])
-const registerMethodsList = ref<Array<{ value: string; label: string }>>([])
-const accidentsList = ref<Array<{ value: string; label: string }>>([])
-const purposeOfVisitsList = ref<Array<{ value: string; label: string }>>([])
-const proceduresList = ref<Array<{ value: string; label: string }>>([])
-const assessmentsList = ref<Array<{ value: string; label: string }>>([])
-const provincesList = ref<Array<{ value: string; label: string }>>([])
-const citiesList = ref<Array<{ value: string; label: string }>>([])
-const districtsList = ref<Array<{ value: string; label: string }>>([])
-const classLevelsList = ref<Array<{ value: string; label: string }>>([])
-const classLevelUpgradesList = ref<Array<{ value: string; label: string }>>([])
-const classPaySourcesList = ref<Array<{ value: string; label: string }>>([])
-const isServiceHidden = ref(false)
-const isSaveLoading = ref(false)
-const isLetterReadonly = ref(false)
-const specialistsTree = ref<TreeItem[]>([])
-const resourceType = ref('')
-const resourcePath = ref('')
+const { valueObjects, getSepDetail } = useIntegrationSepDetail()
 
-async function getMonitoringHistoryMappers() {
-  histories.value = []
-  const dateFirst = new Date()
-  const dateLast = new Date()
-  dateLast.setMonth(dateFirst.getMonth() - 3)
-  const cardNumber =
-    selectedPatientObject.value?.person?.residentIdentityNumber || selectedPatientObject.value?.number || ''
-  const result = await getMonitoringHistoryList({
-    cardNumber: cardNumber,
-    startDate: dateFirst.toISOString().substring(0, 10),
-    endDate: dateLast.toISOString().substring(0, 10),
-  })
-  if (result && result.success && result.body) {
-    const historiesRaw = result.body?.response?.histori || []
-    if (!historiesRaw) return
-    historiesRaw.forEach((result: any) => {
-      histories.value.push({
-        sepNumber: result.noSep,
-        sepDate: result.tglSep,
-        referralNumber: result.noRujukan,
-        diagnosis:
-          result.diagnosa && typeof result.diagnosa === 'string' && result.diagnosa.length > 20
-            ? result.diagnosa.toString().substring(0, 17) + '...'
-            : '-',
-        serviceType: !result.jnsPelayanan ? '-' : result.jnsPelayanan === '1' ? 'Rawat Jalan' : 'Rawat Inap',
-        careClass: result.kelasRawat,
-      })
-    })
-  }
-}
-
-async function getLetterMappers(admissionType: string, search: string) {
-  letters.value = []
-  let result = null
-  if (admissionType !== '3') {
-    result = await getHospitalLetterList({
-      letterNumber: search,
-    })
-  } else {
-    result = await getControlLetterList({
-      letterNumber: search,
-      mode: 'by-control',
-    })
-    if (result && result.success && result.body) {
-      const lettersRaw = result.body?.response || null
-      if (!lettersRaw) {
-        result = await getControlLetterList({
-          letterNumber: search,
-          mode: 'by-card',
-        })
-      }
-    }
-    if (result && result.success && result.body) {
-      const lettersRaw = result.body?.response || null
-      if (!lettersRaw) {
-        result = await getControlLetterList({
-          letterNumber: search,
-          mode: 'by-sep',
-        })
-      }
-    }
-  }
-  if (result && result.success && result.body) {
-    const lettersRaw = result.body?.response || null
-    if (!lettersRaw) return
-    if (admissionType === '3') {
-      letters.value = [
-        {
-          letterNumber: lettersRaw.noSuratKontrol || '',
-          plannedDate: lettersRaw.tglRencanaKontrol || '',
-          sepNumber: lettersRaw.sep.noSep || '',
-          patientName: lettersRaw.sep.peserta.nama || '',
-          bpjsCardNo: lettersRaw.sep.peserta.noKartu,
-          clinic: lettersRaw.sep.poli || '',
-          doctor: lettersRaw.sep.namaDokter || '',
-        },
-      ]
-    } else {
-      // integrate ke sep ---
-      // "rujukan": {
-      //           "noRujukan": "0212R0300625B000006", // rujukan?.noKunjungan
-      //           "ppkRujukan": "0212R030",
-      //           "tglRujukan": "2025-06-26",
-      //           "asalRujukan": "2" // asalFaskes
-      //       },
-      // "jnsPelayanan": "2",
-      // "ppkPelayanan": "1323R001",
-      // "poli": {
-      //  "tujuan": "URO", // rujukan?.poliRujukan?.kode
-      // },
-      // "klsRawat": {
-      //           "pembiayaan": "",
-      //           "klsRawatHak": "2", // peserta.hakKelas?.kode
-      //           "klsRawatNaik": "",
-      //           "penanggungJawab": ""
-      //       },
-
-      letters.value = [
-        {
-          letterNumber: lettersRaw?.rujukan?.noKunjungan || '',
-          plannedDate: lettersRaw?.rujukan?.tglKunjungan || '',
-          sepNumber: lettersRaw?.rujukan?.informasi?.eSEP || '-',
-          patientName: lettersRaw?.rujukan?.peserta.nama || '',
-          bpjsCardNo: lettersRaw?.rujukan?.peserta.noKartu || '',
-          clinic: lettersRaw?.rujukan?.poliRujukan.nama || '',
-          doctor: '',
-          information: {
-            facility: lettersRaw?.asalFaskes || '',
-            diagnoses: lettersRaw?.rujukan?.diagnosa?.kode || '',
-            serviceType: lettersRaw?.rujukan?.pelayanan?.kode || '',
-            classLevel: lettersRaw?.rujukan?.peserta?.hakKelas?.kode || '',
-            poly: lettersRaw?.rujukan?.poliRujukan?.kode || '',
-            cardNumber: lettersRaw?.rujukan?.peserta?.noKartu || '',
-            patientName: lettersRaw?.rujukan?.peserta?.nama || '',
-            patientPhone: lettersRaw?.rujukan?.peserta?.mr?.noTelepon || '',
-            medicalRecordNumber: lettersRaw?.rujukan?.peserta?.mr?.noMR || '',
-          },
-        },
-      ]
-    }
-  }
-}
-
-async function getPatientInternalMappers(id: string) {
-  try {
-    await getPatientCurrent(id)
-    if (selectedPatientObject.value) {
-      const patient = selectedPatientObject.value
-      selectedObjects.value['cardNumber'] = '-'
-      selectedObjects.value['nationalIdentity'] = patient?.person?.residentIdentityNumber || '-'
-      selectedObjects.value['medicalRecordNumber'] = patient?.number || '-'
-      selectedObjects.value['patientName'] = patient?.person?.name || '-'
-      selectedObjects.value['phoneNumber'] = patient?.person?.contacts?.[0]?.value || '-'
-    }
-  } catch (err) {
-    console.error('Failed to load patient from query params:', err)
-  }
-}
-
-async function getPatientExternalMappers(id: string, type: string) {
-  try {
-    const result = await getMemberList({
-      mode: type,
-      number: id,
-      date: new Date().toISOString().substring(0, 10),
-    })
-    if (result && result.success && result.body) {
-      const memberRaws = result.body?.response || null
-      selectedObjects.value['cardNumber'] = memberRaws?.peserta?.noKartu || ''
-      selectedObjects.value['nationalIdentity'] = memberRaws?.peserta?.nik || ''
-      selectedObjects.value['medicalRecordNumber'] = memberRaws?.peserta?.mr?.noMR || ''
-      selectedObjects.value['patientName'] = memberRaws?.peserta?.nama || ''
-      selectedObjects.value['phoneNumber'] = memberRaws?.peserta?.mr?.noTelepon || ''
-      selectedObjects.value['classLevel'] = memberRaws?.peserta?.hakKelas?.kode || ''
-      selectedObjects.value['status'] = memberRaws?.statusPeserta?.kode || ''
-    }
-  } catch (err) {
-    console.error('Failed to load patient from query params:', err)
-  }
-}
-
-function handleSaveLetter() {
-  // Find the selected letter and get its plannedDate
-  const selectedLetterData = letters.value.find((letter) => letter.letterNumber === selectedLetter.value)
-  if (selectedLetterData && selectedLetterData.plannedDate) {
-    selectedObjects.value['letterDate'] = selectedLetterData.plannedDate
-  }
-}
-
-async function handleSavePatient() {
-  selectedPatientObject.value = null
-  await getPatientInternalMappers(selectedPatient.value)
-}
-
-async function handleEvent(menu: string, value: any) {
-  if (menu === 'admission-type') {
-    selectedAdmissionType.value = value
-    return
-  }
-  if (menu === 'service-type') {
-    selectedServiceType.value = value
-    doctors.value = await getDoctorLabelList({
-      serviceType: selectedServiceType.value || 1,
-      serviceDate: new Date().toISOString().substring(0, 10),
-      specialistCode: 0,
-    })
-  }
-  if (menu === 'search-patient') {
-    getPatientsList({ 'page-size': 10, includes: 'person' }).then(() => {
-      openPatient.value = true
-    })
-    return
-  }
-  if (menu === 'search-patient-by-identifier') {
-    const text = value.text
-    const type = value.type
-    const prevCardNumber = selectedPatientObject.value?.person?.residentIdentityNumber || ''
-    if (type === 'indentity' && text !== prevCardNumber) {
-      await getPatientByIdentifierSearch(text)
-      await getPatientExternalMappers(text, 'by-identity')
-    }
-    if (type === 'cardNumber' && text !== prevCardNumber) {
-      await getPatientExternalMappers(text, 'by-card')
-    }
-    return
-  }
-  if (menu === 'search-letter') {
-    isLetterReadonly.value = false
-    getLetterMappers(value.admissionType, value.search).then(() => {
-      if (letters.value.length > 0) {
-        const copyObjects = { ...selectedObjects.value }
-        selectedObjects.value = {}
-        selectedLetter.value = letters.value[0].letterNumber
-        isLetterReadonly.value = true
-        setTimeout(() => {
-          selectedObjects.value = copyObjects
-          selectedObjects.value['letterDate'] = letters.value[0].plannedDate
-        }, 100)
-      }
-    })
-    return
-  }
-  if (menu === 'open-letter') {
-    openLetter.value = true
-    return
-  }
-  if (menu === 'history-sep') {
-    getMonitoringHistoryMappers().then(() => {
-      openHistory.value = true
-    })
-    return
-  }
-  if (menu === 'back') {
-    navigateTo('/integration/bpjs/sep')
-  }
-  if (menu === 'save-sep') {
-    isSaveLoading.value = true
-    // value.destinationClinic = value.destinationClinic || ''
-    createSep(makeSepData(value))
-      .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' })
-          return
-        }
-        toast({ title: 'Berhasil', description: 'SEP berhasil dibuat', variant: 'default' })
-        if (resourceType.value === 'encounter') {
-          navigateTo(resourcePath.value)
-          return
-        }
-        navigateTo('/integration/bpjs/sep')
-      })
-      .catch((err) => {
-        console.error('Failed to save SEP:', err)
-        toast({ title: 'Gagal', description: err?.message || 'Gagal membuat SEP', variant: 'destructive' })
-      })
-      .finally(() => {
-        isSaveLoading.value = false
-      })
-  }
-}
-
-async function handleFetch(params: any) {
-  const menu = params.menu || ''
-  const value = params.value || ''
-  if (menu === 'diagnosis') {
-    diagnoses.value = await getDiagnoseLabelList({ diagnosa: value })
-  }
-  if (menu === 'clinic-from') {
-    facilitiesFrom.value = await getHealthFacilityLabelList({
-      healthcare: value,
-      healthcareType: selectedServiceType.value || 1,
-    })
-  }
-  if (menu === 'clinic-to') {
-    facilitiesTo.value = await getHealthFacilityLabelList({
-      healthcare: value,
-      healthcareType: selectedServiceType.value || 1,
-    })
-  }
-  if (menu === 'province') {
-    citiesList.value = await getCityList({ province: value })
-    districtsList.value = []
-  }
-  if (menu === 'city') {
-    districtsList.value = await getDistrictList({ city: value })
-  }
-}
-
-async function handleFetchSpecialists() {
-  try {
-    const specialistsResult = await getSpecialistList({ 'page-size': 100, includes: 'subspecialists' })
-    if (specialistsResult.success) {
-      const specialists = specialistsResult.body?.data || []
-      specialistsTree.value = getSpecialistTreeItems(specialists)
-    }
-  } catch (error) {
-    console.error('Error fetching specialist-subspecialist tree:', error)
-  }
-}
-
-async function handleInit() {
-  const facilities = await getHealthFacilityLabelList({
-    healthcare: 'Puskesmas',
-    healthcareType: selectedLetter.value || 1,
-  })
-  diagnoses.value = await getDiagnoseLabelList({ diagnosa: 'paru' })
-  facilitiesFrom.value = facilities
-  facilitiesTo.value = facilities
-  doctors.value = await getDoctorLabelList({
-    serviceType: selectedServiceType.value || 1,
-    serviceDate: new Date().toISOString().substring(0, 10),
-    specialistCode: 0,
-  })
-  provincesList.value = await getProvinceList()
-  serviceTypesList.value = Object.keys(serviceTypes).map((item) => ({
-    value: item.toString(),
-    label: serviceTypes[item],
-  })) as any
-  registerMethodsList.value = Object.keys(registerMethods)
-    .filter((item) => ![''].includes(item))
-    .map((item) => ({
-      value: item.toString(),
-      label: registerMethods[item],
-    })) as any
-  accidentsList.value = Object.keys(trafficAccidents).map((item) => ({
-    value: item.toString(),
-    label: trafficAccidents[item],
-  })) as any
-  purposeOfVisitsList.value = Object.keys(purposeOfVisits).map((item) => ({
-    value: item.toString(),
-    label: purposeOfVisits[item],
-  })) as any
-  proceduresList.value = Object.keys(procedureTypes).map((item) => ({
-    value: item.toString(),
-    label: procedureTypes[item],
-  })) as any
-  assessmentsList.value = Object.keys(serviceAssessments).map((item) => ({
-    value: item.toString(),
-    label: `${item.toString()} - ${serviceAssessments[item]}`,
-  })) as any
-  supportCodesList.value = Object.keys(supportCodes).map((item) => ({
-    value: item.toString(),
-    label: `${item.toString()} - ${supportCodes[item]}`,
-  })) as any
-  classLevelsList.value = Object.keys(classLevels).map((item) => ({
-    value: item.toString(),
-    label: classLevels[item],
-  })) as any
-  classLevelUpgradesList.value = Object.keys(classLevelUpgrades).map((item) => ({
-    value: item.toString(),
-    label: classLevelUpgrades[item],
-  })) as any
-  classPaySourcesList.value = Object.keys(classPaySources).map((item) => ({
-    value: item.toString(),
-    label: classPaySources[item],
-  })) as any
-  await handleFetchSpecialists()
-  if (route.query) {
-    const queries = route.query as any
-    isServiceHidden.value = queries['is-service'] === 'true'
-    selectedObjects.value = {}
-    if (queries['resource']) resourceType.value = queries['resource']
-    if (queries['resource-path']) resourcePath.value = queries['resource-path']
-    if (queries['doctor-code']) selectedObjects.value['doctorCode'] = queries['doctor-code']
-    if (queries['specialist-code']) selectedObjects.value['subSpecialistCode'] = queries['specialist-code']
-    if (queries['sub-specialist-code']) selectedObjects.value['subSpecialistCode'] = queries['sub-specialist-code']
-    if (queries['card-number']) selectedObjects.value['cardNumber'] = queries['card-number']
-    if (queries['register-date']) selectedObjects.value['registerDate'] = queries['register-date']
-    if (queries['sep-type']) selectedObjects.value['sepType'] = queries['sep-type']
-    if (queries['sep-number']) selectedObjects.value['sepNumber'] = queries['sep-number']
-    if (queries['register-date']) selectedObjects.value['registerDate'] = queries['register-date']
-    if (queries['payment-type']) selectedObjects.value['paymentType'] = queries['payment-type']
-    if (queries['patient-id']) {
-      await getPatientInternalMappers(queries['patient-id'])
-    }
-    if (queries['card-number']) {
-      const resultMember = await getMemberList({
-        mode: 'by-card',
-        number: queries['card-number'],
-        date: new Date().toISOString().substring(0, 10),
-      })
-      console.log(resultMember)
-    }
-    delete selectedObjects.value['is-service']
-  }
-}
+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>
 
@@ -490,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 013b076a..6b3b1e9b 100644
--- a/app/components/content/sep/list.vue
+++ b/app/components/content/sep/list.vue
@@ -1,8 +1,5 @@
 <script setup lang="ts">
 // Components
-import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
-import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
 import Header from '~/components/pub/my-ui/nav-header/prep.vue'
 import {
   DropdownMenu,
@@ -11,156 +8,95 @@ import {
   DropdownMenuItem,
 } from '~/components/pub/ui/dropdown-menu'
 import AppSepList from '~/components/app/sep/list.vue'
+import RangeCalendar from '~/components/pub/ui/range-calendar/RangeCalendar.vue'
 
 // Icons
 import { X, Check } from 'lucide-vue-next'
 
-// Types
-import type { VclaimSepData } from '~/models/vclaim'
+// Handlers
+import { useIntegrationSepList } from '~/handlers/integration-sep-list.handler'
 
-// Services
-import { getList as geMonitoringVisitList } from '~/services/vclaim-monitoring-visit.service'
+// Helpers
+import { refDebounced } from '@vueuse/core'
 
-const search = ref('')
-const dateRange = ref('12 Agustus 2025 - 31 Agustus 2025')
-const open = ref(false)
+// use handler to provide state and functions
+const {
+  recId,
+  recAction,
+  recItem,
+  data,
+  dateSelection,
+  dateRange,
+  serviceType,
+  serviceTypesList,
+  search,
+  open,
+  sepData,
+  headerPrep,
+  paginationMeta,
+  isLoading,
+  getSepList,
+  setServiceTypes,
+  setDateRange,
+  handleExportCsv,
+  handleExportExcel,
+  handleRowSelected,
+  handlePageChange,
+  handleRemove,
+} = useIntegrationSepList()
 
-const sepData = {
-  no_sep: 'SP23311224',
-  kartu: '001234',
-  nama: 'Kenzie',
-}
-
-const paginationMeta = reactive<PaginationMeta>({
-  recordCount: 0,
-  page: 1,
-  pageSize: 10,
-  totalPage: 5,
-  hasNext: false,
-  hasPrev: false,
-})
-
-function handlePageChange(page: number) {
-  console.log('pageChange', page)
-}
-
-const data = ref<VclaimSepData[]>([])
-
-const refSearchNav: RefSearchNav = {
-  onClick: () => {
-    // open filter modal
-  },
-  onInput: (_val: string) => {
-    // filter patient list
-  },
-  onClear: () => {
-    // clear url param
-  },
-}
-
-const isLoading = reactive<DataTableLoader>({
-  isTableLoading: false,
-})
-
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-
-const headerPrep: HeaderPrep = {
-  title: 'Daftar SEP Prosedur',
-  icon: 'i-lucide-panel-bottom',
-  addNav: {
-    label: 'Tambah',
-    onClick: () => {
-      navigateTo('/integration/bpjs/sep/add')
-    },
-  },
-}
-
-async function getMonitoringVisitMappers() {
-  isLoading.dataListLoading = true
-  data.value = []
-
-  const dateFirst = new Date()
-  const result = await geMonitoringVisitList({
-    date: dateFirst.toISOString().substring(0, 10),
-    serviceType: 1,
-  })
-
-  if (result && result.success && result.body) {
-    const visitsRaw = result.body?.response?.sep || []
-
-    if (!visitsRaw) {
-      isLoading.dataListLoading = false
-      return
-    }
-
-    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'
-      }
-
-      data.value.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 || '-',
-      })
-    })
-  }
-
-  isLoading.dataListLoading = false
-}
-
-async function getSepList() {
-  await getMonitoringVisitMappers()
-}
-
-function exportCsv() {  
-  console.log('Ekspor CSV dipilih')
-  // tambahkan logic untuk generate CSV
-}
-
-function exportExcel() {
-  console.log('Ekspor Excel dipilih')
-  // tambahkan logic untuk generate Excel
-}
-
-function handleDelete() {
-  console.log('Data dihapus:', sepData)
-  open.value = false
-}
-
-watch(
-  () => recAction.value,
-  () => {
-    if (recAction.value === 'showConfirmDel') {
-      open.value = true
-    }
-  },
-)
-
-onMounted(() => {
-  getSepList()
-})
+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
+  }
+  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,
+  async (val) => {
+    if (!val) return
+    setDateRange()
+    await getSepList()
+    dataFiltered.value = [...data.value]
+  },
+  { deep: true },
+)
+
+watch(
+  () => serviceType.value,
+  () => {
+    getSepList()
+  },
+)
+
+onMounted(async () => {
+  setServiceTypes()
+  await getSepList()
+  dataFiltered.value = [...data.value]
+})
 </script>
 
 <template>
@@ -175,6 +111,17 @@ provide('table_data_loader', isLoading)
         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"
+        />
+      </div>
+
       <!-- Date Range -->
       <Popover>
         <PopoverTrigger as-child>
@@ -190,7 +137,7 @@ provide('table_data_loader', isLoading)
           </Button>
         </PopoverTrigger>
         <PopoverContent class="p-2">
-          <Calendar mode="range" />
+          <RangeCalendar v-model="dateSelection" />
         </PopoverContent>
       </Popover>
 
@@ -209,8 +156,8 @@ provide('table_data_loader', isLoading)
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent class="w-40">
-          <DropdownMenuItem @click="exportCsv">Ekspor CSV</DropdownMenuItem>
-          <DropdownMenuItem @click="exportExcel">Ekspor Excel</DropdownMenuItem>
+          <DropdownMenuItem @click="handleExportCsv">Ekspor CSV</DropdownMenuItem>
+          <DropdownMenuItem @click="handleExportExcel">Ekspor Excel</DropdownMenuItem>
         </DropdownMenuContent>
       </DropdownMenu>
     </div>
@@ -218,7 +165,8 @@ provide('table_data_loader', isLoading)
     <div class="mt-4">
       <AppSepList
         v-if="!isLoading.dataListLoading"
-        :data="data"
+        :data="dataFiltered"
+        @update:modelValue="handleRowSelected"
       />
     </div>
 
@@ -235,25 +183,36 @@ provide('table_data_loader', isLoading)
     <!-- Trigger button -->
     <Dialog v-model:open="open">
       <DialogTrigger as-child></DialogTrigger>
-
       <DialogContent class="sm:max-w-md">
         <DialogHeader>
           <DialogTitle>Hapus SEP</DialogTitle>
         </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>No. SEP : {{ sepData.no_sep }}</p>
-          <p>No. Kartu BPJS : {{ sepData.kartu }}</p>
-          <p>Nama Pasien : {{ sepData.nama }}</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="open = false"
+            @click="
+              () => {
+                recId = 0
+                recAction = ''
+                open = false
+              }
+            "
           >
             <X class="mr-1 h-4 w-4" />
             Tidak
@@ -261,7 +220,7 @@ provide('table_data_loader', isLoading)
           <Button
             variant="destructive"
             class="bg-red-600 hover:bg-red-700"
-            @click="handleDelete"
+            @click="handleRemove"
           >
             <Check class="mr-1 h-4 w-4" />
             Ya
diff --git a/app/components/content/soapi/entry.vue b/app/components/content/soapi/entry.vue
index ee3c7c32..d4e960f3 100644
--- a/app/components/content/soapi/entry.vue
+++ b/app/components/content/soapi/entry.vue
@@ -24,12 +24,7 @@ const ActiveForm = computed(() => formMap[type.value] || EarlyForm)
 
 <template>
   <div>
-    <SoapiList
-      v-if="mode === 'list'"
-      @add="goToEntry"
-      @edit="goToEntry"
-    />
-
+    <SoapiList v-if="mode === 'list'" />
     <component
       v-else
       :is="ActiveForm"
diff --git a/app/components/content/soapi/form.vue b/app/components/content/soapi/form.vue
index c963a091..4ec0d85e 100644
--- a/app/components/content/soapi/form.vue
+++ b/app/components/content/soapi/form.vue
@@ -8,7 +8,8 @@ import { EarlySchema } from '~/schemas/soapi.schema'
 import { toast } from '~/components/pub/ui/toast'
 import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
-const { backToList } = useQueryMode('mode')
+const { goToEntry, backToList } = useQueryCRUDMode('mode')
+const { recordId } = useQueryCRUDMode('record-id')
 const route = useRoute()
 const isOpenProcedure = ref(false)
 const isOpenDiagnose = ref(false)
@@ -20,7 +21,7 @@ const schema = EarlySchema
 const payload = ref({
   encounter_id: 0,
   time: '',
-  typeCode: 'early',
+  typeCode: 'early-medic',
   value: '',
 })
 
@@ -46,7 +47,7 @@ const isLoading = reactive<DataTableLoader>({
 
 async function getDiagnoses() {
   isLoading.isTableLoading = true
-  const resp = await xfetch('/api/v1/diagnose-src')
+  const resp = await xfetch(`/api/v1/soapi/${recordId}`)
   if (resp.success) {
     diagnoses.value = (resp.body as Record<string, any>).data
   }
@@ -77,6 +78,7 @@ function handleOpen(type: string) {
 
 const entryRef = ref()
 async function actionHandler(type: string) {
+  console.log(type)
   if (type === 'back') {
     backToList()
     return
diff --git a/app/components/content/soapi/list.vue b/app/components/content/soapi/list.vue
index 5a960d5d..6980871c 100644
--- a/app/components/content/soapi/list.vue
+++ b/app/components/content/soapi/list.vue
@@ -22,10 +22,14 @@ interface Props {
   encounter: Encounter
   label: string
 }
-const route = useRoute()
 const props = defineProps<Props>()
 const emits = defineEmits(['add', 'edit'])
 
+const { recordId } = useQueryCRUDRecordId()
+const { goToEntry, backToList } = useQueryCRUDMode('mode')
+const router = useRouter()
+const route = useRoute()
+
 const data = ref([])
 const encounterId = ref<number>(props?.encounter?.id || 0)
 const title = ref('')
@@ -56,13 +60,10 @@ const hreaderPrep: HeaderPrep = {
   icon: 'i-lucide-users',
   addNav: {
     label: 'Tambah',
-    onClick: () => emits('add'),
+    onClick: () => goToEntry(),
   },
 }
 
-const { recordId } = useQueryCRUDRecordId()
-const { goToEntry, backToList } = useQueryCRUDMode('mode')
-
 const type = computed(() => (route.query.tab as string) || 'early-medical-assessment')
 
 onMounted(async () => {
@@ -70,13 +71,24 @@ onMounted(async () => {
 })
 
 async function getMyList() {
-  const url = `/api/v1/soapi?type-code=${typeCode.value}?includes=encounter`
+  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
   }
 }
 
+const goEdit = (id: string) => {
+  router.replace({
+    path: route.path,
+    query: {
+      ...route.query,
+      mode: 'entry',
+      'record-id': id,
+    },
+  })
+}
+
 function handlePageChange(page: number) {
   emits('pageChange', page)
 }
@@ -142,6 +154,14 @@ watch([recId, recAction], () => {
   }
 })
 
+// watch(recId, () => {
+//   console.log('recId', recId.value)
+//   console.log('recIdaacin', recAction.value)
+//   if (recAction.value === 'showEdit') {
+//     goEdit(recId.value)
+//   }
+// })
+
 provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
diff --git a/app/components/content/surgery-report/detail.vue b/app/components/content/surgery-report/detail.vue
new file mode 100644
index 00000000..7c266329
--- /dev/null
+++ b/app/components/content/surgery-report/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/surgery-report.service'
+
+// Components
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import type { SurgeryReport } from '~/models/surgery-report'
+
+// #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 surgeryReportId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+const surgeryReport = ref<SurgeryReport | null>(null)
+
+const headerPrep: HeaderPrep = {
+  title: 'Detail Laporan Operasi',
+  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" />
+  <AppSurgeryReportDetail :instance="surgeryReport" @click="handleAction" />
+</template>
diff --git a/app/components/content/surgery-report/entry.vue b/app/components/content/surgery-report/entry.vue
new file mode 100644
index 00000000..ff817905
--- /dev/null
+++ b/app/components/content/surgery-report/entry.vue
@@ -0,0 +1,148 @@
+<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/surgery-report.service'
+import type { SurgeryReport } from '~/models/surgery-report'
+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 { SurgeryReportSchema } from '~/schemas/surgery-report.schema'
+import { formatDateYyyyMmDd } from '~/lib/date'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { getList, remove } from '~/services/surgery-report.service'
+import { handleActionEdit } from '~/handlers/surgery-report.handler'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'surgery-report',
+})
+// #endregion
+
+// #region State & Computed
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const surgeryReportId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const surgeryReport = ref({})
+const isConfirmationOpen = ref(false)
+const selectedOperativeAction = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(surgeryReportId)
+  if (result.success) {
+    const responseData = {...result.body.data, date: formatDateYyyyMmDd(result.body.data.date)}
+    surgeryReport.value = responseData
+    inputForm.value?.setValues(responseData)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const response = await handleActionEdit(
+    surgeryReportId,
+    await composeFormData(),
+    () => { },
+    () => { },
+    toast,
+  )
+  goBack()
+}
+
+async function composeFormData(): Promise<SurgeryReport> {
+  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
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Update Laporan Operasi</div>
+  <code>{{ selectedOperativeAction }}</code>
+  <AppSurgeryReportEntry
+    ref="inputForm"
+    :schema="SurgeryReportSchema"
+    :operative-action-list="[]"
+  />
+  
+  <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/surgery-report/list.vue b/app/components/content/surgery-report/list.vue
new file mode 100644
index 00000000..82bbd7b3
--- /dev/null
+++ b/app/components/content/surgery-report/list.vue
@@ -0,0 +1,200 @@
+<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/surgery-report.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 Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+// #endregion
+
+// #region State
+const props = defineProps<{
+  encounter?: Encounter
+}>()
+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: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'surgery-report',
+})
+
+const isHistoryDialogOpen = ref(false)
+const isFilterDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+const summaryLoading = ref(false)
+const isRequirementsMet = ref(true)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+const headerPrep: HeaderPrep = {
+  title: "Laporan Operasi",
+  icon: 'i-lucide-history',
+  addNav: {
+    label: "Laporan Operasi",
+    onClick: () => navigateTo({
+        name: 'rehab-encounter-id-surgery-report-add',
+        params: { id: encounterId },
+      }),
+  },
+}
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    isFilterDialogOpen.value = true
+  },
+  onInput: (val: string) => {
+    searchInput.value = val
+  },
+  onClear: () => {
+    searchInput.value = ''
+  },
+}
+  headerPrep.components = [
+    {
+      component: defineAsyncComponent(() => import('~/components/app/surgery-report/_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
+  }
+}
+
+// Handle confirmation result
+function handleFiltering(value: any) {
+  isFilterDialogOpen.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('table_data_loader', isLoading)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'rehab-encounter-id-surgery-report-control_letter_id',
+        params: { id: encounterId, "control_letter_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      // TODO: Handle edit action
+      // isFormEntryDialogOpen.value = true
+      navigateTo({
+        name: 'rehab-encounter-id-surgery-report-control_letter_id-edit',
+        params: { id: encounterId, "control_letter_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmDelete:
+      // Trigger confirmation modal open
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <WarningAlert v-if="!isRequirementsMet"
+    class="mb-5"
+    text="Syarat pembuatan Laporan Operasi belum terpenuhi"
+    :description="[
+      'Lanjutan Penatalaksanaan Pasien harus pulang/KRS.',
+      'Status Resume Medis harus tervalidasi.'
+    ]" />
+
+  <div v-else>
+    <Header :prep="headerPrep" />
+
+    <Filter
+      :prep="headerPrep"
+      :ref-search-nav="refSearchNav"
+      :enable-export="false"
+    />
+
+    <AppSurgeryReportList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+    <Dialog v-model:open="isFilterDialogOpen" title="Filter" size="lg">
+      <AppSurgeryReportCommonFilter @submit="handleFiltering" />
+    </Dialog>
+
+    <Dialog v-model:open="isHistoryDialogOpen" title="History">
+      <AppSurgeryReportCommonHistoryDialog />
+    </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/therapy-protocol/add.vue b/app/components/content/therapy-protocol/add.vue
new file mode 100644
index 00000000..bb184e23
--- /dev/null
+++ b/app/components/content/therapy-protocol/add.vue
@@ -0,0 +1,152 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { ExposedForm } from '~/types/form'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import { toast } from '~/components/pub/ui/toast'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { TherapyProtocolMedicRehabilitationSchema, TherapyProtocolSchema } from '~/schemas/therapy-protocol.schema'
+import { handleActionSave } from '~/handlers/therapy-protocol.handler'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+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
+  formData.medicalDiagnoses = JSON.stringify(formData.medicalDiagnoses)
+  formData.functionDiagnoses = JSON.stringify(formData.functionDiagnoses)
+  formData.procedures = JSON.stringify(formData.procedures)
+  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) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+const initial = {
+  // Required String Fields
+  form1ExaminationDate: "2025-11-06",
+  form1Diagnose: 'Awwww',
+  form1TherapyRequest: 'Awwww',
+  form1TargetPeriod: 4,
+  form1TherapyTarget: 'Awwww',
+  form2RelationshipToInsured: 'child',
+  anamnesis: 'Bobo aja wak',
+  form2PhysicalExamination: 'Awwww',
+  medicalDiagnoses: [
+      {
+          id: 3,
+          code: "PROC002",
+          name: "Cesarean section"
+      }
+  ],
+  functionDiagnoses: [
+      {
+          id: 3,
+          code: "PROC002",
+          name: "Cesarean section"
+      }
+  ],
+  procedures: [
+      {
+          id: 5,
+          code: "PROC0100",
+          name: "Physical therapy session"
+      }
+  ],
+  supportingExams: 'Awwww',
+  evaluation: 'Awwww',
+  instruction: 'Awwww',
+  workCauseStatus: 'TIDAK', 
+  form3ExaminationDate: "2025-11-06",
+  form3Diagnose: 'Awwww',
+  form3TherapyRequest: 'Awwww',
+  form3ProgramActivities: ['Menonton Kakek Meninggoy',],
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Tambah</div>
+  <AppTherapyProtocolEntry
+    ref="inputForm"
+    :schema="TherapyProtocolMedicRehabilitationSchema"
+    :resume-arrangement-type="inputForm?.values.arrangement"
+    :initial-values="initial"
+  />
+  
+  <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>
diff --git a/app/components/content/therapy-protocol/detail.vue b/app/components/content/therapy-protocol/detail.vue
new file mode 100644
index 00000000..e40a8044
--- /dev/null
+++ b/app/components/content/therapy-protocol/detail.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import type { ExposedForm } from '~/types/form';
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const personPatientForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const recDate = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  // handleActionClick('submit')
+  console.log(`tersubmit wak`)
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) {
+      await navigateTo(props.callbackUrl)
+      return
+    }
+
+    goBack()
+    // handleCancelForm()
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('rec_date', recDate) // for divergence if we trigger same action on same Record Item multiple times
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, recDate], () => {
+  switch (recAction.value) {
+    case ActionEvents.showConfirmVerify:
+      handleActionClick('submit')
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <AppTherapyProtocolDetail />
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Konfirmasi"
+    message="Apakah Anda yakin ingin Konfirmasi data ini?"
+    confirm-text="Konfirmasi"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/edit.vue b/app/components/content/therapy-protocol/edit.vue
new file mode 100644
index 00000000..99dd569e
--- /dev/null
+++ b/app/components/content/therapy-protocol/edit.vue
@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import type { ExposedForm } from '~/types/form';
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { getDetail } from '~/services/therapy-protocol.service';
+import { handleActionEdit } from '~/handlers/therapy-protocol.handler'
+import { TherapyProtocolMedicRehabilitationSchema } from '~/schemas/therapy-protocol.schema';
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const therapyId = typeof route.params.therapy_protocol_id == 'string' ? parseInt(route.params.therapy_protocol_id) : 0
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(therapyId)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    currentValue.medicalDiagnoses = await JSON.parse(currentValue.medicalDiagnoses)
+    currentValue.functionDiagnoses = await JSON.parse(currentValue.functionDiagnoses)
+    currentValue.procedures = await JSON.parse(currentValue.procedures)
+    console.log(currentValue)
+    inputForm.value?.setValues(currentValue)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionEdit(
+    inputData,
+    therapyId,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+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
+  formData.medicalDiagnoses = JSON.stringify(formData.medicalDiagnoses)
+  formData.functionDiagnoses = JSON.stringify(formData.functionDiagnoses)
+  formData.procedures = JSON.stringify(formData.procedures)
+  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) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Edit</div>
+  <AppTherapyProtocolEntry
+    ref="inputForm"
+    :schema="TherapyProtocolMedicRehabilitationSchema"
+    :resume-arrangement-type="inputForm?.values.arrangement"
+  />
+  
+  <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>
diff --git a/app/components/content/therapy-protocol/history-list.vue b/app/components/content/therapy-protocol/history-list.vue
new file mode 100644
index 00000000..c04e7143
--- /dev/null
+++ b/app/components/content/therapy-protocol/history-list.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+
+// #region Imports
+import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getPatients, removePatient } from '~/services/patient.service'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+// #endregion
+
+// Props
+interface Props {
+}
+const props = defineProps<Props>()
+// #endregion
+
+// #region State
+const isVerifyDialogOpen = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getPatients({ ...params, includes: ['person', 'person-Addresses'] }),
+  entityName: 'patient',
+})
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const summaryLoading = ref(false)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+})
+// #endregion
+
+// #region Functions
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+async function handleConfirmAdd() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.value = false
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'therapy-protocol-id-detail',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'therapy-protocol-id-edit',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmVerify:
+      // Trigger confirmation modal open
+      handleConfirmAdd()
+      break
+
+    case ActionEvents.showPrint:
+      navigateTo('https://google.com', {
+        external: true,
+        open: { target: "_blank" },
+      });
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+
+  <Popover>
+      <PopoverTrigger as-child>
+        <Button variant="outline" :class="cn('mb-3 w-[280px] justify-start text-left font-normal',
+          !dateValue && 'text-muted-foreground')">
+          <CalendarIcon class="mr-2 h-4 w-4" />
+          <template v-if="dateValue.start">
+            <template v-if="dateValue.end">
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }} -
+              {{ df.format(dateValue.end.toDate(getLocalTimeZone())) }}
+            </template>
+
+            <template v-else>
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }}
+            </template>
+          </template>
+          <template v-else> Pick a date </template>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent class="w-auto p-0">
+        <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+          @update:start-value="(startDate) => (dateValue.start = startDate)" />
+      </PopoverContent>
+    </Popover>
+
+    <AppTherapyProtocolHistoryDialog
+      :data="data"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange" />
+</template>
\ No newline at end of file
diff --git a/app/components/content/therapy-protocol/list.vue b/app/components/content/therapy-protocol/list.vue
new file mode 100644
index 00000000..670f09ec
--- /dev/null
+++ b/app/components/content/therapy-protocol/list.vue
@@ -0,0 +1,262 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+
+// #region Imports
+import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getList, remove } from '~/services/therapy-protocol.service'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import type { ExposedForm } from '~/types/form'
+import { VerificationSchema } from '~/schemas/verification.schema'
+import { handleActionSave } from '~/handlers/therapy-protocol.handler'
+import { toast } from '~/components/pub/ui/toast'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+// #endregion
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+// #endregion
+
+// #region State
+const isVerifyDialogOpen = ref(false)
+const isHistoryDialogOpen = ref(false)
+const isPatientInTherapy = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'therapy-protocol',
+})
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const isRecordConfirmationOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const summaryLoading = ref(false)
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<number>(0)
+
+const isCaptchaValid = ref(false)
+provide('isCaptchaValid', isCaptchaValid)
+
+const headerPrep: HeaderPrep = {
+  title: "Protokol Terapi",
+  icon: 'i-lucide-newspaper',
+  addNav: {
+    label: "Protokol Terapi",
+    onClick: () => navigateTo({
+      name: 'rehab-encounter-id-therapy-protocol-add',
+    }),
+  },
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+
+  const isInTherapy = false // TODO: determine if patient is in therapy
+  handleIsPatientInTherapy(isInTherapy)
+})
+// #endregion
+
+// #region Functions
+function handleIsPatientInTherapy(value: boolean) {
+  if (value) {
+    isPatientInTherapy.value = true
+  } else {
+    isPatientInTherapy.value = false
+  }
+}
+async function handleOpenHistory() {
+  isHistoryDialogOpen.value = true
+  console.log(`jalan history`)
+}
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+async function handleVerify() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleConfirmVerify() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  isVerifyDialogOpen.value = false
+}
+
+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
+  // formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    handleConfirmVerify()
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.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)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'therapy-protocol-id-detail',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'rehab-encounter-id-therapy-protocol-therapy_protocol_id-edit',
+        params: { therapy_protocol_id: recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmVerify:
+      // Trigger confirmation modal open
+      handleVerify()
+      break
+
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <section class="mb-5 flex justify-between items-center">
+    <!-- DATE RANGE -->
+    <Popover>
+      <PopoverTrigger as-child>
+        <Button variant="outline" :class="cn('w-[280px] justify-start text-left font-normal',
+          !dateValue && 'text-muted-foreground')">
+          <CalendarIcon class="mr-2 h-4 w-4" />
+          <template v-if="dateValue.start">
+            <template v-if="dateValue.end">
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }} -
+              {{ df.format(dateValue.end.toDate(getLocalTimeZone())) }}
+            </template>
+
+            <template v-else>
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }}
+            </template>
+          </template>
+          <template v-else> Pick a date </template>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent class="w-auto p-0">
+        <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+          @update:start-value="(startDate) => (dateValue.start = startDate)" />
+      </PopoverContent>
+    </Popover>
+
+    <!-- HISTORY -->
+    <Button variant="outline" :class="cn('',)" @click="handleOpenHistory">
+          <Icon name="i-lucide-history" class="h-4 w-4" />
+          History
+    </Button>
+  </section>
+
+  <AppTherapyProtocolCommonBannerPatientInTherapy 
+    v-if="isPatientInTherapy"
+    class="mb-5" />
+    
+  <AppTherapyProtocolList
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"/>
+
+  <Dialog v-model:open="isVerifyDialogOpen" title="Verifikasi">
+    <AppTherapyProtocolVerifyDialog
+      ref="inputForm"
+      :schema="VerificationSchema"
+    />
+    <div class="flex justify-end">
+      <Action v-show="isCaptchaValid" :enable-draft="false" @click="handleActionClick" />
+    </div>
+  </Dialog>
+
+  <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+    <ContentTherapyProtocolHistoryList />
+  </Dialog>
+
+  <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+    <!-- <DocPreviewDialog :link="recItem.url" /> -->
+    <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+  </Dialog>
+</template>
\ No newline at end of file
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/layout/AppSidebar.vue b/app/components/layout/AppSidebar.vue
index a14b2137..2ee07219 100644
--- a/app/components/layout/AppSidebar.vue
+++ b/app/components/layout/AppSidebar.vue
@@ -48,9 +48,18 @@ async function setMenu() {
   const activeRoleParts = activeRole ? activeRole.split('|') : []
   const role = activeRoleParts[0]+(activeRoleParts.length > 1 ? `-${activeRoleParts[1]}` : '')
   try {
+
     const res = await fetch(`/side-menu-items/${role.toLowerCase()}.json`)
     const rawMenu = await res.text()
-    navMenu.value = JSON.parse(rawMenu)
+    const parsedMenu = JSON.parse(rawMenu)
+
+    const { user } = useUserStore()
+    if(user.unit_code == 'rehab') {
+      parsedMenu[0].heading = 'Rehab Medik'
+      parsedMenu[0].items = parsedMenu[0].items.filter((item: any) => item.title != 'IGD')
+    }
+
+    navMenu.value = parsedMenu
   } catch (e) {
     const res = await fetch(`/side-menu-items/blank.json`)
     const rawMenu = await res.text()
diff --git a/app/components/pub/my-ui/combobox/combobox.vue b/app/components/pub/my-ui/combobox/combobox.vue
index 713edd57..ab625b01 100644
--- a/app/components/pub/my-ui/combobox/combobox.vue
+++ b/app/components/pub/my-ui/combobox/combobox.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { cn } from '~/lib/utils'
-
 import { type Item } from './index'
 
 const props = defineProps<{
@@ -14,6 +13,8 @@ const props = defineProps<{
   isDisabled?: boolean
 }>()
 
+const model = defineModel()
+
 const emit = defineEmits<{
   'update:modelValue': [value: string]
   'update:searchText': [value: string]
@@ -57,6 +58,7 @@ const searchableItems = computed(() => {
 })
 
 function onSelect(item: Item) {
+  model.value = item.value
   emit('update:modelValue', item.value)
   open.value = false
 }
diff --git a/app/components/pub/my-ui/comp-menu/comp-menu.vue b/app/components/pub/my-ui/comp-menu/comp-menu.vue
new file mode 100644
index 00000000..fab41dde
--- /dev/null
+++ b/app/components/pub/my-ui/comp-menu/comp-menu.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import { type TabItem } from '../comp-tab/type'
+
+const props = defineProps<{
+  initialActiveMenu: string
+  data: TabItem[]
+}>()
+
+const activeMenu = ref(props.initialActiveMenu)
+const emit = defineEmits<{
+  changeMenu: [value: string]
+}>()
+
+function changeMenu(value: string) {
+  activeMenu.value = value
+  emit('changeMenu', value)
+}
+</script>
+
+<template>
+  <div class="mt-4 flex gap-4">
+    <!-- Menu Sidebar -->
+    <div v-if="data.length > 0" class="w-72 flex-shrink-0 rounded-md border bg-white shadow-sm dark:bg-neutral-950">
+      <div class="max-h-[calc(100vh-12rem)] overflow-y-auto p-2">
+        <button
+          v-for="menu in data"
+          :key="menu.value"
+          :data-active="activeMenu === menu.value"
+          class="w-full rounded-md px-4 py-3 text-left text-sm transition-colors data-[active=false]:text-gray-700 data-[active=false]:hover:bg-gray-100 data-[active=true]:bg-primary data-[active=true]:text-white dark:data-[active=false]:text-gray-300 dark:data-[active=false]:hover:bg-neutral-800"
+          @click="changeMenu(menu.value)"
+        >
+          {{ menu.label }}
+        </button>
+      </div>
+    </div>
+
+    <!-- Active Menu Content -->
+    <div v-if="data.find((m) => m.value === activeMenu)?.component" class="flex-1 rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
+      <component
+        :is="data.find((m) => m.value === activeMenu)?.component"
+        v-bind="data.find((m) => m.value === activeMenu)?.props"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/comp-tab/type.ts b/app/components/pub/my-ui/comp-tab/type.ts
index ba21d0b7..6ca710fa 100644
--- a/app/components/pub/my-ui/comp-tab/type.ts
+++ b/app/components/pub/my-ui/comp-tab/type.ts
@@ -3,5 +3,7 @@ export interface TabItem {
   label: string
   component?: any
   groups?: string[]
+  classCode?: string[]
+  subClassCode?: string[]
   props?: Record<string, any>
 }
diff --git a/app/components/pub/my-ui/content-header/content-header.vue b/app/components/pub/my-ui/content-header/content-header.vue
new file mode 100644
index 00000000..be5700a4
--- /dev/null
+++ b/app/components/pub/my-ui/content-header/content-header.vue
@@ -0,0 +1,130 @@
+<script setup lang="ts">
+import type { Config } from './index'
+import { refDebounced } from '@vueuse/core'
+
+const props = defineProps<Config>()
+
+const emit = defineEmits<{
+  'update:searchModelValue': [value: string]
+  'search': [value: string]
+}>()
+
+// Quick search
+const search = ref(props.quickSearchNav?.modelValue || props.refSearchNav?.modelValue || '')
+const debouncedSearch = refDebounced(search, props.quickSearchNav?.debounceDuration || 500)
+
+// Computed search model for v-model
+const searchModel = computed({
+  get: () => search.value,
+  set: (value: string) => {
+    search.value = value
+    emit('update:searchModelValue', value)
+  },
+})
+
+// Watch for external changes to modelValue
+watch(() => props.quickSearchNav?.modelValue, (newValue) => {
+  if (newValue !== props.quickSearchNav?.modelValue) {
+    search.value = newValue || ''
+  }
+})
+
+// Watch debounced search and emit search event
+watch(debouncedSearch, (newValue) => {
+  const minLength = props.quickSearchNav?.minLength || 3
+  // Only search if meets minimum length or empty (to clear search)
+  if (newValue.length === 0 || newValue.length >= minLength) {
+    emit('search', newValue)
+    props.refSearchNav?.onInput(newValue)
+  }
+})
+
+// Handle clear search
+function clearSearch() {
+  searchModel.value = ''
+  props.quickSearchNav?.onClear()
+  props.refSearchNav?.onClear()
+}
+</script>
+
+<template>
+  <div class="flex items-center justify-between pb-4 2xl:pb-5 ">
+    <div class="flex items-center">
+      <div class="ml-3 text-lg font-semibold text-gray-900">
+        <Icon v-if="icon" :name="icon" class="mr-2 size-4 md:size-6 align-middle" />
+        {{ title }}
+      </div>
+    </div>
+
+    <div class="flex items-center [&>*]:ms-2">
+      <!-- Slot -->
+      <slot />
+
+      <!-- Search Section -->
+      <div v-if="quickSearchNav || refSearchNav" class="relative">
+        <Input
+          v-model="searchModel"
+          name="search"
+          type="text"
+          :class="quickSearchNav?.inputClass || refSearchNav?.inputClass"
+          :placeholder="quickSearchNav?.placeholder || refSearchNav?.placeholder || 'Cari (min. 3 karakter)...'"
+        />
+
+        <button
+          v-if="search.length > 0"
+          class="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600"
+          type="button"
+          @click="clearSearch"
+        >
+          <Icon name="i-lucide-x" class="h-4 w-4" />
+        </button>
+
+        <div
+          v-if="quickSearchNav && quickSearchNav.showValidationFeedback !== false && searchModel.length > 0 && searchModel.length < (quickSearchNav.minLength || 3)"
+          class="absolute -bottom-6 left-0 text-xs text-amber-600 whitespace-nowrap"
+        >
+          Minimal {{ quickSearchNav.minLength || 3 }} karakter untuk mencari
+        </div>
+      </div>
+
+      <!-- Add Button -->
+      <div v-if="addNav" class="flex items-center">
+        <Button
+          class="rounded-md border border-gray-300 px-4 py-2 text-white sm:text-sm"
+          :class="addNav.classVal"
+          :variant="(addNav.variant as any) || 'default'"
+          @click="addNav?.onClick"
+        >
+          <Icon :name="addNav.icon || 'i-lucide-plus'" class="mr-2 h-4 w-4 align-middle" />
+          {{ addNav.label }}
+        </Button>
+      </div>
+
+      <!-- Filter Button -->
+      <div v-if="filterNav" class="flex items-center">
+        <Button
+          class="rounded-md border border-gray-300 px-4 py-2 sm:text-sm"
+          :class="filterNav.classVal"
+          :variant="(filterNav.variant as any) || 'default'"
+          @click="filterNav?.onClick"
+        >
+          <Icon :name="filterNav.icon || 'i-lucide-filter'" class="mr-2 h-4 w-4 align-middle" />
+          {{ filterNav.label }}
+        </Button>
+      </div>
+
+      <!-- Print Button -->
+      <div v-if="printNav" class="flex items-center">
+        <Button
+          class="rounded-md border border-gray-300 px-4 py-2 sm:text-sm"
+          :class="printNav.classVal"
+          :variant="(printNav.variant as any) || 'default'"
+          @click="printNav?.onClick"
+        >
+          <Icon :name="printNav.icon || 'i-lucide-printer'" class="mr-2 h-4 w-4 align-middle" />
+          {{ printNav.label }}
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/content-header/index.ts b/app/components/pub/my-ui/content-header/index.ts
new file mode 100644
index 00000000..7c07f9d5
--- /dev/null
+++ b/app/components/pub/my-ui/content-header/index.ts
@@ -0,0 +1,59 @@
+export type ComponentWithProps = { component: Component, props: Record<string, any> }
+
+export interface ButtonNav {
+  variant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link'
+  classVal?: string
+  classValExt?: string
+  icon?: string
+  label: string
+  onClick?: () => void
+}
+
+// can type directly
+export interface QuickSearchNav {
+  modelValue?: string
+  placeholder?: string
+  inputClass?: string
+  inputPlaceHolder?: string
+  minLength?: number
+  btnClass?: string
+  btnIcon?: string
+  btnLabel?: string
+  showValidationFeedback?: boolean
+  debounceDuration?: number
+  searchParams: object
+  onSubmit?: (searchParams: object) => void
+  onClear: () => void
+}
+
+// callback on event
+export interface RefSearchNav {
+  modelValue?: string
+  placeholder?: string
+  inputClass?: string
+  inputPlaceHolder?: string
+  btnClass?: string
+  btnIcon?: string
+  onInput: (val: string) => void
+  onClick: () => void
+  onClear: () => void
+}
+
+export interface RefExportNav {
+  onExportPdf?: () => void
+  onExportCsv?: () => void
+  onExportExcel?: () => void
+}
+
+export interface Config {
+  title?: string
+  icon?: string
+  components?: ComponentWithProps[]
+  quickSearchNav?: QuickSearchNav
+  refSearchNav?: RefSearchNav // either ref or quick
+  filterNav?: ButtonNav
+  addNav?: ButtonNav
+  printNav?: ButtonNav
+}
+
+export { default as ContentHeader } from './content-header.vue'
diff --git a/app/components/pub/my-ui/content-switcher/content-switcher.vue b/app/components/pub/my-ui/content-switcher/content-switcher.vue
new file mode 100644
index 00000000..267d94c1
--- /dev/null
+++ b/app/components/pub/my-ui/content-switcher/content-switcher.vue
@@ -0,0 +1,58 @@
+<script setup lang="ts">
+const props = defineProps<{
+  height?: number
+  class?: string
+  activeTab?: 1 | 2
+}>()
+
+const classVal = computed(() => {
+  return props.class ? props.class : ''
+})
+const activeTab = ref(props.activeTab || 1)
+
+function switchActiveTab() {
+  activeTab.value = activeTab.value === 1 ? 2 : 1
+}
+</script>
+
+<template>
+  <div :class="`content-switcher ${classVal}`" :style="height ? `height:${200}px` : ''">
+    <div class="wrapper">
+      <div :class="`item item-1 ${activeTab === 1 ? 'active' : 'inactive'}`">
+        <slot name="content1" />
+      </div>
+      <div :class="`nav border-slate-300 ${ activeTab == 1 ? 'border-l' : 'border-r'}`">
+        <button @click="switchActiveTab()" class="!p-0 w-full h-full">
+          <Icon :name="activeTab == 1 ? 'i-lucide-chevron-left' : 'i-lucide-chevron-right'" class="text-3xl" />
+        </button>
+      </div>
+      <div :class="`item item-2 ${activeTab === 2 ? 'active' : 'inactive'}`">
+        <slot name="content2" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<style>
+  .content-switcher {
+    @apply overflow-hidden
+  }
+  .wrapper {
+    @apply flex w-[200%] h-full
+  }
+  .item {
+    @apply w-[calc(50%-60px)]
+  }
+
+  .item-1.active {
+    @apply ms-0 transition-all duration-500 ease-in-out
+  }
+  .item-1.inactive {
+    @apply -ms-[calc(50%-60px)] transition-all duration-500 ease-in-out
+  }
+
+  .nav {
+    @apply h-full w-[60px] flex flex-row items-center justify-center content-center !text-2xl overflow-hidden
+  }
+
+</style>
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-dp.vue b/app/components/pub/my-ui/data/dropdown-action-dp.vue
new file mode 100644
index 00000000..479cfebd
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-dp.vue
@@ -0,0 +1,77 @@
+<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 activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+}
+</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/dropdown-action-duvp.vue b/app/components/pub/my-ui/data/dropdown-action-duvp.vue
new file mode 100644
index 00000000..22952bd5
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-duvp.vue
@@ -0,0 +1,106 @@
+<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: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Edit',
+    onClick: () => {
+      edit()
+    },
+    icon: 'i-lucide-pencil',
+  },
+  {
+    label: 'Verifikasi',
+    onClick: () => {
+      verify()
+    },
+    icon: 'i-lucide-shield-check',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function edit() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showEdit
+  recItem.value = props.rec
+}
+
+function verify() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  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
+}
+</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/dropdown-action-p.vue b/app/components/pub/my-ui/data/dropdown-action-p.vue
new file mode 100644
index 00000000..2b7ad617
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<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 activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</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/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/print-btn.vue b/app/components/pub/my-ui/data/print-btn.vue
new file mode 100644
index 00000000..a3d131b8
--- /dev/null
+++ b/app/components/pub/my-ui/data/print-btn.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+const props = defineProps<{
+  url: string
+  btnTxt?: string
+  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 handlePrint() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+  timestamp.value = new Date().toISOString()
+}
+</script>
+
+<template>
+  <Button 
+    class="gap-3 items-center border-orange-400 text-orange-400"
+    variant="outline" @click="handlePrint">
+    <Icon name="i-lucide-printer" class="h-4 w-4" />
+    {{ props.btnTxt || 'Preview' }}
+  </Button>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/data/types.ts b/app/components/pub/my-ui/data/types.ts
index 0d747580..126c5d8d 100644
--- a/app/components/pub/my-ui/data/types.ts
+++ b/app/components/pub/my-ui/data/types.ts
@@ -71,9 +71,11 @@ export interface KeyNames {
 
 export interface LinkItem {
   label: string
+  value?: string
   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
 }
@@ -84,7 +86,9 @@ export const ActionEvents = {
   showEdit: 'showEdit',
   showDetail: 'showDetail',
   showProcess: 'showProcess',
+  showCancel: 'showCancel',
   showVerify: 'showVerify',
+  showConfirmVerify: 'showConfirmVerify',
   showValidate: 'showValidate',
   showPrint: 'showPrint',
 }
diff --git a/app/components/pub/my-ui/doc-entry/block.vue b/app/components/pub/my-ui/doc-entry/block.vue
index b51ad72a..7e217542 100644
--- a/app/components/pub/my-ui/doc-entry/block.vue
+++ b/app/components/pub/my-ui/doc-entry/block.vue
@@ -53,8 +53,8 @@ const settingClass = computed(() => {
       '[&_.cell]:2xl:flex',
     ][getBreakpointIdx(props.cellFlexPoint)]
     cls += ' [&_.label]:flex-shrink-0 ' + [
-      '[&_.label]:md:w-12 [&_.label]:xl:w-20',
-      '[&_.label]:md:w-16 [&_.label]:xl:w-24',
+      '[&_.label]:md:w-16 [&_.label]:xl:w-20',
+      '[&_.label]:md:w-20 [&_.label]:xl:w-24',
       '[&_.label]:md:w-24 [&_.label]:xl:w-32',
       '[&_.label]:md:w-32 [&_.label]:xl:w-40',
       '[&_.label]:md:w-44 [&_.label]:xl:w-52',
diff --git a/app/components/pub/my-ui/doc-entry/colon.vue b/app/components/pub/my-ui/doc-entry/colon.vue
index a6d379f5..6c3b3100 100644
--- a/app/components/pub/my-ui/doc-entry/colon.vue
+++ b/app/components/pub/my-ui/doc-entry/colon.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
-
+const { class: classProp } = defineProps<{
+  class?: string
+}>()
 </script>
 
 <template>
-  <div class="w-5 text-center">:</div>    
+  <div :class="`w-4 ps-1 ${classProp}`">:</div>
 </template>
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/form/text-area-input.vue b/app/components/pub/my-ui/form/text-area-input.vue
index c7b7c794..43002c80 100644
--- a/app/components/pub/my-ui/form/text-area-input.vue
+++ b/app/components/pub/my-ui/form/text-area-input.vue
@@ -47,7 +47,7 @@ function handleInput(event: Event) {
 <template>
   <DE.Cell :col-span="colSpan || 1">
     <DE.Label
-      class="mb-1"
+      class="font-medium mb-1"
       v-if="label !== ''"
       :label-for="fieldName"
       :is-required="isRequired && !isDisabled"
@@ -69,7 +69,7 @@ function handleInput(event: Event) {
               v-bind="componentField"
               :placeholder="placeholder"
               :maxlength="maxLength"
-              :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0')"
+              :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0', props.class)"
               autocomplete="off"
               aria-autocomplete="none"
               autocorrect="off"
diff --git a/app/components/pub/my-ui/form/view/detail-row.vue b/app/components/pub/my-ui/form/view/detail-row.vue
index 2b2b8f6f..c46b77b6 100644
--- a/app/components/pub/my-ui/form/view/detail-row.vue
+++ b/app/components/pub/my-ui/form/view/detail-row.vue
@@ -1,13 +1,17 @@
 <script setup lang="ts">
-defineProps<{
+import { cn } from '~/lib/utils';
+
+const props = defineProps<{
   label: string
+  class?: string
+  labelClass?: string
 }>()
 </script>
 
 <template>
-  <div class="flex flex-col gap-1 lg:grid lg:grid-cols-[180px_minmax(0,1fr)] lg:gap-x-3">
+  <div :class="cn(`flex flex-col gap-1 lg:grid lg:grid-cols-[180px_minmax(0,1fr)] lg:gap-x-3`, props.class)">
     <!-- Label -->
-    <span class="text-md font-normal text-muted-foreground">
+    <span :class="cn(`text-md font-normal text-muted-foreground`, props.labelClass)">
       {{ label }}
     </span>
 
diff --git a/app/components/pub/my-ui/menus/submenu.vue b/app/components/pub/my-ui/menus/submenu.vue
new file mode 100644
index 00000000..8d60f742
--- /dev/null
+++ b/app/components/pub/my-ui/menus/submenu.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { type EncounterItem } from "~/handlers/encounter-init.handler";
+
+const props = defineProps<{
+  initialActiveMenu: string
+  data: EncounterItem[]
+  canCreate?: boolean
+  canRead?: boolean
+  canUpdate?: boolean
+  canDelete?: boolean
+}>()
+
+const activeMenu = ref(props.initialActiveMenu)
+const emit = defineEmits<{
+  changeMenu: [value: string]
+}>()
+
+function changeMenu(value: string) {
+  activeMenu.value = value
+  emit('changeMenu', value)
+}
+</script>
+
+<template>
+  <div class="flex">
+    <!-- Menu Sidebar -->
+    <div v-if="data.length > 0" class="w-56 2xl:w-64 flex-shrink-0 rounded-md border bg-white dark:bg-slate-800 shadow-sm">
+      <div class="max-h-[calc(100vh-12rem)] overflow-y-auto px-2 py-3">
+        <button
+          v-for="menu in data"
+          :key="menu.id"
+          :data-active="activeMenu === menu.id"
+          class="w-full rounded-md px-4 py-3 text-left text-xs 2xl:text-sm transition-colors data-[active=false]:text-gray-700 data-[active=false]:hover:bg-gray-100 data-[active=true]:bg-primary data-[active=true]:text-white dark:data-[active=false]:text-gray-300 dark:data-[active=false]:hover:bg-neutral-800"
+          @click="changeMenu(menu.id)">
+          {{ menu.title }}
+        </button>
+      </div>
+    </div>
+    <!-- Active Menu Content -->
+    <div class="p-4 2xl:p-5 flex-grow">
+      <div v-if="data.find((m) => m.id === activeMenu)?.component"
+        class="flex-1 rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
+        <component
+          :is="data.find((m) => m.id === activeMenu)?.component"
+          v-bind="data.find((m) => m.id === activeMenu)?.props"
+          :can-create="canCreate"
+          :can-read="canRead"
+          :can-update="canUpdate"
+          :can-delete="canDelete"
+        />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/modal/dialog.vue b/app/components/pub/my-ui/modal/dialog.vue
index d771924f..1a3614f6 100644
--- a/app/components/pub/my-ui/modal/dialog.vue
+++ b/app/components/pub/my-ui/modal/dialog.vue
@@ -45,15 +45,12 @@ const isOpen = computed({
 
 <template>
   <Dialog v-model:open="isOpen">
-    <DialogContent
-      :class="sizeClass"
-      @interact-outside="(e: any) => preventOutside && e.preventDefault()"
-      @pointer-down-outside="(e: any) => preventOutside && e.preventDefault()"
-    >
+    <DialogContent :class="sizeClass" @interact-outside="(e: any) => preventOutside && e.preventDefault()"
+      @pointer-down-outside="(e: any) => preventOutside && e.preventDefault()">
       <DialogHeader>
         <DialogTitle :class="`text-sm 2xl:text-base font-semibold flex ${titleClass || ''}`">
-          <div v-if="props.titleIcon" class="me-2 pt-0.5">
-            <Icon :name="props.titleIcon" :class="`!pt-2`" />
+          <div class="me-2 pt-0.5">
+            <Icon v-if="props.titleIcon" :name="props.titleIcon" :class="`!pt-2`" />
           </div>
           <div>
             {{ props.title }}
@@ -66,4 +63,4 @@ const isOpen = computed({
       </DialogDescription>
     </DialogContent>
   </Dialog>
-</template>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/nav-content/ba.vue b/app/components/pub/my-ui/nav-content/ba.vue
index c31fe72c..5ebb6386 100644
--- a/app/components/pub/my-ui/nav-content/ba.vue
+++ b/app/components/pub/my-ui/nav-content/ba.vue
@@ -20,7 +20,7 @@ function onClick(type: ClickType) {
     @click="onClick('draft')"
     class="flex items-center gap-2 rounded-full border border-orange-400 bg-orange-50 px-3 py-1 text-sm font-medium text-orange-600 hover:bg-orange-100"
   >
-    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+  <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
     </svg>
     {{ props.label }}
diff --git a/app/components/pub/my-ui/nav-footer/ba-dr-su.vue b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
index 11d6e9e3..83c38b53 100644
--- a/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
+++ b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
@@ -26,7 +26,7 @@ function onClick(type: ClickType) {
   <div :class="`${defaultClass} ${additionalClass} ${btnClass}`">
     <div>
       <Button variant="ghost" type="button" @click="onClick('back')">
-        <Icon name="i-lucide-arrow-left"  />
+        <Icon name="i-lucide-arrow-left" />
         Back
       </Button>
     </div>
@@ -38,7 +38,7 @@ function onClick(type: ClickType) {
     </div>
     <div>
       <Button type="button" @click="onClick('submit')">
-        <Icon name="i-lucide-check"  />
+        <Icon name="i-lucide-check" />
         Submit
       </Button>
     </div>
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/components/pub/my-ui/nav-header/filter.vue b/app/components/pub/my-ui/nav-header/filter.vue
index 74f6d8dc..27b93a1b 100644
--- a/app/components/pub/my-ui/nav-header/filter.vue
+++ b/app/components/pub/my-ui/nav-header/filter.vue
@@ -50,8 +50,11 @@ const value = ref({
   end: todayCalendar,
 }) as Ref<DateRange>
 
+
+function onInput(event: Event) {
+  props.refSearchNav?.onInput((event.target as HTMLInputElement).value)
+}
 function onFilterClick() {
-  console.log('Search:', searchQuery.value)
   console.log('Date Range:', dateRange.value)
   props.refSearchNav?.onClick()
 }
@@ -60,9 +63,11 @@ function onFilterClick() {
 <template>
   <header>
     <div class="flex items-center gap-2 mb-4 2xl:mb-5">
-      <div class="relative w-64">
+      
+      <div v-if="refSearchNav" 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" @input="onInput"
+          type="text" placeholder="Cari .." class="pl-9" />
       </div>
 
       <Popover>
@@ -101,7 +106,7 @@ function onFilterClick() {
       </Button>
 
       <DropdownMenu v-show="props.enableExport">
-        <DropdownMenuTrigger as-child>
+        <DropdownMenuTrigger v-show="props.enableExport" 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" />
             Ekspor
diff --git a/app/components/pub/my-ui/nav-header/prep.vue b/app/components/pub/my-ui/nav-header/prep.vue
index 7aa5e4f2..18eb2624 100644
--- a/app/components/pub/my-ui/nav-header/prep.vue
+++ b/app/components/pub/my-ui/nav-header/prep.vue
@@ -37,6 +37,10 @@ function btnClick() {
         </div>
       </div>
       <div class="flex items-center">
+        <!-- For components as slots -->
+        <slot />
+
+        <!-- For components passed by props -->
         <div v-if="prep.components">
           <template v-for="cwp in prep.components">
             <component
diff --git a/app/components/pub/my-ui/nav-header/search.vue b/app/components/pub/my-ui/nav-header/search.vue
index 6e42c36f..db7f7e99 100644
--- a/app/components/pub/my-ui/nav-header/search.vue
+++ b/app/components/pub/my-ui/nav-header/search.vue
@@ -32,7 +32,7 @@ function btnClick() {
         />
       </div>
       <div v-if="prep.addNav" class="m-2 flex items-center">
-        <Button size="md" class="rounded-md border border-gray-300 px-4 py-2 text-white sm:text-sm" @click="btnClick">
+        <Button size="default" class="rounded-md border border-gray-300 px-4 py-2 text-white sm:text-sm" @click="btnClick">
           <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle" />
           {{ prep.addNav.label }}
         </Button>
diff --git a/app/composables/useQueryCRUD.ts b/app/composables/useQueryCRUD.ts
index f81649bd..2147b49b 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()
@@ -18,7 +70,13 @@ export function useQueryCRUDMode(key: string = 'mode') {
     },
   })
 
-  const goToEntry = () => (mode.value = 'entry')
+  const goToEntry = (myRecord_id?: any) => {
+    mode.value = 'entry'
+    if(myRecord_id) {
+      myRecord_id.value = myRecord_id
+    }
+  }
+
   const backToList = () => {
     router.push({
       path: route.path,
@@ -26,7 +84,7 @@ export function useQueryCRUDMode(key: string = 'mode') {
         ...route.query,
         mode: 'list',
         // HAPUS record-id
-        'record-id': undefined,
+        recordIdKey: undefined,
       },
     })
   }
@@ -54,3 +112,4 @@ export function useQueryCRUDRecordId(key: string = 'record-id') {
 
   return { recordId }
 }
+
diff --git a/app/composables/useRBAC.ts b/app/composables/useRBAC.ts
index 076cae68..60cfd9d1 100644
--- a/app/composables/useRBAC.ts
+++ b/app/composables/useRBAC.ts
@@ -1,4 +1,5 @@
-import type { Permission, RoleAccess } from '~/models/role'
+import type { Permission, RoleAccesses } from '~/models/role'
+import { systemCode } from '~/const/common/role'
 
 export interface PageOperationPermission {
   canRead: boolean
@@ -7,7 +8,6 @@ export interface PageOperationPermission {
   canDelete: boolean
 }
 
-
 /**
  * Check if user has access to a page
  */
@@ -15,19 +15,27 @@ export function useRBAC() {
   // NOTE: this roles was dummy for testing only, it should taken from the user store
   const authStore = useUserStore()
 
-  const checkRole = (roleAccess: RoleAccess, _userRoles?: string[]): boolean => {
-    const roles = authStore.userRole
-    return roles.some((role: string) => (role in roleAccess) || role === 'system') // system by-passes this check
+  const checkRole = (roleAccesses: RoleAccesses, _userRoles?: string[]): boolean => {
+    const activeRole = authStore.getActiveRole() || ''
+    if (activeRole === systemCode) {
+      return true
+    }
+    return (activeRole in roleAccesses);
   }
 
-  const checkPermission = (roleAccess: RoleAccess, permission: Permission, _userRoles?: string[]): boolean => {
-    const roles = authStore.userRole
-    return roles.some((role: string) => roleAccess[role]?.includes(permission) || role === 'system') // system by-passes this check
+  const checkPermission = (roleAccesses: RoleAccesses, permission: Permission, _userRoles?: string[]): boolean => {
+    const activeRole = authStore.getActiveRole() || ''
+    if (activeRole === systemCode) {
+      return true
+    }
+    if (activeRole in roleAccesses && roleAccesses[activeRole]) {
+      return roleAccesses[activeRole].includes(permission)
+    }
+    return false
   }
 
-  const getUserPermissions = (roleAccess: RoleAccess, _userRoles?: string[]): Permission[] => {
-    const roles = authStore.userRole
-    // const roles = ['admisi']
+  const getUserPermissions = (roleAccess: RoleAccesses, _userRoles?: string[]): Permission[] => {
+    const roles = authStore.userRoles
     const permissions = new Set<Permission>()
 
     roles.forEach((role: string) => {
@@ -39,12 +47,12 @@ export function useRBAC() {
     return Array.from(permissions)
   }
 
-  const hasCreateAccess = (roleAccess: RoleAccess) => checkPermission(roleAccess, 'C')
-  const hasReadAccess = (roleAccess: RoleAccess) => checkPermission(roleAccess, 'R')
-  const hasUpdateAccess = (roleAccess: RoleAccess) => checkPermission(roleAccess, 'U')
-  const hasDeleteAccess = (roleAccess: RoleAccess) => checkPermission(roleAccess, 'D')
+  const hasCreateAccess = (roleAccess: RoleAccesses) => checkPermission(roleAccess, 'C')
+  const hasReadAccess = (roleAccess: RoleAccesses) => checkPermission(roleAccess, 'R')
+  const hasUpdateAccess = (roleAccess: RoleAccesses) => checkPermission(roleAccess, 'U')
+  const hasDeleteAccess = (roleAccess: RoleAccesses) => checkPermission(roleAccess, 'D')
 
-  const getPagePermissions = (roleAccess: RoleAccess): PageOperationPermission => ({
+  const getPagePermissions = (roleAccess: RoleAccesses): PageOperationPermission => ({
       canRead : hasReadAccess(roleAccess),
       canCreate: hasCreateAccess(roleAccess),
       canUpdate: hasUpdateAccess(roleAccess),
diff --git a/app/const/common/role.ts b/app/const/common/role.ts
new file mode 100644
index 00000000..a0d4565a
--- /dev/null
+++ b/app/const/common/role.ts
@@ -0,0 +1,36 @@
+export const systemCode = 'system'
+
+export const rehabInstCode = 'rehab'
+export const rehabUnitCode = 'rehab'
+
+export const headPosCode = 'head' // head position
+export const respPosCode = 'resp' // responsible position, verificator
+
+export type UnitLevel =
+  'inst' | // installation
+  'unit' | // unit / poly
+  'spec' | // specialist
+  'subspec' // subspecialist
+
+export const medicalRoles = [
+  'emp|doc', // doctor
+  'emp|nur', // nurse
+  'emp|miw', // midwife
+  'emp|thr', // therapist
+  'emp|nut', // nutritionist
+  'emp|pha', // pharmacy
+  'emp|lab'  // laborant
+]
+
+export const serviceRoles = [
+  'emp|reg',
+  ...medicalRoles,
+]
+
+export function genSpecHeadCode(unit_level: UnitLevel, unit_code: string): string {
+  return `${unit_level}|${unit_code}|${headPosCode}`
+}
+
+export function genUnitRespCode(unit_level: UnitLevel, unit_code: string): string {
+  return `${unit_level}|${unit_code}|${respPosCode}`
+}
diff --git a/app/lib/clinical-const.ts b/app/const/key-val/clinical.ts
similarity index 97%
rename from app/lib/clinical-const.ts
rename to app/const/key-val/clinical.ts
index d6a37b43..0c33a59c 100644
--- a/app/lib/clinical-const.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/lib/common-const.ts b/app/const/key-val/common.ts
similarity index 100%
rename from app/lib/common-const.ts
rename to app/const/key-val/common.ts
diff --git a/app/lib/encounter-const.ts b/app/const/key-val/encounter.ts
similarity index 100%
rename from app/lib/encounter-const.ts
rename to app/const/key-val/encounter.ts
diff --git a/app/lib/org-const.ts b/app/const/key-val/org.ts
similarity index 100%
rename from app/lib/org-const.ts
rename to app/const/key-val/org.ts
diff --git a/app/lib/person-const.ts b/app/const/key-val/person.ts
similarity index 100%
rename from app/lib/person-const.ts
rename to app/const/key-val/person.ts
diff --git a/app/const/page-permission/ambulatory.ts b/app/const/page-permission/ambulatory.ts
new file mode 100644
index 00000000..b66106d1
--- /dev/null
+++ b/app/const/page-permission/ambulatory.ts
@@ -0,0 +1,177 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/ambulatory/registration-queue': {
+    'emp|reg': ['R', 'U', 'D'],
+  },
+  '/ambulatory/encounter-queue': {
+    'emp|nur': ['R', 'U', 'D'],
+  },
+  '/ambulatory/encounter': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/add': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/ambulatory/encounter/[id]': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/edit': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/ambulatory/encounter/[id]/process': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=status': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=early-medical-assessment': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=fkr': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=education-assessment': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=general-consent': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=patient-amb-note': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=prescription': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=device-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=radiology-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=cp-lab-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=micro-lab-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=pa-lab-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/consulation': {
+    'emp|doc': ['R'],
+  },
+  '/ambulatory/consulation/[id]/process': {
+    'emp|doc': ['R', 'U'],
+  },
+}
diff --git a/app/const/page-permission/chemo.ts b/app/const/page-permission/chemo.ts
new file mode 100644
index 00000000..8796999e
--- /dev/null
+++ b/app/const/page-permission/chemo.ts
@@ -0,0 +1,32 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/chemo/verification': {
+    'emp|reg': ['R'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+  },
+  '/chemo/verification/[id]': {
+    'emp|reg': ['R'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+  },
+  '/chemo/verification/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+  },
+  '/chemo/action': {
+    'emp|reg': ['R', 'U', 'D'],
+  },
+  '/chemo/action/[id]': {
+    'emp|reg': ['R', 'U', 'D'],
+  },
+  '/chemo/action/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+  },
+}
diff --git a/app/const/page-permission/chemoteraphy.ts b/app/const/page-permission/chemoteraphy.ts
new file mode 100644
index 00000000..6a1af6d5
--- /dev/null
+++ b/app/const/page-permission/chemoteraphy.ts
@@ -0,0 +1,16 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/chemotherapy/adm': {
+    'emp|reg': ['R'],
+    'emp|nur': ['R', 'U', 'D'],
+  },
+  '/outpatient/series': {
+    'emp|nur': ['R', 'U', 'D'],
+    'emp|doc': ['R', 'U', 'D'],
+    'emp|thr': ['R', 'U', 'D'],
+  },
+}
diff --git a/app/const/page-permission/emergency.ts b/app/const/page-permission/emergency.ts
new file mode 100644
index 00000000..cfbab478
--- /dev/null
+++ b/app/const/page-permission/emergency.ts
@@ -0,0 +1,67 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/emergency/triage': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/triage/add': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/triage/[id]': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/triage/[id]/edit': {
+    'emp|doc': ['C', 'R', 'U', 'D'],
+    'emp|nur': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/encounter': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/emergency/encounter/add': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/encounter/[id]': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/emergency/encounter/[id]/edit': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/emergency/encounter/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+    'emp|miw': ['R', 'U'],
+    'emp|nut': ['R', 'U'],
+    'emp|pha': ['R', 'U'],
+    'emp|lab': ['R', 'U'],
+    'emp|rad': ['R', 'U'],
+  },
+  '/emergency/consulation': {
+    'emp|doc': ['R'],
+  },
+  '/emergency/consulation/[id]/process': {
+    'emp|doc': ['R', 'U'],
+  },
+}
diff --git a/app/const/page-permission/human-src.ts b/app/const/page-permission/human-src.ts
new file mode 100644
index 00000000..1698f3e5
--- /dev/null
+++ b/app/const/page-permission/human-src.ts
@@ -0,0 +1,25 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/human-src/employee': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/employee/add': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/employee/[id]/edit': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern/add': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern/[id]/edit': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+}
diff --git a/app/const/page-permission/inpatient.ts b/app/const/page-permission/inpatient.ts
new file mode 100644
index 00000000..b116c5fa
--- /dev/null
+++ b/app/const/page-permission/inpatient.ts
@@ -0,0 +1,57 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/inpatient/request': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/request/[id]/detail': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/encounter': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/inpatient/encounter/add': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/encounter/[id]': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+    'emp|doc': ['R'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/inpatient/encounter/[id]/edit': {
+    'emp|reg': ['C', 'R', 'U', 'D'],
+  },
+  '/inpatient/encounter/[id]/process': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R', 'U'],
+    'emp|miw': ['R', 'U'],
+    'emp|nut': ['R', 'U'],
+    'emp|pha': ['R', 'U'],
+    'emp|lab': ['R', 'U'],
+    'emp|rad': ['R', 'U'],
+  },
+  '/inpatient/consulation': {
+    'emp|doc': ['R'],
+  },
+  '/inpatient/consulation/[id]/process': {
+    'emp|doc': ['R', 'U'],
+  },
+}
diff --git a/app/const/page-permission/mcu-src.ts b/app/const/page-permission/mcu-src.ts
new file mode 100644
index 00000000..85ad5f71
--- /dev/null
+++ b/app/const/page-permission/mcu-src.ts
@@ -0,0 +1,19 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/muc-src/checkup': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  },
+  '/muc-src/checkup-category': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  },
+  '/mcu-src/antibiotic-src': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  },
+  '/mcu-src/antibiotic-src-category': {
+    'emp|lab': ['C', 'R', 'U', 'D'],
+  }
+}
diff --git a/app/const/page-permission/org-src.ts b/app/const/page-permission/org-src.ts
new file mode 100644
index 00000000..9bd9eb68
--- /dev/null
+++ b/app/const/page-permission/org-src.ts
@@ -0,0 +1,31 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/infra-src/bed': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/chamber': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/room': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/warehouse': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/building': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/floor': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/counter': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+  '/infra-src/public-screen': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+  },
+}
diff --git a/app/const/page-permission/tools-equipment.ts b/app/const/page-permission/tools-equipment.ts
new file mode 100644
index 00000000..dd112ae8
--- /dev/null
+++ b/app/const/page-permission/tools-equipment.ts
@@ -0,0 +1,27 @@
+import type { Permission } from "~/models/role";
+
+// Should we define the keys first?
+// export type Keys = 'key1' | 'key2' | 'key3' | etc
+
+export const permissions: Record<string, Record<string, Permission[]>> = {
+  '/tools-equipment-src/medicine': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/medicine-method': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/medicine-type': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/medicine-form': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+  '/tools-equipment-src/device-src': {
+    'div|fin': ['C', 'R', 'U', 'D'],
+    'emp|pha': ['R'],
+  },
+}
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
new file mode 100644
index 00000000..5f632ac2
--- /dev/null
+++ b/app/handlers/encounter-entry.handler.ts
@@ -0,0 +1,692 @@
+import { ref, reactive, computed } from 'vue'
+import { useRoute } from 'vue-router'
+
+// Components
+import { toast } from '~/components/pub/ui/toast'
+
+// Models
+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 { 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
+import {
+  patients,
+  selectedPatient,
+  selectedPatientObject,
+  paginationMeta,
+  getPatientsList,
+  getPatientCurrent,
+  getPatientByIdentifierSearch,
+} from '~/handlers/patient.handler'
+
+export function useEncounterEntry(props: {
+  id: number
+  classCode?: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
+  subClassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
+}) {
+  const route = useRoute()
+  const userStore = useUserStore()
+  const openPatient = ref(false)
+  const isLoading = reactive<DataTableLoader>({
+    isTableLoading: false,
+  })
+  const paymentsList = ref<Array<{ value: string; label: string }>>([])
+  const sepsList = ref<Array<{ value: string; label: string }>>([])
+  const participantGroupsList = ref<Array<{ value: string; label: string }>>([])
+  const specialistsTree = ref<TreeItem[]>([])
+  const specialistsData = ref<any[]>([])
+  const doctorsList = ref<Array<{ value: string; label: string }>>([])
+  const recSelectId = ref<number | null>(null)
+  const isSaving = ref(false)
+  const isLoadingDetail = ref(false)
+  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
+  })
+
+  function getListPath(): string {
+    if (props.classCode === 'ambulatory') {
+      return '/ambulatory/encounter'
+    }
+    if (props.classCode === 'emergency') {
+      return '/emergency/encounter'
+    }
+    if (props.classCode === 'inpatient') {
+      return '/inpatient/encounter'
+    }
+    return '/encounter'
+  }
+
+  function toKebabCase(str: string): string {
+    return str.replace(/([A-Z])/g, '-$1').toLowerCase()
+  }
+
+  function toNavigateSep(values: any) {
+    const queryParams = new URLSearchParams()
+    if (values['subSpecialistCode']) {
+      const isSub = getIsSubspecialist(values['subSpecialistCode'], specialistsTree.value)
+      if (!isSub) {
+        values['specialistCode'] = values['subSpecialistCode']
+        delete values['subSpecialistCode']
+      }
+    }
+
+    Object.keys(values).forEach((field) => {
+      if (values[field]) {
+        queryParams.append(toKebabCase(field), values[field])
+      }
+    })
+
+    navigateTo('/integration/bpjs-vclaim/sep/add' + `?${queryParams.toString()}`)
+  }
+
+  function getIsSubspecialist(value: string, items: TreeItem[]): boolean {
+    for (const item of items) {
+      if (item.value === value) {
+        return false
+      }
+      if (item.children) {
+        for (const child of item.children) {
+          if (child.value === value) {
+            return true
+          }
+        }
+      }
+    }
+    return false
+  }
+
+  function getSpecialistCodeFromId(id: number | null | undefined): string | null {
+    if (!id) return null
+
+    if (encounterData.value?.specialist?.id === id) {
+      return encounterData.value.specialist.code || null
+    }
+
+    for (const specialist of specialistsData.value) {
+      if (specialist.id === id) {
+        return specialist.code || null
+      }
+      if (specialist.subspecialists && Array.isArray(specialist.subspecialists)) {
+        for (const subspecialist of specialist.subspecialists) {
+          if (subspecialist.id === id) {
+            return subspecialist.code || null
+          }
+        }
+      }
+    }
+
+    return null
+  }
+
+  function getSubspecialistCodeFromId(id: number | null | undefined): string | null {
+    if (!id) return null
+
+    if (encounterData.value?.subspecialist?.id === id) {
+      return encounterData.value.subspecialist.code || null
+    }
+
+    for (const specialist of specialistsData.value) {
+      if (specialist.subspecialists && Array.isArray(specialist.subspecialists)) {
+        for (const subspecialist of specialist.subspecialists) {
+          if (subspecialist.id === id) {
+            return subspecialist.code || null
+          }
+        }
+      }
+    }
+
+    return null
+  }
+
+  function getSpecialistIdsFromCode(code: string): { specialist_id: number | null; subspecialist_id: number | null } {
+    if (!code) {
+      return { specialist_id: null, subspecialist_id: null }
+    }
+
+    const isSub = getIsSubspecialist(code, specialistsTree.value)
+
+    if (isSub) {
+      for (const specialist of specialistsData.value) {
+        if (specialist.subspecialists && Array.isArray(specialist.subspecialists)) {
+          for (const subspecialist of specialist.subspecialists) {
+            if (subspecialist.code === code) {
+              return {
+                specialist_id: specialist.id ? Number(specialist.id) : null,
+                subspecialist_id: subspecialist.id ? Number(subspecialist.id) : null,
+              }
+            }
+          }
+        }
+      }
+    } else {
+      for (const specialist of specialistsData.value) {
+        if (specialist.code === code) {
+          return {
+            specialist_id: specialist.id ? Number(specialist.id) : null,
+            subspecialist_id: null,
+          }
+        }
+      }
+    }
+
+    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() === '') {
+      isSepValid.value = false
+      isCheckingSep.value = false
+      return
+    }
+
+    try {
+      isSepValid.value = false
+      isCheckingSep.value = true
+      const result = await getSepList({ number: sepNumberValue.trim() })
+      if (result.success && result.body?.response !== null) {
+        const response = result.body?.response || {}
+        if (Object.keys(response).length > 0) {
+          formObjects.value.patientName = response.peserta?.nama || '-'
+          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,
+            catatan: response.catatan || '',
+            diagRujukan: response.diagnosa || '',
+            tipeRujukan: response.tujuanKunj?.kode ?? '0',
+            poliRujukan: response.poli || '',
+            user: userStore.user?.user_name || '',
+          }
+        }
+        isSepValid.value = result.body?.metaData?.code === '200'
+        isMemberValid.value = isSepValid.value
+      }
+    } catch (error) {
+      console.error('Error checking SEP:', error)
+      isSepValid.value = false
+    } finally {
+      isCheckingSep.value = false
+    }
+  }
+
+  async function handleFetchSpecialists() {
+    try {
+      const specialistsResult = await getSpecialistList({ 'page-size': 100, includes: 'subspecialists' })
+      if (specialistsResult.success) {
+        const specialists = specialistsResult.body?.data || []
+        specialistsData.value = specialists
+        specialistsTree.value = getSpecialistTreeItems(specialists)
+      }
+    } catch (error) {
+      console.error('Error fetching specialist-subspecialist tree:', error)
+    }
+  }
+
+  async function handleFetchDoctors(subSpecialistId: string | null = null) {
+    try {
+      const filterParams: any = { 'page-size': 100, includes: 'employee-Person,unit,specialist,subspecialist' }
+
+      if (!subSpecialistId) {
+        doctorsList.value = await getDoctorValueLabelList(filterParams, true)
+        return
+      }
+
+      const isSub = getIsSubspecialist(subSpecialistId, specialistsTree.value)
+
+      if (isSub) {
+        filterParams['subspecialist-id'] = subSpecialistId
+      } else {
+        filterParams['specialist-id'] = subSpecialistId
+      }
+
+      doctorsList.value = await getDoctorValueLabelList(filterParams, true)
+    } catch (error) {
+      console.error('Error fetching doctors:', error)
+      doctorsList.value = []
+    }
+  }
+
+  async function handleInit() {
+    selectedPatientObject.value = null
+    paymentsList.value = Object.keys(paymentTypes).map((item) => ({
+      value: item.toString(),
+      label: paymentTypes[item],
+    })) as any
+    sepsList.value = Object.keys(sepRefTypeCodes).map((item) => ({
+      value: item.toString(),
+      label: sepRefTypeCodes[item],
+    })) as any
+    participantGroupsList.value = Object.keys(participantGroups).map((item) => ({
+      value: item.toString(),
+      label: participantGroups[item],
+    })) as any
+    await handleFetchDoctors()
+    await handleFetchSpecialists()
+    if (route.query) {
+      formObjects.value = { ...formObjects.value }
+      const queries = route.query as any
+      if (queries['sep-number']) {
+        formObjects.value.sepNumber = queries['sep-number']
+        formObjects.value.paymentType = 'jkn'
+      }
+    }
+  }
+
+  async function getFetchEncounterDetail() {
+    if (!isEditMode.value || props.id <= 0) {
+      return
+    }
+
+    try {
+      isLoadingDetail.value = true
+      const result = await getEncounterDetail(props.id, {
+        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: errorMsg,
+          variant: 'destructive',
+        })
+        await navigateTo(getListPath())
+      }
+    } catch (error: any) {
+      toast({
+        title: 'Gagal',
+        description: error?.message || 'Gagal memuat data kunjungan',
+        variant: 'destructive',
+      })
+      await navigateTo(getListPath())
+    } finally {
+      isLoadingDetail.value = false
+    }
+  }
+
+  async function mapEncounterToForm(encounter: any) {
+    if (!encounter) return
+
+    if (encounter.patient) {
+      selectedPatient.value = String(encounter.patient.id)
+      selectedPatientObject.value = encounter.patient
+      if (!encounter.patient.person) {
+        await getPatientCurrent(selectedPatient.value)
+      }
+    }
+
+    const formData: any = {}
+    if (encounter.patient?.person) {
+      formData.patientName = encounter.patient.person.name || ''
+      formData.nationalIdentity = encounter.patient.person.residentIdentityNumber || ''
+      formData.medicalRecordNumber = encounter.patient.number || ''
+    } else if (selectedPatientObject.value?.person) {
+      formData.patientName = selectedPatientObject.value.person.name || ''
+      formData.nationalIdentity = selectedPatientObject.value.person.residentIdentityNumber || ''
+      formData.medicalRecordNumber = selectedPatientObject.value.number || ''
+    }
+
+    const doctorCode = encounter.appointment_doctor_code || encounter.responsible_doctor_code
+    if (doctorCode) {
+      formData.doctorCode = String(doctorCode)
+      await getDoctorInfo(doctorCode)
+    }
+
+    if (encounter.subspecialist_id) {
+      const subspecialistCode = getSubspecialistCodeFromId(encounter.subspecialist_id)
+      if (subspecialistCode) {
+        formData.subSpecialistId = subspecialistCode
+      }
+    } else if (encounter.specialist_id) {
+      const specialistCode = getSpecialistCodeFromId(encounter.specialist_id)
+      if (specialistCode) {
+        formData.subSpecialistId = specialistCode
+      }
+    }
+
+    if (!formData.subSpecialistId) {
+      if (encounter.subspecialist?.code) {
+        formData.subSpecialistId = encounter.subspecialist.code
+      } else if (encounter.specialist?.code) {
+        formData.subSpecialistId = encounter.specialist.code
+      }
+    }
+
+    if (encounter.registeredAt) {
+      const date = new Date(encounter.registeredAt)
+      formData.registerDate = date.toISOString().split('T')[0]
+    }
+    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 {
+        const validPaymentTypes = ['jkn', 'jkmm', 'spm', 'pks']
+        if (validPaymentTypes.includes(encounter.paymentMethod_code)) {
+          formData.paymentType = encounter.paymentMethod_code
+        } else {
+          formData.paymentType = 'spm'
+        }
+      }
+    } else {
+      formData.paymentType = 'spm'
+    }
+
+    formData.cardNumber = encounter.member_number || ''
+    formData.sepNumber = encounter.ref_number || ''
+    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
+    }
+    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) {
+    if (!selectedPatient.value || !selectedPatientObject.value) {
+      toast({
+        title: 'Gagal',
+        description: 'Pasien harus dipilih terlebih dahulu',
+        variant: 'destructive',
+      })
+      return
+    }
+
+    try {
+      isSaving.value = true
+      const isAdmin = false
+      const employeeId = userStore.user?.employee_id || userStore.user?.employee?.id || 0
+
+      const formatDate = (dateString: string): string => {
+        if (!dateString) return ''
+        const date = new Date(dateString)
+        return date.toISOString()
+      }
+
+      const { specialist_id, subspecialist_id } = getSpecialistIdsFromCode(formValues.subSpecialistId || '')
+
+      const patientId = formValues.patient_id || selectedPatientObject.value?.id || Number(selectedPatient.value)
+
+      const registeredAtValue = formValues.registeredAt || formValues.registerDate || ''
+      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) {
+        if (formValues.paymentType === 'jkn' || formValues.paymentType === 'jkmm') {
+          paymentMethodCode = 'insurance'
+        } else if (formValues.paymentType === 'spm') {
+          paymentMethodCode = 'cash'
+        } else if (formValues.paymentType === 'pks') {
+          paymentMethodCode = 'membership'
+        } else {
+          paymentMethodCode = 'cash'
+        }
+      }
+
+      const payload: any = {
+        patient_id: patientId,
+        appointment_doctor_code: formValues.doctor_code || null,
+        class_code: props.classCode || '',
+        subClass_code: props.subClassCode || '',
+        infra_id: formValues.infra_id ?? null,
+        unit_code: userStore?.user?.unit_code ?? null,
+        refSource_name: formValues.refSource_name ?? 'RSSA',
+        refTypeCode: formValues.paymentType === 'jkn' ? 'bpjs' : '',
+        vclaimReference: vclaimReference.value ?? null,
+        paymentType: formValues.paymentType,
+        registeredAt: formatDate(registeredAtValue),
+        visitDate: formatDate(visitDateValue),
+      }
+
+      if (props.classCode !== 'inpatient') {
+        delete payload.infra_id
+      }
+      if (employeeId && employeeId > 0) {
+        payload.adm_employee_id = employeeId
+      }
+      if (specialist_id) {
+        payload.specialist_id = specialist_id
+      }
+      if (subspecialist_id) {
+        payload.subspecialist_id = subspecialist_id
+      }
+      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 (formValues.refTypeCode) payload.refTypeCode = formValues.refTypeCode
+        if (formValues.vclaimReference) payload.vclaimReference = formValues.vclaimReference
+      } else {
+        if (paymentMethodCode === 'membership' && memberNumber) {
+          payload.member_number = memberNumber
+        }
+      }
+
+      if (isAdmin && props.classCode === 'ambulatory') {
+        payload.visitMode_code = 'adm'
+        payload.allocatedVisitCount = 0
+      }
+
+      let result
+      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,
+          variant: 'destructive',
+        })
+      }
+    } catch (error: any) {
+      console.error('❌ [SAVE] Error saving encounter:', error)
+      toast({
+        title: 'Gagal',
+        description: error?.message || (isEditMode.value ? 'Gagal memperbarui kunjungan' : 'Gagal membuat kunjungan'),
+        variant: 'destructive',
+      })
+    } finally {
+      isSaving.value = false
+    }
+  }
+
+  return {
+    patients,
+    paymentsList,
+    sepsList,
+    sepNumber,
+    participantGroupsList,
+    specialistsTree,
+    doctorsList,
+    recSelectId,
+    isSaving,
+    isLoadingDetail,
+    encounterData,
+    formObjects,
+    openPatient,
+    isMemberValid,
+    isSepValid,
+    isCheckingSep,
+    isEditMode,
+    isSaveDisabled,
+    isLoading,
+    selectedDoctor,
+    selectedPatient,
+    selectedPatientObject,
+    paginationMeta,
+    getFetchEncounterDetail,
+    mapEncounterToForm,
+    toKebabCase,
+    toNavigateSep,
+    getListPath,
+    getSpecialistCodeFromId,
+    getSubspecialistCodeFromId,
+    getIsSubspecialist,
+    getSpecialistIdsFromCode,
+    getPatientsList,
+    getPatientCurrent,
+    getPatientByIdentifierSearch,
+    getDoctorInfo,
+    getValidateMember,
+    getValidateSepNumber,
+    handleFetchSpecialists,
+    handleFetchDoctors,
+    handleInit,
+    handleSaveEncounter,
+  }
+}
diff --git a/app/handlers/encounter-init.handler.ts b/app/handlers/encounter-init.handler.ts
new file mode 100644
index 00000000..275228d7
--- /dev/null
+++ b/app/handlers/encounter-init.handler.ts
@@ -0,0 +1,582 @@
+import { isValidDate } from '~/lib/date'
+import { medicalRoles } from '~/const/common/role'
+
+export interface EncounterItem {
+  id: string
+  title: string
+  classCode?: string[]
+  unit?: string
+  afterId?: string
+  component?: any
+  props?: Record<string, any>
+}
+
+export interface EncounterProps {
+  classCode: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
+  subClassCode: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
+}
+
+export interface EncounterListData {
+  encounter?: any
+  status?: any
+  medicalAssessment?: any
+  medicalAssessmentRehab: any
+  functionAssessment?: any
+  protocolTheraphy?: any
+  protocolChemotherapy?: any
+  medicineProtocolChemotherapy?: any
+  consultation?: any
+  letterOfControl?: any
+}
+
+const StatusAsync = defineAsyncComponent(() => import('~/components/content/encounter/status.vue'))
+const AssesmentFunctionListAsync = defineAsyncComponent(() => import('~/components/content/soapi/entry.vue'))
+const EarlyMedicalAssesmentListAsync = defineAsyncComponent(() => import('~/components/content/soapi/entry.vue'))
+const EarlyMedicalRehabListAsync = defineAsyncComponent(() => import('~/components/content/soapi/entry.vue'))
+const ChemoProtocolListAsync = defineAsyncComponent(() => import('~/components/app/chemotherapy/list.protocol.vue'))
+const ChemoMedicineProtocolListAsync = defineAsyncComponent(
+  () => import('~/components/app/chemotherapy/list.medicine.vue'),
+)
+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'))
+const DocUploadListAsync = defineAsyncComponent(() => import('~/components/content/document-upload/list.vue'))
+const GeneralConsentListAsync = defineAsyncComponent(() => import('~/components/content/general-consent/entry.vue'))
+const ResumeListAsync = defineAsyncComponent(() => import('~/components/content/resume/list.vue'))
+const ControlLetterListAsync = defineAsyncComponent(() => import('~/components/content/control-letter/list.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: {
+    id: 'status',
+    title: 'Status Masuk/Keluar',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  // NOTE : HIDDEN UNTIL IT IS READY
+  // earlyNurseryAssessment: {
+  //   id: 'early-nursery-assessment',
+  //   title: 'Pengkajian Awal Keperawatan',
+  //   classCode: ['ambulatory', 'emergency', 'inpatient'],
+  //   unit: 'all',
+  // },
+  earlyMedicalAssessment: {
+    id: 'early-medical-assessment',
+    title: 'Pengkajian Awal Medis',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+    afterId: 'early-medical-assessment',
+  },
+  earlyMedicalRehabAssessment: {
+    id: 'rehab-medical-assessment',
+    title: 'Pengkajian Awal Medis Rehabilitasi Medis',
+    classCode: ['ambulatory'],
+    unit: 'rehab',
+    afterId: 'early-medical-assessment',
+  },
+  fkr: {
+    id: 'fkr',
+    title: 'FKR',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  // NOTE: Replaced by FRK
+  // functionAssessment: {
+  //   id: 'function-assessment',
+  //   title: 'Asesmen Fungsi',
+  //   classCode: ['ambulatory'],
+  //   unit: 'rehab',
+  //   afterId: 'rehab-medical-assessment',
+  // },
+  // therapyProtocol: {
+  //   id: 'therapy-protocol',
+  //   classCode: ['ambulatory'],
+  //   title: 'Protokol Terapi',
+  //   unit: 'rehab',
+  //   afterId: 'function-assessment',
+  // },
+  chemotherapyProtocol: {
+    id: 'chemotherapy-protocol',
+    title: 'Protokol Kemoterapi',
+    classCode: ['ambulatory'],
+    unit: 'chemo',
+    afterId: 'early-medical-assessment',
+  },
+  chemotherapyMedicine: {
+    id: 'chemotherapy-medicine',
+    title: 'Protokol Obat Kemoterapi',
+    classCode: ['ambulatory'],
+    unit: 'chemo',
+    afterId: 'chemotherapy-protocol',
+  },
+  educationAssessment: {
+    id: 'education-assessment',
+    title: 'Asesmen Kebutuhan Edukasi',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  generalConsent: {
+    id: 'general-consent',
+    title: 'General Consent',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  patientAmbNote: {
+    id: 'patient-amb-note',
+    title: 'CPRJ',
+    classCode: ['ambulatory', 'emergency'],
+    unit: 'all',
+  },
+  patientDevNote: {
+    id: 'patient-dev-note',
+    title: 'CPP',
+    classCode: ['inpatient'],
+    unit: 'all',
+  },
+  prescription: {
+    id: 'prescription',
+    title: 'Order Obat',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  deviceOrder: {
+    id: 'device-order',
+    title: 'Order Alkes',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  radiologyOrder: {
+    id: 'radiology-order',
+    title: 'Order Radiologi',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  cpLabOrder: {
+    id: 'cp-lab-order',
+    title: 'Order Lab PK',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  microLabOrder: {
+    id: 'micro-lab-order',
+    title: 'Order Lab Mikro',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  paLabOrder: {
+    id: 'pa-lab-order',
+    title: 'Order Lab PA',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  procedureRoomOrder: {
+    id: 'procedure-room-order',
+    title: 'Order Ruang Tindakan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  mcuResult: {
+    id: 'mcu-result',
+    title: 'Hasil Penunjang',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  actionReport: {
+    id: 'action-report',
+    title: 'Laporan Tindakan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  surgeryReport: {
+    id: 'surgery-report',
+    title: 'Laporan Operasi',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  vaccineData: {
+    id: 'vaccine-data',
+    title: 'Data Vaksin',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  consultation: {
+    id: 'consultation',
+    title: 'Konsultasi',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  controlLetter: {
+    id: 'control-letter',
+    title: 'Surat Kontrol',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  inpatientLetter: {
+    id: 'inpatient-letter',
+    title: 'SPRI',
+    classCode: ['ambulatory', 'emergency'],
+    unit: 'all',
+  },
+  refBack: {
+    id: 'reference-back',
+    title: 'PRB',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  screening: {
+    id: 'screening',
+    title: 'Skrinning MPP',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  supportingDocument: {
+    id: 'supporting-document',
+    title: 'Upload Dokumen Pendukung',
+    classCode: ['ambulatory'],
+    unit: 'all',
+  },
+  resume: {
+    id: 'resume',
+    title: 'Resume',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  ambResume: {
+    id: 'amb-resume',
+    title: 'Resume Medis Rawat Jalan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  priceList: {
+    id: 'price-list',
+    title: 'Tarif Tindakan',
+    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[]) {
+  return items.filter((item) => item.classCode?.includes(classCode))
+}
+
+export function getItemsByUnit(unit: string, items: EncounterItem[]) {
+  return items.filter((item) => item.unit === unit)
+}
+
+export function getItemsByIds(ids: string[], items: EncounterItem[]) {
+  return items.filter((item) => ids.includes(item.id))
+}
+
+export function getIndexById(id: string, items: EncounterItem[]) {
+  return items.findIndex((item) => item.id === id)
+}
+
+export const getItemsAll = (classCode: string, unit: string, items: EncounterItem[]) => {
+  const prevItems = [...items]
+  let updateItems = getItemsByClassCode(classCode, prevItems)
+  updateItems = getItemsByUnit(unit, updateItems)
+  return updateItems
+}
+
+export function insertItemByAfterId(id: string, items: EncounterItem[], newItem: EncounterItem) {
+  const index = getIndexById(id, items)
+  if (index > -1) {
+    items.splice(index + 1, 0, newItem)
+  }
+}
+
+export function injectComponents(id: string | number, data: EncounterListData, meta: EncounterListData) {
+  const currentKeys = { ...defaultKeys }
+  if (currentKeys?.status) {
+    currentKeys.status['component'] = StatusAsync
+    currentKeys.status['props'] = { encounter: data?.encounter }
+  }
+  if (currentKeys?.earlyMedicalAssessment) {
+    currentKeys.earlyMedicalAssessment['component'] = EarlyMedicalAssesmentListAsync
+    currentKeys.earlyMedicalAssessment['props'] = {
+      encounter: data?.encounter,
+      type: 'early-medic',
+      label: currentKeys.earlyMedicalAssessment['title'],
+    }
+  }
+  if (currentKeys?.earlyMedicalRehabAssessment) {
+    currentKeys.earlyMedicalRehabAssessment['component'] = EarlyMedicalRehabListAsync
+    currentKeys.earlyMedicalRehabAssessment['props'] = {
+      encounter: data?.encounter,
+      type: 'early-rehab',
+      label: currentKeys.earlyMedicalRehabAssessment['title'],
+    }
+  }
+  if (currentKeys?.functionAssessment) {
+    currentKeys.functionAssessment['component'] = AssesmentFunctionListAsync
+    currentKeys.functionAssessment['props'] = {
+      encounter: data?.encounter,
+      type: 'function',
+      label: currentKeys.functionAssessment['title'],
+    }
+  }
+  if (currentKeys?.therapyProtocol) {
+    // TODO: add component for therapyProtocol
+    currentKeys.therapyProtocol['component'] = null
+    currentKeys.therapyProtocol['props'] = {
+      data: data?.encounter,
+      paginationMeta: meta?.protocolTheraphy,
+    }
+  }
+  if (currentKeys?.chemotherapyProtocol) {
+    currentKeys.chemotherapyProtocol['component'] = ChemoProtocolListAsync
+    currentKeys.chemotherapyProtocol['props'] = {
+      data: data?.encounter,
+      paginationMeta: meta?.protocolChemotherapy,
+    }
+  }
+  if (currentKeys?.chemotherapyMedicine) {
+    currentKeys.chemotherapyMedicine['component'] = ChemoMedicineProtocolListAsync
+    currentKeys.chemotherapyMedicine['props'] = {
+      data: data?.encounter,
+      paginationMeta: meta?.medicineProtocolChemotherapy,
+    }
+  }
+  if (currentKeys?.educationAssessment) {
+    // TODO: add component for education assessment
+    currentKeys.educationAssessment['component'] = null
+    currentKeys.educationAssessment['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.generalConsent) {
+    currentKeys.generalConsent['component'] = GeneralConsentListAsync
+    currentKeys.generalConsent['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.patientAmbNote) {
+    currentKeys.patientAmbNote['component'] = CprjAsync
+    currentKeys.patientAmbNote['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.prescription) {
+    currentKeys.prescription['component'] = PrescriptionAsync
+    currentKeys.prescription['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.deviceOrder) {
+    currentKeys.deviceOrder['component'] = DeviceOrderAsync
+    currentKeys.deviceOrder['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.radiologyOrder) {
+    currentKeys.radiologyOrder['component'] = RadiologyAsync
+    currentKeys.radiologyOrder['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.cpLabOrder) {
+    currentKeys.cpLabOrder['component'] = CpLabOrderAsync
+    currentKeys.cpLabOrder['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.microLabOrder) {
+    currentKeys.microLabOrder['component'] = MicroLabOrderAsync
+    currentKeys.microLabOrder['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.paLabOrder) {
+    // TODO: add component for paLabOrder
+    currentKeys.paLabOrder['component'] = null
+    currentKeys.paLabOrder['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
+    currentKeys.mcuResult['component'] = null
+    currentKeys.mcuResult['props'] = { encounter_id: id }
+  }
+  if (currentKeys?.consultation) {
+    currentKeys.consultation['component'] = ConsultationAsync
+    currentKeys.consultation['props'] = { encounter: data?.encounter }
+  }
+  if (currentKeys?.resume) {
+    currentKeys.resume['component'] = ResumeListAsync
+    currentKeys.resume['props'] = { encounter_id: id }
+  }
+  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?.fkr) {
+    currentKeys.fkr['component'] = KfrListAsync
+    currentKeys.fkr['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 }
+  }
+  if (currentKeys?.priceList) {
+    // TODO: add component for priceList
+    currentKeys.priceList['component'] = null
+    currentKeys.priceList['props'] = { encounter_id: id }
+  }
+
+  if (currentKeys?.initialNursingStudy) {
+    currentKeys.initialNursingStudy['component'] = InitialNursingStudyAsync
+    currentKeys.initialNursingStudy['props'] = { encounter: data?.encounter }
+  }
+
+  return currentKeys
+}
+
+export function mergeArrayAt<T>(arraysOne: T[], arraysTwo: T[] | T, deleteCount = 0): T[] {
+  const prevItems = arraysOne.slice()
+  if (!prevItems) return prevItems
+  const nextItems = Array.isArray(arraysTwo) ? arraysTwo : [arraysTwo]
+  if (nextItems.length === 0) return prevItems
+  // determine insertion position using the first item's `id` if available
+  const firstId = (nextItems[0] as any)?.afterId || (prevItems[0] as any)?.id
+  let pos = prevItems.length
+  if (typeof firstId === 'string') {
+    const index = prevItems.findIndex((item: any) => item.id === firstId)
+    pos = index < 0 ? Math.max(prevItems.length + index, 0) : Math.min(index, prevItems.length)
+  }
+  prevItems.splice(pos, deleteCount, ...nextItems)
+  return prevItems
+}
+
+// Function to map API response to Encounter structure
+export function mapResponseToEncounter(result: any): any {
+  if (!result) return null
+
+  // Check if patient and patient.person exist (minimal validation)
+  if (!result.patient || !result.patient.person) {
+    return null
+  }
+
+  const mapped: any = {
+    id: result.id || 0,
+    patient_id: result.patient_id || result.patient?.id || 0,
+    patient: {
+      id: result.patient?.id || 0,
+      number: result.patient?.number || '',
+      person: {
+        id: result.patient?.person?.id || 0,
+        name: result.patient?.person?.name || '',
+        birthDate: result.patient?.person?.birthDate || null,
+        gender_code: result.patient?.person?.gender_code || '',
+        residentIdentityNumber: result.patient?.person?.residentIdentityNumber || null,
+        frontTitle: result.patient?.person?.frontTitle || '',
+        endTitle: result.patient?.person?.endTitle || '',
+        addresses: result.patient?.person?.addresses || [],
+      },
+    },
+    registeredAt: result.registeredAt || result.patient?.registeredAt || null,
+    class_code: result.class_code || '',
+    unit_id: result.unit_id || 0,
+    unit: result.unit || null,
+    specialist_id: result.specialist_id || null,
+    subspecialist_id: result.subspecialist_id || null,
+    visitDate: isValidDate(result.visitDate)
+      ? result.visitDate
+      : result.registeredAt || result.patient?.registeredAt || null,
+    adm_employee_id: result.adm_employee_id || 0,
+    adm_employee: result.adm_employee || null,
+    responsible_nurse_code: result.responsible_nurse_code || null,
+    responsible_nurse: result.responsible_nurse || null,
+    appointment_doctor_code: result.appointment_doctor_code || null,
+    appointment_doctor: result.appointment_doctor || null,
+    responsible_doctor_code: result.responsible_doctor_id || null,
+    responsible_doctor: result.responsible_doctor || null,
+    refSource_name: result.refSource_name || null,
+    appointment_id: result.appointment_id || null,
+    earlyEducation: result.earlyEducation || null,
+    medicalDischargeEducation: result.medicalDischargeEducation || '',
+    admDischargeEducation: result.admDischargeEducation || null,
+    discharge_method_code: result.discharge_method_code || null,
+    discharge_reason: result.dischargeReason || result.discharge_reason || null,
+    discharge_date: result.discharge_date || null,
+    status_code: result.status_code || '',
+    // Payment related fields
+    paymentMethod_code:
+      result.paymentMethod_code && result.paymentMethod_code.trim() !== '' ? result.paymentMethod_code : null,
+    trx_number: result.trx_number || null,
+    member_number: result.member_number || null,
+    ref_number: result.ref_number || null,
+  }
+
+  return mapped
+}
+
+export function getMenuItems(
+  id: string | number,
+  props: any,
+  user: any,
+  data: EncounterListData,
+  meta: any,
+) {
+  // const normalClassCode = props.classCode === 'ambulatory' ? 'outpatient' : props.classCode
+  const normalClassCode = props.classCode === 'ambulatory' ? 'ambulatory' : props.classCode
+  const currentKeys = injectComponents(id, data, meta)
+  const defaultItems: EncounterItem[] = Object.values(currentKeys)
+  const listItemsForOutpatientRehab = mergeArrayAt(
+    getItemsAll('ambulatory', 'all', defaultItems),
+    getItemsAll('ambulatory', 'rehab', defaultItems),
+  )
+  const listItemsForOutpatientChemo = mergeArrayAt(
+    getItemsAll('ambulatory', 'all', defaultItems),
+    getItemsAll('ambulatory', 'chemo', defaultItems),
+  )
+  const listItems: Record<string, Record<string, Record<string, any>>> = {
+    'installation|ambulatory': {
+      'unit|rehab': {
+        items: listItemsForOutpatientRehab,
+        roles: medicalRoles,
+      },
+      'unit|chemo': {
+        items: listItemsForOutpatientChemo,
+        roles: medicalRoles,
+      },
+      all: getItemsAll('ambulatory', 'all', defaultItems),
+    },
+    'installation|emergency': {
+      all: getItemsAll('emergency', 'all', defaultItems),
+    },
+    'installation|inpatient': {
+      all: getItemsAll('inpatient', 'all', defaultItems),
+    },
+  }
+  const currentListItems = listItems[`installation|${normalClassCode}`]
+  if (!currentListItems) return []
+  const unitCode = user?.unit_code ? `unit|${user.unit_code}` : 'all'
+  const currentUnitItems: any = currentListItems[`${unitCode}`]
+  if (!currentUnitItems) return []
+  let menus = []
+  if (currentUnitItems.roles && currentUnitItems.roles?.includes(user.activeRole)) {
+    menus = [...currentUnitItems.items]
+  } else {
+    menus = unitCode !== 'all' && currentUnitItems?.items ? [...currentUnitItems.items] : [...currentUnitItems]
+  }
+  return menus
+}
diff --git a/app/handlers/encounter-process.handler.ts b/app/handlers/encounter-process.handler.ts
new file mode 100644
index 00000000..92f1f28f
--- /dev/null
+++ b/app/handlers/encounter-process.handler.ts
@@ -0,0 +1,36 @@
+// Services
+import { getDetail } from '~/services/encounter.service'
+
+// Handlers
+import { mapResponseToEncounter } from '~/handlers/encounter-init.handler'
+
+export async function getEncounterData(id: string | number) {
+  let data = null
+  try {
+    const dataRes = await getDetail(id, {
+      includes:
+        'patient,patient-person,patient-person-addresses,unit,' +
+        'Adm_Employee,Adm_Employee,Adm_Employee-Person,' +
+        'Responsible_Nurse,Responsible_Nurse-Employee,Responsible_Nurse-Employee-Person,' +
+        'Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person,' +
+        'Responsible_Doctor,Responsible_Doctor-employee,Responsible_Doctor-employee-person',
+    })
+    const dataResBody = dataRes.body ?? null
+    const result = dataResBody?.data ?? null
+
+    if (result) {
+      const mappedData = mapResponseToEncounter(result)
+      if (mappedData) {
+        data = mappedData
+      } else {
+        data = null
+      }
+    } else {
+      data = null
+    }
+  } catch (error) {
+    console.error('Error fetching encounter data:', error)
+    data = null
+  }
+  return data
+}
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
new file mode 100644
index 00000000..d9ce2e31
--- /dev/null
+++ b/app/handlers/integration-sep-entry.handler.ts
@@ -0,0 +1,710 @@
+import { ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+// Components
+import { toast } from '~/components/pub/ui/toast'
+
+// Types
+import type { SepHistoryData } from '~/components/app/sep/list-cfg.history'
+import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
+
+// Constants
+import {
+  serviceTypes,
+  serviceAssessments,
+  registerMethods,
+  trafficAccidents,
+  supportCodes,
+  procedureTypes,
+  purposeOfVisits,
+  classLevels,
+  classLevelUpgrades,
+  classPaySources,
+} from '~/lib/constants.vclaim'
+
+// Services
+import {
+  getList as getSpecialistList,
+  getValueTreeItems as getSpecialistTreeItems,
+} from '~/services/specialist.service'
+import { getValueLabelList as getProvinceList } from '~/services/vclaim-region-province.service'
+import { getValueLabelList as getCityList } from '~/services/vclaim-region-city.service'
+import { getValueLabelList as getDistrictList } from '~/services/vclaim-region-district.service'
+import { getValueLabelList as getDoctorLabelList } from '~/services/vclaim-doctor.service'
+import { getValueLabelList as getHealthFacilityLabelList } from '~/services/vclaim-healthcare.service'
+import { getValueLabelList as getDiagnoseLabelList } from '~/services/vclaim-diagnose.service'
+import { getList as getMemberList } from '~/services/vclaim-member.service'
+import { getList as getHospitalLetterList } from '~/services/vclaim-reference-hospital-letter.service'
+import { getList as getControlLetterList } from '~/services/vclaim-control-letter.service'
+import { getList as getMonitoringHistoryList } from '~/services/vclaim-monitoring-history.service'
+import { create as createSep, makeSepData } from '~/services/vclaim-sep.service'
+
+// Handlers
+import {
+  patients,
+  selectedPatient,
+  selectedPatientObject,
+  paginationMeta,
+  getPatientsList,
+  getPatientCurrent,
+  getPatientByIdentifierSearch,
+} from '~/handlers/patient.handler'
+
+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)
+  const selectedLetter = ref('')
+  const selectedObjects = ref<any>({})
+  const selectedServiceType = ref<string>('')
+  const selectedAdmissionType = ref<string>('')
+  const histories = ref<Array<SepHistoryData>>([])
+  const letters = ref<Array<any>>([])
+  const doctors = ref<Array<{ value: string | number; label: string }>>([])
+  const diagnoses = ref<Array<{ value: string | number; label: string }>>([])
+  const facilitiesFrom = ref<Array<{ value: string | number; label: string }>>([])
+  const facilitiesTo = ref<Array<{ value: string | number; label: string }>>([])
+  const supportCodesList = ref<Array<{ value: string; label: string }>>([])
+  const serviceTypesList = ref<Array<{ value: string; label: string }>>([])
+  const registerMethodsList = ref<Array<{ value: string; label: string }>>([])
+  const accidentsList = ref<Array<{ value: string; label: string }>>([])
+  const purposeOfVisitsList = ref<Array<{ value: string; label: string }>>([])
+  const proceduresList = ref<Array<{ value: string; label: string }>>([])
+  const assessmentsList = ref<Array<{ value: string; label: string }>>([])
+  const provincesList = ref<Array<{ value: string; label: string }>>([])
+  const citiesList = ref<Array<{ value: string; label: string }>>([])
+  const districtsList = ref<Array<{ value: string; label: string }>>([])
+  const classLevelsList = ref<Array<{ value: string; label: string }>>([])
+  const classLevelUpgradesList = ref<Array<{ value: string; label: string }>>([])
+  const classPaySourcesList = ref<Array<{ value: string; label: string }>>([])
+  const isServiceHidden = ref(false)
+  const isSaveLoading = ref(false)
+  const isLetterReadonly = ref(false)
+  const isLoadingPatient = ref(false)
+  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
+   * Maps data from letters.value[0].information to selectedObjects and form values
+   */
+  function mapLetterDataToForm(formValues: any): any {
+    if (selectedAdmissionType.value === '3' || letters.value.length === 0) {
+      return formValues
+    }
+
+    const letterData = letters.value[0]
+    const info = letterData.information || {}
+
+    // Map data to selectedObjects for form population
+    if (info.cardNumber) {
+      selectedObjects.value['cardNumber'] = info.cardNumber
+    }
+    if (info.medicalRecordNumber) {
+      selectedObjects.value['medicalRecordNumber'] = info.medicalRecordNumber
+    }
+    if (info.patientPhone) {
+      selectedObjects.value['phoneNumber'] = info.patientPhone
+    }
+    if (info.classLevel) {
+      selectedObjects.value['classLevel'] = info.classLevel
+    }
+
+    // Map data to formValues for makeSepData
+    const mappedValues = { ...formValues }
+
+    // response.rujukan.peserta.noKartu → cardNumber (noKartu)
+    if (info.cardNumber) {
+      mappedValues.cardNumber = info.cardNumber
+    }
+
+    // response.rujukan.tglKunjungan → referralLetterDate (rujukan.tglRujukan)
+    if (letterData.plannedDate) {
+      mappedValues.referralLetterDate = letterData.plannedDate
+    }
+
+    // response.rujukan.noKunjungan → referralLetterNumber (rujukan.noRujukan)
+    if (letterData.letterNumber) {
+      mappedValues.referralLetterNumber = letterData.letterNumber
+    }
+
+    // response.rujukan.provPerujuk.kode → fromClinic (rujukan.ppkRujukan)
+    if (info.destination) {
+      mappedValues.referralTo = info.destination
+    }
+
+    // response.rujukan.poliRujukan.kode → polyCode
+    if (info.poly) {
+      mappedValues.polyCode = info.poly
+    }
+
+    // response.asalFaskes → asalRujukan (1 = Faskes 1, 2 = Faskes RS)
+    // Map facility to referralFrom (asalRujukan)
+    if (info.facility) {
+      mappedValues.referralFrom = info.facility
+    }
+
+    // response.rujukan.diagnosa.kode → initialDiagnosis (diagAwal)
+    if (info.diagnoses) {
+      mappedValues.initialDiagnosis = info.diagnoses
+    }
+
+    // response.rujukan.poliRujukan.kode → destinationClinic (poli.tujuan)
+    if (info.poly) {
+      mappedValues.destinationClinic = info.poly
+    }
+
+    // response.rujukan.peserta.hakKelas.kode → classLevel (klsRawat.klsRawatHak)
+    if (info.classLevel) {
+      mappedValues.classLevel = info.classLevel
+    }
+
+    // response.rujukan.peserta.mr.noMR → medicalRecordNumber (noMR)
+    if (info.medicalRecordNumber) {
+      mappedValues.medicalRecordNumber = info.medicalRecordNumber
+    }
+
+    // response.rujukan.peserta.mr.noTelepon → phoneNumber (noTelp)
+    if (info.patientPhone) {
+      mappedValues.phoneNumber = info.patientPhone
+    }
+
+    return mappedValues
+  }
+
+  async function getMonitoringHistoryMappers(number: string | null = null) {
+    histories.value = []
+    const dateFirst = new Date()
+    const dateLast = new Date()
+    dateLast.setMonth(dateFirst.getMonth() - 2) // max 90 days
+    const cardNumber =
+      selectedPatientObject.value?.person?.residentIdentityNumber || selectedPatientObject.value?.number || number || ''
+    const result = await getMonitoringHistoryList({
+      cardNumber: cardNumber,
+      startDate: dateLast.toISOString().substring(0, 10),
+      endDate: dateFirst.toISOString().substring(0, 10),
+    })
+    if (result && result.success && result.body) {
+      const historiesRaw = result.body?.response?.histori || []
+      if (!historiesRaw) return
+      historiesRaw.forEach((result: any) => {
+        histories.value.push({
+          sepNumber: result.noSep,
+          sepDate: result.tglSep,
+          referralNumber: result.noRujukan,
+          diagnosis:
+            result.diagnosa && typeof result.diagnosa === 'string' && result.diagnosa.length > 20
+              ? result.diagnosa.toString().substring(0, 17) + '...'
+              : '-',
+          serviceType: !result.jnsPelayanan ? '-' : result.jnsPelayanan === '1' ? 'Rawat Jalan' : 'Rawat Inap',
+          careClass: result.kelasRawat,
+        })
+      })
+    }
+  }
+
+  async function getLetterMappers(admissionType: string, search: string) {
+    letters.value = []
+    let result = null
+    if (admissionType !== '3') {
+      result = await getHospitalLetterList({
+        letterNumber: search,
+      })
+    } else {
+      result = await getControlLetterList({
+        letterNumber: search,
+        mode: 'by-control',
+      })
+      if (result && result.success && result.body) {
+        const lettersRaw = result.body?.response || null
+        if (!lettersRaw) {
+          result = await getControlLetterList({
+            letterNumber: search,
+            mode: 'by-card',
+          })
+        }
+      }
+      if (result && result.success && result.body) {
+        const lettersRaw = result.body?.response || null
+        if (!lettersRaw) {
+          result = await getControlLetterList({
+            letterNumber: search,
+            mode: 'by-sep',
+          })
+        }
+      }
+    }
+    if (result && result.success && result.body) {
+      const lettersRaw = result.body?.response || null
+      if (!lettersRaw) return
+      if (admissionType === '3') {
+        letters.value = [
+          {
+            letterNumber: lettersRaw.noSuratKontrol || '',
+            plannedDate: lettersRaw.tglRencanaKontrol || '',
+            sepNumber: lettersRaw.sep.noSep || '',
+            patientName: lettersRaw.sep.peserta.nama || '',
+            bpjsCardNo: lettersRaw.sep.peserta.noKartu,
+            clinic: lettersRaw.sep.poli || '',
+            doctor: lettersRaw.sep.namaDokter || '',
+          },
+        ]
+      } else {
+        const destA = lettersRaw?.rujukan?.provPerujuk?.Kode
+        const destB = lettersRaw?.rujukan?.provPerujuk?.kode
+        letters.value = [
+          {
+            letterNumber: lettersRaw?.rujukan?.noKunjungan || '',
+            plannedDate: lettersRaw?.rujukan?.tglKunjungan || '',
+            sepNumber: lettersRaw?.rujukan?.informasi?.eSEP || '-',
+            patientName: lettersRaw?.rujukan?.peserta.nama || '',
+            bpjsCardNo: lettersRaw?.rujukan?.peserta.noKartu || '',
+            clinic: lettersRaw?.rujukan?.poliRujukan.nama || '',
+            doctor: '',
+            information: {
+              facility: lettersRaw?.asalFaskes || '',
+              diagnose: lettersRaw?.rujukan?.diagnosa?.kode || '',
+              serviceType: lettersRaw?.rujukan?.pelayanan?.kode || '',
+              classLevel: lettersRaw?.rujukan?.peserta?.hakKelas?.kode || '',
+              poly: lettersRaw?.rujukan?.poliRujukan?.kode || '',
+              cardNumber: lettersRaw?.rujukan?.peserta?.noKartu || '',
+              identity: lettersRaw?.rujukan?.peserta?.nik || '',
+              patientName: lettersRaw?.rujukan?.peserta?.nama || '',
+              patientPhone: lettersRaw?.rujukan?.peserta?.mr?.noTelepon || '',
+              medicalRecordNumber: lettersRaw?.rujukan?.peserta?.mr?.noMR || '',
+              destination: destA || destB || '',
+            },
+          },
+        ]
+      }
+    }
+  }
+
+  async function getPatientInternalMappers(id: string) {
+    try {
+      await getPatientCurrent(id)
+      if (selectedPatientObject.value) {
+        const patient = selectedPatientObject.value
+        selectedObjects.value['cardNumber'] = '-'
+        selectedObjects.value['nationalIdentity'] = patient?.person?.residentIdentityNumber || '-'
+        selectedObjects.value['medicalRecordNumber'] = patient?.number || '-'
+        selectedObjects.value['patientName'] = patient?.person?.name || '-'
+        selectedObjects.value['phoneNumber'] = patient?.person?.contacts?.[0]?.value || '-'
+      }
+    } catch (err) {
+      console.error('Failed to load patient from query params:', err)
+    }
+  }
+
+  async function getPatientExternalMappers(id: string, type: string) {
+    try {
+      isLoadingPatient.value = true
+      const result = await getMemberList({
+        mode: type,
+        number: id,
+        date: new Date().toISOString().substring(0, 10),
+      })
+      if (result && result.success && result.body) {
+        const memberRaws = result.body?.response || null
+        selectedObjects.value['cardNumber'] = memberRaws?.peserta?.noKartu || ''
+        selectedObjects.value['nationalIdentity'] = memberRaws?.peserta?.nik || ''
+        selectedObjects.value['medicalRecordNumber'] = memberRaws?.peserta?.mr?.noMR || ''
+        selectedObjects.value['patientName'] = memberRaws?.peserta?.nama || ''
+        selectedObjects.value['phoneNumber'] = memberRaws?.peserta?.mr?.noTelepon || ''
+        selectedObjects.value['classLevel'] = memberRaws?.peserta?.hakKelas?.kode || ''
+        selectedObjects.value['status'] = memberRaws?.statusPeserta?.kode || ''
+      }
+      isLoadingPatient.value = false
+    } catch (err) {
+      console.error('Failed to load patient from query params:', err)
+      isLoadingPatient.value = false
+    }
+  }
+
+  function handleSaveLetter() {
+    // Find the selected letter and get its plannedDate
+    const selectedLetterData = letters.value.find((letter) => letter.letterNumber === selectedLetter.value)
+    if (selectedLetterData && selectedLetterData.plannedDate) {
+      selectedObjects.value['letterDate'] = selectedLetterData.plannedDate
+    }
+  }
+
+  async function handleSavePatient() {
+    selectedPatientObject.value = null
+    await getPatientInternalMappers(selectedPatient.value)
+  }
+
+  async function handleEvent(menu: string, value: any) {
+    if (menu === 'admission-type') {
+      selectedAdmissionType.value = value
+      return
+    }
+    if (menu === 'service-type') {
+      selectedServiceType.value = value
+      doctors.value = await getDoctorLabelList({
+        serviceType: selectedServiceType.value || '2',
+        serviceDate: new Date().toISOString().substring(0, 10),
+        specialistCode: 0,
+      })
+    }
+    if (menu === 'search-patient') {
+      getPatientsList({ 'page-size': 10, includes: 'person' }).then(() => {
+        openPatient.value = true
+      })
+      return
+    }
+    if (menu === 'search-patient-by-identifier') {
+      if (isLoadingPatient.value) return
+      const text = value.text
+      const type = value.type
+      const prevCardNumber = selectedObjects.value['cardNumber'] || ''
+      const prevNationalIdentity = selectedObjects.value['nationalIdentity'] || ''
+      if (type === 'indentity' && text !== prevNationalIdentity) {
+        await getPatientByIdentifierSearch(text)
+        await getPatientExternalMappers(text, 'by-identity')
+      }
+      if (type === 'cardNumber' && text !== prevCardNumber) {
+        await getPatientExternalMappers(text, 'by-card')
+      }
+      return
+    }
+    if (menu === 'search-letter') {
+      isLetterReadonly.value = false
+      getLetterMappers(value.admissionType, value.search).then(async () => {
+        if (letters.value.length > 0) {
+          const copyObjects = { ...selectedObjects.value }
+          const letter = letters.value[0]
+          selectedObjects.value = {}
+          selectedLetter.value = letter.letterNumber
+          isLetterReadonly.value = true
+          if (letter.information || letter.clinic) {
+            const poly = value.admissionType === '3' ? letter.clinic : letter.information?.poly
+            if (poly) {
+              const resultControl = await getControlLetterList({
+                mode: 'by-schedule',
+                controlDate: letter.plannedDate,
+                controlType: selectedServiceType.value,
+                polyCode: poly,
+              })
+              if (resultControl && resultControl.success && resultControl.body) {
+                const resultData = resultControl.body?.response?.list || []
+                const resultUnique = [...new Map(resultData.map((item: any) => [item.kodeDokter, item])).values()]
+                const controlLetters = resultUnique.map((item: any) => ({
+                  value: item.kodeDokter ? String(item.kodeDokter) : '',
+                  label: `${item.kodeDokter} - ${item.namaDokter} - ${item.jadwalPraktek} (${item.kapasitas})`,
+                }))
+                doctors.value = controlLetters
+              }
+            }
+          }
+          setTimeout(async () => {
+            selectedObjects.value = copyObjects
+            selectedObjects.value['letterDate'] = letter.plannedDate
+            selectedObjects.value['cardNumber'] = letter.information?.cardNumber || ''
+            selectedObjects.value['nationalIdentity'] = letter.information?.identity || ''
+            selectedObjects.value['medicalRecordNumber'] = letter.information?.medicalRecordNumber || ''
+            selectedObjects.value['patientName'] = letter.information?.patientName || ''
+            selectedObjects.value['phoneNumber'] = letter.information?.patientPhone || ''
+            selectedObjects.value['facility'] = letter.information?.facility || ''
+            selectedObjects.value['diagnose'] = letter.information?.diagnose || ''
+            selectedObjects.value['serviceType'] = letter.information?.serviceType || ''
+            selectedObjects.value['classLevel'] = letter.information?.classLevel || ''
+            selectedObjects.value['poly'] = letter.information?.poly || ''
+            selectedObjects.value['destination'] = letter.information?.destination || ''
+            if (!!selectedObjects.value['diagnose']) {
+              const diagnoseRes: any = await getDiagnoseLabelList({ diagnosa: selectedObjects.value['diagnose'] })
+              diagnoses.value = diagnoseRes
+              if (diagnoseRes && diagnoseRes.length > 0) {
+                selectedObjects.value['diagnoseLabel'] = diagnoseRes[0].value
+              }
+            }
+          }, 250)
+        }
+      })
+      return
+    }
+    if (menu === 'open-letter') {
+      openLetter.value = true
+      return
+    }
+    if (menu === 'history-sep') {
+      getMonitoringHistoryMappers().then(() => {
+        openHistory.value = true
+      })
+      return
+    }
+    if (menu === 'sep-number-changed') {
+      // Update sepNumber when it changes in form (only if different to prevent loop)
+    }
+    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
+
+      // Map letter data to form if admissionType !== '3' and letters.value has data
+      let mappedValues = value
+      if (selectedAdmissionType.value !== '3') {
+        if (letters.value.length > 0) {
+          // Map data from letters.value to form values
+          mappedValues = mapLetterDataToForm(value)
+        } else {
+          // Fallback: use getPatientExternalMappers if letters.value is empty
+          // Get card number from form values or selectedObjects
+          const cardNumberToSearch = value.cardNumber || selectedObjects.value['cardNumber'] || ''
+          if (cardNumberToSearch && cardNumberToSearch !== '-') {
+            await getPatientExternalMappers(cardNumberToSearch, 'by-card')
+            // Update mappedValues with data from getPatientExternalMappers
+            if (selectedObjects.value['cardNumber']) {
+              mappedValues.cardNumber = selectedObjects.value['cardNumber']
+            }
+            if (selectedObjects.value['medicalRecordNumber']) {
+              mappedValues.medicalRecordNumber = selectedObjects.value['medicalRecordNumber']
+            }
+            if (selectedObjects.value['phoneNumber']) {
+              mappedValues.phoneNumber = selectedObjects.value['phoneNumber']
+            }
+            if (selectedObjects.value['classLevel']) {
+              mappedValues.classLevel = selectedObjects.value['classLevel']
+            }
+          }
+        }
+      }
+
+      if (!value.destinationClinic) {
+        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(payload)
+        .then((res) => {
+          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
+          }
+          const error = res?.error
+          if (error) {
+            const errorMessage = error?.message ? `${error?.message}` : 'Sep gagal dibuat'
+            toast({ title: 'Gagal', description: errorMessage, variant: 'destructive' })
+            return
+          }
+        })
+        .catch((err) => {
+          console.error('Failed to save SEP:', err)
+          toast({ title: 'Gagal', description: err?.message || 'Gagal membuat SEP', variant: 'destructive' })
+        })
+        .finally(() => {
+          isSaveLoading.value = false
+        })
+    }
+  }
+
+  async function handleFetch(params: any) {
+    const menu = params.menu || ''
+    const value = params.value || ''
+    if (menu === 'diagnosis') {
+      diagnoses.value = await getDiagnoseLabelList({ diagnosa: value })
+    }
+    if (menu === 'clinic-from') {
+      facilitiesFrom.value = await getHealthFacilityLabelList({
+        healthcare: value,
+        healthcareType: selectedServiceType.value || 2,
+      })
+    }
+    if (menu === 'clinic-to') {
+      facilitiesTo.value = await getHealthFacilityLabelList({
+        healthcare: value,
+        healthcareType: selectedServiceType.value || 2,
+      })
+    }
+    if (menu === 'province') {
+      citiesList.value = await getCityList({ province: value })
+      districtsList.value = []
+    }
+    if (menu === 'city') {
+      districtsList.value = await getDistrictList({ city: value })
+    }
+  }
+
+  async function handleFetchSpecialists() {
+    try {
+      const specialistsResult = await getSpecialistList({ 'page-size': 100, includes: 'subspecialists' })
+      if (specialistsResult.success) {
+        const specialists = specialistsResult.body?.data || []
+        specialistsTree.value = getSpecialistTreeItems(specialists)
+      }
+    } catch (error) {
+      console.error('Error fetching specialist-subspecialist tree:', error)
+    }
+  }
+
+  async function handleInit() {
+    selectedServiceType.value = '2'
+    const facilities = await getHealthFacilityLabelList({
+      healthcare: 'Puskesmas',
+      healthcareType: selectedLetter.value || 1,
+    })
+    diagnoses.value = await getDiagnoseLabelList({ diagnosa: 'paru' })
+    facilitiesFrom.value = facilities
+    facilitiesTo.value = facilities
+    doctors.value = await getDoctorLabelList({
+      serviceType: selectedServiceType.value || '2',
+      serviceDate: new Date().toISOString().substring(0, 10),
+      specialistCode: 0,
+    })
+    provincesList.value = await getProvinceList()
+    serviceTypesList.value = Object.keys(serviceTypes).map((item) => ({
+      value: item.toString(),
+      label: serviceTypes[item],
+    })) as any
+    registerMethodsList.value = Object.keys(registerMethods)
+      .filter((item) => ![''].includes(item))
+      .map((item) => ({
+        value: item.toString(),
+        label: registerMethods[item],
+      })) as any
+    accidentsList.value = Object.keys(trafficAccidents).map((item) => ({
+      value: item.toString(),
+      label: trafficAccidents[item],
+    })) as any
+    purposeOfVisitsList.value = Object.keys(purposeOfVisits).map((item) => ({
+      value: item.toString(),
+      label: purposeOfVisits[item],
+    })) as any
+    proceduresList.value = Object.keys(procedureTypes).map((item) => ({
+      value: item.toString(),
+      label: procedureTypes[item],
+    })) as any
+    assessmentsList.value = Object.keys(serviceAssessments).map((item) => ({
+      value: item.toString(),
+      label: `${item.toString()} - ${serviceAssessments[item]}`,
+    })) as any
+    supportCodesList.value = Object.keys(supportCodes).map((item) => ({
+      value: item.toString(),
+      label: `${item.toString()} - ${supportCodes[item]}`,
+    })) as any
+    classLevelsList.value = Object.keys(classLevels).map((item) => ({
+      value: item.toString(),
+      label: classLevels[item],
+    })) as any
+    classLevelUpgradesList.value = Object.keys(classLevelUpgrades).map((item) => ({
+      value: item.toString(),
+      label: classLevelUpgrades[item],
+    })) as any
+    classPaySourcesList.value = Object.keys(classPaySources).map((item) => ({
+      value: item.toString(),
+      label: classPaySources[item],
+    })) as any
+    await handleFetchSpecialists()
+    if (route.query) {
+      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']
+      if (queries['specialist-code']) selectedObjects.value['subSpecialistCode'] = queries['specialist-code']
+      if (queries['sub-specialist-code']) selectedObjects.value['subSpecialistCode'] = queries['sub-specialist-code']
+      if (queries['card-number']) selectedObjects.value['cardNumber'] = queries['card-number']
+      if (queries['register-date']) selectedObjects.value['registerDate'] = queries['register-date']
+      if (queries['sep-type']) selectedObjects.value['sepType'] = queries['sep-type']
+      if (queries['sep-number']) selectedObjects.value['sepNumber'] = queries['sep-number']
+      if (queries['register-date']) selectedObjects.value['registerDate'] = queries['register-date']
+      if (queries['payment-type']) selectedObjects.value['paymentType'] = queries['payment-type']
+      if (queries['patient-id']) {
+        await getPatientInternalMappers(queries['patient-id'])
+      }
+      if (queries['card-number']) {
+        await getMemberList({
+          mode: 'by-card',
+          number: queries['card-number'],
+          date: new Date().toISOString().substring(0, 10),
+        })
+      }
+      delete selectedObjects.value['is-service']
+    }
+  }
+
+  return {
+    recSepId,
+    openPatient,
+    openLetter,
+    openHistory,
+    selectedLetter,
+    selectedObjects,
+    selectedServiceType,
+    selectedAdmissionType,
+    histories,
+    letters,
+    doctors,
+    diagnoses,
+    facilitiesFrom,
+    facilitiesTo,
+    supportCodesList,
+    serviceTypesList,
+    registerMethodsList,
+    accidentsList,
+    purposeOfVisitsList,
+    proceduresList,
+    assessmentsList,
+    provincesList,
+    citiesList,
+    districtsList,
+    classLevelsList,
+    classLevelUpgradesList,
+    classPaySourcesList,
+    isServiceHidden,
+    isSaveLoading,
+    isLetterReadonly,
+    isLoadingPatient,
+    specialistsTree,
+    resourceType,
+    resourcePath,
+    encounterId,
+    patients,
+    selectedPatient,
+    paginationMeta,
+    getMonitoringHistoryMappers,
+    getLetterMappers,
+    getPatientInternalMappers,
+    getPatientExternalMappers,
+    getPatientsList,
+    getPatientByIdentifierSearch,
+    handleSaveLetter,
+    mapLetterDataToForm,
+    handleSavePatient,
+    handleEvent,
+    handleFetch,
+    handleFetchSpecialists,
+    handleInit,
+  }
+}
diff --git a/app/handlers/integration-sep-list.handler.ts b/app/handlers/integration-sep-list.handler.ts
new file mode 100644
index 00000000..5deedccd
--- /dev/null
+++ b/app/handlers/integration-sep-list.handler.ts
@@ -0,0 +1,283 @@
+import { ref, reactive } from 'vue'
+// Components
+import { toast } from '~/components/pub/ui/toast'
+// Types
+import type { Ref as VueRef } from 'vue'
+import type { DateRange } from 'radix-vue'
+import type { DataTableLoader } from '~/components/pub/my-ui/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import type { VclaimSepData } from '~/models/vclaim'
+// Libraries
+import { CalendarDate, getLocalTimeZone } from '@internationalized/date'
+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, removeOld as removeSepDataOld, makeSepDataForRemove } from '~/services/vclaim-sep.service'
+
+const headerKeys = [
+  'letterDate',
+  'letterNumber',
+  'serviceType',
+  'flow',
+  'medicalRecordNumber',
+  'patientName',
+  'cardNumber',
+  'controlLetterNumber',
+  'controlLetterDate',
+  'clinicDestination',
+  'attendingDoctor',
+  'diagnosis',
+  'careClass',
+]
+
+const headerLabels = [
+  'Tanggal SEP',
+  'No. SEP',
+  'Jenis Pelayanan',
+  'Alur',
+  'No. Rekam Medis',
+  'Nama Pasien',
+  'No. Kartu BPJS',
+  'No. Surat Kontrol',
+  'Tgl Surat Kontrol',
+  'Poli Tujuan',
+  'Dokter Penanggung Jawab',
+  'Diagnosa',
+  'Kelas Perawatan',
+]
+
+export function useIntegrationSepList() {
+  const userStore = useUserStore()
+  const today = new Date()
+  const initCalDate = (d: Date) => new CalendarDate(d.getFullYear(), d.getMonth() + 1, d.getDate())
+
+  const recId = ref<number>(0)
+  const recAction = ref<string>('')
+  const recItem = ref<any>(null)
+
+  const data = ref<VclaimSepData[]>([])
+  const dateSelection = ref({ start: initCalDate(today), end: initCalDate(today) }) as VueRef<DateRange>
+  const dateRange = ref(`${getFormatDateId(today)} - ${getFormatDateId(today)}`)
+  const serviceType = ref('2')
+  const serviceTypesList = ref<any[]>([])
+  const search = ref('')
+  const open = ref(false)
+  
+  const sepData = ref({
+    sepNumber: '',
+    cardNumber: '',
+    patientName: '',
+  })
+  
+  const refSearchNav: RefSearchNav = {
+    onClick: () => {},
+    onInput: (_val: string) => {},
+    onClear: () => {},
+  }
+
+  const headerPrep: HeaderPrep = {
+    title: 'Daftar SEP Prosedur',
+    icon: 'i-lucide-panel-bottom',
+    addNav: {
+      label: 'Tambah',
+      onClick: () => {
+        navigateTo('/integration/bpjs-vclaim/sep/add')
+      },
+    },
+  }
+  
+  const paginationMeta = reactive<PaginationMeta>({
+    recordCount: 0,
+    page: 1,
+    pageSize: 10,
+    totalPage: 5,
+    hasNext: false,
+    hasPrev: false,
+  })
+  
+  const isLoading = reactive<DataTableLoader>({
+    isTableLoading: false,
+  })
+
+  const getDateFilter = () => {
+    let dateFilter = ''
+    const isTimeLocal = true
+    const dateFirst =
+      dateSelection.value && dateSelection.value.start
+        ? dateSelection.value.start.toDate(getLocalTimeZone())
+        : new Date()
+    if (isTimeLocal && dateSelection.value && dateSelection.value.end) {
+      const { year, month, day } = dateSelection.value.end
+      dateFilter = `${year}-${month}-${day}`
+    } else {
+      dateFilter = dateFirst.toISOString().substring(0, 10)
+    }
+    return dateFilter
+  }
+
+  const getMonitoringVisitMappers = async () => {
+    isLoading.dataListLoading = true
+    data.value = []
+    const dateFilter = getDateFilter()
+    const result = await geMonitoringVisitList({
+      date: dateFilter || '',
+      serviceType: serviceType.value,
+    })
+
+    if (result && result.success && result.body) {
+      const visitsRaw = result.body?.response?.sep || []
+      if (!visitsRaw) {
+        isLoading.dataListLoading = false
+        return
+      }
+      visitsRaw.forEach((result: any) => {
+        let st = result.jnsPelayanan || '-'
+        if (st === 'R.Inap') st = 'Rawat Inap'
+        else if (st === '1' || st === 'R.Jalan') st = 'Rawat Jalan'
+
+        data.value.push({
+          letterDate: result.tglSep || '-',
+          letterNumber: result.noSep || '-',
+          serviceType: st,
+          flow: '-',
+          medicalRecordNumber: '-',
+          patientName: result.nama || '-',
+          cardNumber: result.noKartu || '-',
+          controlLetterNumber: result.noRujukan || '-',
+          controlLetterDate: result.tglPlgSep || '-',
+          clinicDestination: result.poli || '-',
+          attendingDoctor: '-',
+          diagnosis: result.diagnosa || '-',
+          careClass: result.kelasRawat || '-',
+        })
+      })
+    }
+
+    isLoading.dataListLoading = false
+  }
+
+  const getSepList = async () => {
+    await getMonitoringVisitMappers()
+  }
+
+  const setServiceTypes = () => {
+    serviceTypesList.value = Object.keys(serviceTypes).map((item) => ({
+      value: item.toString(),
+      label: serviceTypes[item],
+    })) as any
+  }
+
+  const setDateRange = () => {
+    const startCal = dateSelection.value.start
+    const endCal = dateSelection.value.end
+    const s = startCal ? startCal.toDate(getLocalTimeZone()) : today
+    const e = endCal ? endCal.toDate(getLocalTimeZone()) : today
+    dateRange.value = `${getFormatDateId(s)} - ${getFormatDateId(e)}`
+  }
+
+  const handleExportCsv = () => {
+    if (!data.value || data.value.length === 0) {
+      toast({ title: 'Kosong', description: 'Tidak ada data untuk diekspor', variant: 'destructive' })
+      return
+    }
+
+    const yyyy = today.getFullYear()
+    const mm = String(today.getMonth() + 1).padStart(2, '0')
+    const dd = String(today.getDate()).padStart(2, '0')
+    const dateStr = `${yyyy}-${mm}-${dd}`
+    const filename = `file-sep-${dateStr}.csv`
+    downloadCsv(headerKeys, headerLabels, data.value, filename, ',', true)
+  }
+
+  const handleExportExcel = async () => {
+    if (!data.value || data.value.length === 0) {
+      toast({ title: 'Kosong', description: 'Tidak ada data untuk diekspor', variant: 'destructive' })
+      return
+    }
+
+    const yyyy = today.getFullYear()
+    const mm = String(today.getMonth() + 1).padStart(2, '0')
+    const dd = String(today.getDate()).padStart(2, '0')
+    const dateStr = `${yyyy}-${mm}-${dd}`
+    const filename = `file-sep-${dateStr}.xlsx`
+    try {
+      await downloadXls(headerKeys, headerLabels, data.value, filename, 'SEP Data')
+    } catch (err: any) {
+      console.error('exportExcel error', err)
+      toast({ title: 'Gagal', description: err?.message || 'Gagal mengekspor data ke Excel', variant: 'destructive' })
+    }
+  }
+
+  const handleRowSelected = (row: any) => {
+    if (!row) return
+    sepData.value.sepNumber = row.letterNumber || ''
+    sepData.value.cardNumber = row.cardNumber || ''
+    sepData.value.patientName = row.patientName || ''
+    recItem.value = row
+    recId.value = (row && (row.id || row.recId)) || 0
+  }
+
+  const handlePageChange = (page: number) => {
+    console.log('pageChange', page)
+  }
+
+  const handleRemove = async () => {
+    const isNew = true;
+    try {
+      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
+
+      if (
+        backendMessage === 'success' ||
+        (backendStatus === 'error' && backendMessage === 'Decrypt failed: illegal base64 data at input byte 16')
+      ) {
+        await getSepList()
+        toast({ title: 'Berhasil', description: backendMessage || 'Data berhasil dihapus', variant: 'default' })
+      } else {
+        toast({ title: 'Gagal', description: backendMessage || 'Gagal menghapus data', variant: 'destructive' })
+      }
+    } catch (err: any) {
+      console.error('handleRemove error', err)
+      toast({
+        title: 'Gagal',
+        description: err?.message || 'Terjadi kesalahan saat menghapus data',
+        variant: 'destructive',
+      })
+    } finally {
+      recId.value = 0
+      recAction.value = ''
+      open.value = false
+    }
+  }
+
+  return {
+    recId,
+    recAction,
+    recItem,
+    data,
+    dateSelection,
+    dateRange,
+    serviceType,
+    serviceTypesList,
+    search,
+    open,
+    sepData,
+    headerPrep,
+    refSearchNav,
+    paginationMeta,
+    isLoading,
+    getSepList,
+    setServiceTypes,
+    setDateRange,
+    handleExportCsv,
+    handleExportExcel,
+    handleRowSelected,
+    handlePageChange,
+    handleRemove,
+  }
+}
diff --git a/app/handlers/kfr.handler.ts b/app/handlers/kfr.handler.ts
new file mode 100644
index 00000000..929b57cc
--- /dev/null
+++ b/app/handlers/kfr.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/kfr.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
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/surgery-report.handler.ts b/app/handlers/surgery-report.handler.ts
new file mode 100644
index 00000000..e24ab442
--- /dev/null
+++ b/app/handlers/surgery-report.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/surgery-report.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/handlers/therapy-protocol.handler.ts b/app/handlers/therapy-protocol.handler.ts
new file mode 100644
index 00000000..c0423eff
--- /dev/null
+++ b/app/handlers/therapy-protocol.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/therapy-protocol.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
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/layouts/default.vue b/app/layouts/default.vue
index dd52a9c8..a79ecb98 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -2,7 +2,12 @@
 import CardContent from '~/components/pub/ui/card/CardContent.vue'
 
 const route = useRoute()
+
+
 const contentFrame = computed(() => route.meta.contentFrame)
+const contentPadding = computed(() => route.meta.contentPadding || 'p-4 2xl:p-5')
+const contentUseCard = computed(() => route.meta.contentUseCard === false ? false : true)
+console.log(route.meta.contentUseCard,contentUseCard)
 const contentFrameClass = computed(() => {
   switch (contentFrame.value) {
     case 'cf-container-2xl':
@@ -28,13 +33,14 @@ const contentFrameClass = computed(() => {
     <LayoutAppSidebar />
     <SidebarInset>
       <LayoutHeader />
-      <div :class="`w-full p-4 2xl:p-5 flex justify-center ${contentFrameClass}`">
+      <div :class="`w-full flex justify-center ${contentPadding} ${contentFrameClass}`">
         <div v-if="contentFrame !== 'cf-no-frame'">
-          <Card>
+          <Card v-if="contentUseCard">
             <CardContent>
               <slot />
             </CardContent>
           </Card>
+          <slot v-else />
         </div>
         <slot v-else />
       </div>
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index 48fb5c8c..b827ef40 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -8,7 +8,7 @@ export const dataStatusCodes: Record<string, string> = {
   review: 'Review',
   process: 'Proses',
   done: 'Selesai',
-  canceled: 'Dibatalkan',
+  cancel: 'Dibatalkan',
   rejected: 'Ditolak',
   skiped: 'Dilewati',
 }
@@ -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
@@ -425,3 +427,77 @@ export const supportingDocOpt = [
   { label: 'Data Penunjang', value: 'encounter-support' },
   { label: 'Lain - Lain', value: 'encounter-other' },
 ]
+
+
+export type SurgeryType = "kecil" | "sedang" | "besar" | "khusus"
+export const SurgeryTypeOptList: { label: string; value: SurgeryType }[] = [
+  { label: 'Kecil', value: 'kecil' },
+  { label: 'Sedang', value: 'sedang' },
+  { label: 'Besar', value: 'besar' },
+  { label: 'Khusus', value: 'khusus' },
+]
+
+export type BillingCodeType = "general" | "regional" | "local"
+export const BillingCodeTypeOptList: { label: string; value: BillingCodeType }[] = [
+  { label: 'General', value: 'general' },
+  { label: 'Regional', value: 'regional' },
+  { label: 'Local', value: 'local' },
+]
+
+export type SurgerySystemType = "cito" | "urgent" | "efektif" | "khusus"
+export const SurgerySystemTypeOptList: { label: string; value: SurgerySystemType }[] = [
+  { label: 'Cito', value: 'cito' },
+  { label: 'Urgent', value: 'urgent' },
+  { label: 'Efektif', value: 'efektif' },
+  { label: 'Khusus', value: 'khusus' },
+]
+
+export type DissectionType = "bersih" | "bersih terkontaminasi" | "terkontaminasi kotor" | "kotor"
+export const DissectionTypeOptList: { label: string; value: DissectionType }[] = [
+  { label: 'Bersih', value: 'bersih' },
+  { label: 'Bersih terkontaminasi', value: 'bersih terkontaminasi' },
+  { label: 'Terkontaminasi kotor', value: 'terkontaminasi kotor' },
+  { label: 'Kotor', value: 'kotor' },
+]
+
+export type SurgeryOrderType = "satu" | "ulangan"
+export const SurgeryOrderTypeOptList: { label: string; value: SurgeryOrderType }[] = [
+  { label: 'Satu', value: 'satu' },
+  { label: 'Ulangan', value: 'ulangan' },
+]
+
+export type BirthDescriptionType = "lahir hidup" | "lahir mati"
+export const BirthDescriptionTypeOptList: { label: string; value: BirthDescriptionType }[] = [
+  { label: 'Lahir Hidup', value: 'lahir hidup' },
+  { label: 'Lahir Mati', value: 'lahir mati' },
+]
+
+export type BirthPlaceDescriptionType = "rssa" | "bidan luar" | "dokter luar" | "dukun bayi" | "puskesmas" | "paramedis luar"
+export const BirthPlaceDescriptionTypeOptList: { label: string; value: BirthPlaceDescriptionType }[] = [
+  { label: 'RSSA', value: 'rssa' },
+  { label: 'Bidan luar', value: 'bidan luar' },
+  { label: 'Dokter luar', value: 'dokter luar' },
+  { label: 'Dukun bayi', value: 'dukun bayi' },
+  { label: 'Puskesmas', value: 'puskesmas' },
+  { label: 'Paramedis luar', value: 'paramedis luar' },
+]
+
+export type SpecimenType = "pa" | "mikrobiologi" | "laborat" | "tidak perlu"
+export const SpecimenTypeOptList: { label: string; value: SpecimenType }[] = [
+  { label: 'PA', value: 'pa' },
+  { 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/date.ts b/app/lib/date.ts
index 2c7b92cf..982c3c5b 100644
--- a/app/lib/date.ts
+++ b/app/lib/date.ts
@@ -1,46 +1,69 @@
+const monthsInId = [
+  'Januari',
+  'Februari',
+  'Maret',
+  'April',
+  'Mei',
+  'Juni',
+  'Juli',
+  'Agustus',
+  'September',
+  'Oktober',
+  'November',
+  'Desember',
+]
+
 export function getAge(dateString: string, comparedDate?: string): { idFormat: string; extFormat: string } {
-	const birthDate = new Date(dateString);
-	const today = new Date();
+  const birthDate = new Date(dateString)
+  const today = new Date()
 
-	if (comparedDate) {
-		const comparedDateObj = new Date(comparedDate);
-		today.setFullYear(comparedDateObj.getFullYear());
-		today.setMonth(comparedDateObj.getMonth());
-		today.setDate(comparedDateObj.getDate());
-	}
+  if (comparedDate) {
+    const comparedDateObj = new Date(comparedDate)
+    today.setFullYear(comparedDateObj.getFullYear())
+    today.setMonth(comparedDateObj.getMonth())
+    today.setDate(comparedDateObj.getDate())
+  }
 
-	// Format the date part
-	const options: Intl.DateTimeFormatOptions = { day: 'numeric', month: 'long', year: 'numeric' };
-	const idFormat = birthDate.toLocaleDateString('id-ID', options);
+  // Format the date part
+  const options: Intl.DateTimeFormatOptions = { day: 'numeric', month: 'long', year: 'numeric' }
+  const idFormat = birthDate.toLocaleDateString('id-ID', options)
 
-	// Calculate age
-	let years = today.getFullYear() - birthDate.getFullYear();
-	let months = today.getMonth() - birthDate.getMonth();
-	let days = today.getDate() - birthDate.getDate();
+  // Calculate age
+  let years = today.getFullYear() - birthDate.getFullYear()
+  let months = today.getMonth() - birthDate.getMonth()
+  let days = today.getDate() - birthDate.getDate()
 
-	if (months < 0 || (months === 0 && days < 0)) {
-		years--;
-		months += 12;
-	}
+  if (months < 0 || (months === 0 && days < 0)) {
+    years--
+    months += 12
+  }
 
-	if (days < 0) {
-		const prevMonth = new Date(today.getFullYear(), today.getMonth() - 1, 0);
-		days += prevMonth.getDate();
-		months--;
-	}
+  if (days < 0) {
+    const prevMonth = new Date(today.getFullYear(), today.getMonth() - 1, 0)
+    days += prevMonth.getDate()
+    months--
+  }
 
-	// Format the age part
-	let extFormat = '';
-	if ([years, months, days].filter(Boolean).join(' ')) {
-		extFormat = `${years} Tahun ${months} Bulan ${days} Hari`;
-	} else {
-		extFormat = '0';
-	}
+  // Format the age part
+  let extFormat = ''
+  if ([years, months, days].filter(Boolean).join(' ')) {
+    extFormat = `${years} Tahun ${months} Bulan ${days} Hari`
+  } else {
+    extFormat = '0'
+  }
 
-	return {
-		idFormat,
-		extFormat
-	};
+  return {
+    idFormat,
+    extFormat,
+  }
+}
+
+// Date selection: default to today - today
+export function getFormatDateId(date: Date) {
+  const dd = String(date.getDate()).padStart(2, '0')
+  const mm = monthsInId[date.getMonth()]
+  const yyyy = date.getFullYear()
+  return `${dd} ${mm} ${yyyy}`
 }
 
 export function formatDateYyyyMmDd(isoDateString: string): string {
@@ -49,4 +72,17 @@ export function formatDateYyyyMmDd(isoDateString: string): string {
 	const month = String(date.getMonth() + 1).padStart(2, '0');
 	const day = String(date.getDate()).padStart(2, '0');
 	return `${year}-${month}-${day}`;
-}
\ No newline at end of file
+}
+
+// Function to check if date is invalid (like "0001-01-01T00:00:00Z")
+export function isValidDate(dateString: string | null | undefined): boolean {
+  if (!dateString) return false
+  // Check for invalid date patterns
+  if (dateString.startsWith('0001-01-01')) return false
+  try {
+    const date = new Date(dateString)
+    return !isNaN(date.getTime())
+  } catch {
+    return false
+  }
+}
diff --git a/app/lib/download.ts b/app/lib/download.ts
new file mode 100644
index 00000000..eb996432
--- /dev/null
+++ b/app/lib/download.ts
@@ -0,0 +1,154 @@
+/**
+ * Download data as CSV file.
+ *
+ * @param headers - Array of header names. If omitted and data is array of objects, keys will be taken from first object.
+ * @param data - Array of rows. Each row can be either an object (key -> value) or an array of values.
+ * @param filename - optional file name to use for downloaded file
+ * @param delimiter - csv delimiter (default is comma)
+ * @param addBOM - add UTF-8 BOM to the file to make Excel detect UTF-8 correctly
+ * Usage examples:
+ * 1) With headers and array of objects
+ * downloadCsv(['name', 'age'], [{name: 'Alice', age: 25}, {name: 'Bob', age: 30}], 'people.csv');
+ * 2) Without headers (automatically uses object keys)
+ * downloadCsv(null, [{name: 'Alice', age: 25}, {name: 'Bob', age: 30}], 'people.csv');
+ * 3) With array-of-arrays
+ * downloadCsv(['col1', 'col2'], [['a', 'b'], ['c', 'd']], 'matrix.csv');
+ */
+export function downloadCsv(
+  headers: string[] | null,
+  headerLabels: string[],
+  data: Array<Record<string, any> | any[]>,
+  filename = 'data.csv',
+  delimiter = ',',
+  addBOM = true,
+) {
+  if (!Array.isArray(data) || data.length === 0) {
+    // still create an empty CSV containing only headers
+    const csvHeader = headers ? headers.join(delimiter) : ''
+    const csvString = addBOM ? '\uFEFF' + csvHeader : csvHeader
+    const blob = new Blob([csvString], { type: 'text/csv;charset=utf-8;' })
+    const link = document.createElement('a')
+    link.href = URL.createObjectURL(blob)
+    link.setAttribute('download', filename)
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+    return
+  }
+
+  // if headers not provided and rows are objects, take keys from first object
+  let _headers: string[] | null = headers
+  if (!_headers) {
+    const firstRow = data[0]
+    if (typeof firstRow === 'object' && !Array.isArray(firstRow)) {
+      _headers = Object.keys(firstRow)
+    } else if (Array.isArray(firstRow)) {
+      // if rows are arrays and no headers provided, we won't add header row
+      _headers = null
+    }
+  }
+
+  const escape = (val: unknown) => {
+    if (val === null || typeof val === 'undefined') return ''
+    const str = String(val)
+    const needsQuoting = str.includes(delimiter) || str.includes('\n') || str.includes('\r') || str.includes('"')
+    if (!needsQuoting) return str
+    return '"' + str.replace(/"/g, '""') + '"'
+  }
+
+  const rows: string[] = data.map((row) => {
+    if (Array.isArray(row)) {
+      return row.map(escape).join(delimiter)
+    }
+    // object row - map using headers if available, otherwise use object values
+    if (_headers && Array.isArray(_headers)) {
+      return _headers.map((h) => escape((row as Record<string, any>)[h])).join(delimiter)
+    }
+    return Object.values(row).map(escape).join(delimiter)
+  })
+
+  const headerRow = headerLabels ? headerLabels.join(delimiter) : _headers ? _headers.join(delimiter) : null
+  const csvString = (addBOM ? '\uFEFF' : '') + [headerRow, ...rows].filter(Boolean).join('\r\n')
+
+  const blob = new Blob([csvString], { type: 'text/csv;charset=utf-8;' })
+  const link = document.createElement('a')
+  link.href = URL.createObjectURL(blob)
+  link.setAttribute('download', filename)
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
+
+/**
+ * Download data as XLS (Excel) file using xlsx library.
+ *
+ * @param headers - Array of header names. If omitted and data is array of objects, keys will be taken from first object.
+ * @param data - Array of rows. Each row can be either an object (key -> value) or an array of values.
+ * @param filename - optional file name to use for downloaded file (default: 'data.xlsx')
+ * @param sheetName - optional sheet name in workbook (default: 'Sheet1')
+ * Usage examples:
+ * 1) With headers and array of objects
+ * await downloadXls(['name', 'age'], [{name: 'Alice', age: 25}, {name: 'Bob', age: 30}], 'people.xlsx');
+ * 2) Without headers (automatically uses object keys)
+ * await downloadXls(null, [{name: 'Alice', age: 25}, {name: 'Bob', age: 30}], 'people.xlsx');
+ * 3) With custom sheet name
+ * await downloadXls(['col1', 'col2'], [['a', 'b'], ['c', 'd']], 'matrix.xlsx', 'MyData');
+ */
+export async function downloadXls(
+  headers: string[] | null,
+  headerLabels: string[],
+  data: Array<Record<string, any> | any[]>,
+  filename = 'data.xlsx',
+  sheetName = 'Sheet1',
+) {
+  // Dynamically import xlsx to avoid server-side issues
+  const { utils, write } = await import('xlsx')
+  const { saveAs } = await import('file-saver')
+
+  if (!Array.isArray(data) || data.length === 0) {
+    // Create empty sheet with headers only
+    const ws = utils.aoa_to_sheet(headers ? [headers] : [[]])
+    const wb = utils.book_new()
+    utils.book_append_sheet(wb, ws, sheetName)
+    const wbout = write(wb, { bookType: 'xlsx', type: 'array' })
+    saveAs(new Blob([wbout], { type: 'application/octet-stream' }), filename)
+    return
+  }
+
+  // if headers not provided and rows are objects, take keys from first object
+  let _headers: string[] | null = headers
+  if (!_headers) {
+    const firstRow = data[0]
+    if (typeof firstRow === 'object' && !Array.isArray(firstRow)) {
+      _headers = Object.keys(firstRow)
+    } else if (Array.isArray(firstRow)) {
+      _headers = null
+    }
+  }
+
+  // Convert data rows to 2D array
+  const rows: any[][] = data.map((row) => {
+    if (Array.isArray(row)) {
+      return row
+    }
+    // object row - map using headers if available, otherwise use object values
+    if (_headers && Array.isArray(_headers)) {
+      return _headers.map((h) => (row as Record<string, any>)[h] ?? '')
+    }
+    return Object.values(row)
+  })
+
+  // Combine headers/labels and rows for sheet
+  // If caller provided headerLabels (as display labels), prefer them.
+  const sheetHeader = headerLabels ? headerLabels : _headers ? _headers : null
+  const sheetData = sheetHeader ? [sheetHeader, ...rows] : rows
+
+  // Create worksheet and workbook
+  const ws = utils.aoa_to_sheet(sheetData)
+  const wb = utils.book_new()
+  utils.book_append_sheet(wb, ws, sheetName)
+
+  // Write and save file
+  const wbout = write(wb, { bookType: 'xlsx', type: 'array' })
+  saveAs(new Blob([wbout], { type: 'application/octet-stream' }), filename)
+}
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/page-permission.ts b/app/lib/page-permission.ts
index ab7b5550..807131a8 100644
--- a/app/lib/page-permission.ts
+++ b/app/lib/page-permission.ts
@@ -1,7 +1,7 @@
 import type { RoleAccess } from '~/models/role'
 
 export const PAGE_PERMISSIONS = {
-  '/patient': {
+  '/client/patient': {
     'emp|doc': ['R'],
     'emp|nur': ['R'],
     'emp|reg': ['C', 'R', 'U', 'D'],
@@ -9,13 +9,11 @@ export const PAGE_PERMISSIONS = {
     'emp|pay': ['R'],
     'emp|mng': ['R'],
   },
-  '/doctor': {
-    'emp|doc': ['C', 'R', 'U', 'D'],
-    'emp|nur': ['R'],
-    'emp|reg': ['R'],
-    'emp|pha': ['R'],
-    'emp|pay': ['R'],
-    'emp|mng': ['R'],
+  '/human-src/employee': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
+  },
+  '/human-src/intern': {
+    'div|hrd': ['C', 'R', 'U', 'D'],
   },
   '/satusehat': {
     'emp|doc': ['R'],
diff --git a/app/lib/roles.ts b/app/lib/roles.ts
new file mode 100644
index 00000000..8e6561e3
--- /dev/null
+++ b/app/lib/roles.ts
@@ -0,0 +1,16 @@
+import { medicalRoles, respPosCode } from '~/const/common/role'
+
+export function getServicePosition(role?: string): string {
+  if(!role) {
+    return 'none'
+  }
+  if (medicalRoles.includes(role)) {
+    return 'medical'
+  } else if (role === 'emp|reg') {
+    return 'registration'
+  } else if (role.includes('|resp')) {
+      return 'verificator'
+  } else {
+    return 'none'
+  }
+}
diff --git a/app/lib/utils.ts b/app/lib/utils.ts
index 67f3d04b..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.
@@ -160,4 +166,4 @@ export function unauthorizedToast() {
     description: 'You are not authorized to perform this action.',
     variant: 'destructive',
   })
-}
+}
\ No newline at end of file
diff --git a/app/middleware/rbac.ts b/app/middleware/rbac.ts
index 87e8ca00..fa0c0685 100644
--- a/app/middleware/rbac.ts
+++ b/app/middleware/rbac.ts
@@ -20,7 +20,7 @@ export default defineNuxtRouteMiddleware((to) => {
     const requiredRoles = to.meta.roles as string[]
     if (requiredRoles && requiredRoles.length > 0) {
       // FIXME: change this dummy roles, when api is ready
-      const userRoles = authStore.userRole
+      const userRoles = authStore.userRoles
       // const userRoles = ['admisi']
       const hasRequiredRole = requiredRoles.some((role) => userRoles.includes(role))
 
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/consultation.ts b/app/models/consultation.ts
index 595d628e..59a32c9d 100644
--- a/app/models/consultation.ts
+++ b/app/models/consultation.ts
@@ -2,8 +2,8 @@ export interface Consultation {
   id: number
   encounter_id: number
   date?: string
-  unit_id: number
-  doctor_id?: number
+  unit_code: number
+  doctor_code?: number
   problem: string
   solution?: string
   repliedAt?: string
@@ -13,13 +13,13 @@ export interface CreateDto {
   encounter_id: number
   date: string
   problem: string
-  dstUnit_id: number
+  dstUnit_code: string
 }
 
 export interface UpdateDto {
   id: number
   problem: string
-  unit_id: number
+  unit_code: number
 }
 
 export interface DeleteDto {
@@ -31,7 +31,7 @@ export function genCreateDto(): CreateDto {
     date: '',
     encounter_id: 0,
     problem: '',
-    dstUnit_id: 0,
+    dstUnit_code: '',
   }
 }
 
@@ -39,8 +39,8 @@ export function genConsultation(): Consultation {
   return {
     id: 0,
     encounter_id: 0,
-    unit_id: 0,
-    doctor_id: 0,
+    unit_code: 0,
+    doctor_code: 0,
     problem: '',
     solution: '',
     repliedAt: '',
diff --git a/app/models/doctor.ts b/app/models/doctor.ts
index 1b631907..297f9372 100644
--- a/app/models/doctor.ts
+++ b/app/models/doctor.ts
@@ -1,5 +1,6 @@
 import { type Base, genBase } from "./_base"
 import { type Employee, genEmployee } from "./employee"
+import type { Unit } from "./unit"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
 
@@ -9,10 +10,11 @@ export interface Doctor extends Base {
   ihs_number: string
   sip_number: string
   code?: string
-  unit_icode?: number
-  specialist_icode?: number
+  unit_code?: string
+  unit?: Unit
+  specialist_code?: string
   specialist?: Specialist
-  subspecialist_icode?: number
+  subspecialist_code?: string
   subspecialist?: Subspecialist
   bpjs_code?: string
 }
diff --git a/app/models/encounter.ts b/app/models/encounter.ts
index 55fbdfa4..56ff2af7 100644
--- a/app/models/encounter.ts
+++ b/app/models/encounter.ts
@@ -3,6 +3,7 @@ import { type Doctor, genDoctor } from "./doctor"
 import { genEmployee, type Employee } from "./employee"
 import type { EncounterDocument } from "./encounter-document"
 import type { InternalReference } from "./internal-reference"
+import type { Nurse } from "./nurse"
 import { type Patient, genPatient } from "./patient"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
@@ -14,18 +15,20 @@ export interface Encounter {
     patient: Patient
     registeredAt: string
     class_code: string
-    unit_id: number
+    unit_code: string
     unit: Unit
-    specialist_id?: number
+    specialist_code?: string
     specilist?: Specialist
-    subspecialist_id?: number
+    subspecialist_code?: string
     subspecialist?: Subspecialist
     visitDate: string
     adm_employee_id: number
     adm_employee: Employee
-    appointment_doctor_id: number
+    responsible_nurse_code?: string
+    responsible_nurse?: Nurse
+    appointment_doctor_code: string
     appointment_doctor: Doctor
-    responsible_doctor_id?: number
+    responsible_doctor_code?: string
     responsible_doctor?: Doctor
     refSource_name?: string
     appointment_id?: number
@@ -37,6 +40,7 @@ export interface Encounter {
     discharge_date?: string
     internalReferences?: InternalReference[]
     deathCause?: DeathCause
+    paymentMethod_code?: string
     status_code: string
     encounterDocuments: EncounterDocument[]
 }
@@ -48,12 +52,12 @@ export function genEncounter(): Encounter {
         patient: genPatient(),
         registeredAt: '',
         class_code: '',
-        unit_id: 0,
+        unit_code: '',
         unit: genUnit(),
         visitDate: '',
         adm_employee_id: 0,
         adm_employee: genEmployee(),
-        appointment_doctor_id: 0,
+        appointment_doctor_code: '',
         appointment_doctor: genDoctor(),
         medicalDischargeEducation: '',
         status_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/nurse.ts b/app/models/nurse.ts
index d5e1f95f..5f511781 100644
--- a/app/models/nurse.ts
+++ b/app/models/nurse.ts
@@ -1,7 +1,9 @@
 import { type Base, genBase } from "./_base"
+import type { Employee } from "./employee"
 
 export interface Nurse extends Base {
   employee_id: number
+  employee?: Employee
   ihs_number?: string
   unit_id: number
   infra_id: number
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/role.ts b/app/models/role.ts
index 6c6097a9..7f96035a 100644
--- a/app/models/role.ts
+++ b/app/models/role.ts
@@ -1,5 +1,3 @@
-import type { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
 export interface User {
   id: string
   name: string
@@ -14,9 +12,9 @@ export interface AuthState {
 
 export type Permission = 'C' | 'R' | 'U' | 'D'
 
-export interface RoleAccess {
+export interface RoleAccesses {
   [role: string]: Permission[]
 }
 
-export type PagePath = keyof typeof PAGE_PERMISSIONS
-export type PagePermission = (typeof PAGE_PERMISSIONS)[PagePath]
+// export type PagePath = keyof typeof PAGE_PERMISSIONS
+// export type PagePermission = (typeof PAGE_PERMISSIONS)[PagePath]
diff --git a/app/models/surgery-report.ts b/app/models/surgery-report.ts
new file mode 100644
index 00000000..8eb0edef
--- /dev/null
+++ b/app/models/surgery-report.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 SurgeryReport 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 genSurgeryReport(): SurgeryReport {
+  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/unit-position.ts b/app/models/unit-position.ts
index a583d948..3e1dc426 100644
--- a/app/models/unit-position.ts
+++ b/app/models/unit-position.ts
@@ -2,7 +2,7 @@ import { type Base, genBase } from './_base'
 import type { Employee } from './employee'
 
 export interface UnitPosition extends Base {
-  unit_code: string
+  unit_id: string
   code: string
   name: string
   headStatus?: boolean
@@ -14,7 +14,7 @@ export interface UnitPosition extends Base {
 export function genUnitPosition(): UnitPosition {
   return {
     ...genBase(),
-    unit_code: '',
+    unit_id: '',
     code: '',
     name: '',
     headStatus: false,
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)/children-action/echocardiography/index.vue b/app/pages/(features)/ambulatory/consultation/index.vue
similarity index 100%
rename from app/pages/(features)/children-action/echocardiography/index.vue
rename to app/pages/(features)/ambulatory/consultation/index.vue
diff --git a/app/pages/(features)/children-action/spirometry/index.vue b/app/pages/(features)/ambulatory/encounter-queue/index.vue
similarity index 100%
rename from app/pages/(features)/children-action/spirometry/index.vue
rename to app/pages/(features)/ambulatory/encounter-queue/index.vue
diff --git a/app/pages/(features)/ambulatory/encounter/[id]/detail.vue b/app/pages/(features)/ambulatory/encounter/[id]/detail.vue
new file mode 100644
index 00000000..49a92919
--- /dev/null
+++ b/app/pages/(features)/ambulatory/encounter/[id]/detail.vue
@@ -0,0 +1,38 @@
+<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'],
+  title: 'Detail Kunjungan',
+  contentFrame: 'cf-full-width',
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
diff --git a/app/pages/(features)/ambulatory/encounter/[id]/edit.vue b/app/pages/(features)/ambulatory/encounter/[id]/edit.vue
new file mode 100644
index 00000000..22e24f52
--- /dev/null
+++ b/app/pages/(features)/ambulatory/encounter/[id]/edit.vue
@@ -0,0 +1,49 @@
+<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 { getParamsId, getRouteTitle, getPageAccess } = usePageChecker()
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['emp|reg'],
+  title: 'Edit Kunjungan',
+  contentFrame: 'cf-full-width',
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]/edit'] || {}
+const hasAccess = getPageAccess(roleAccess, 'update')
+const encounterId = getParamsId()
+const { user } = useUserStore()
+const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content
+      :id="encounterId"
+      class-code="ambulatory"
+      :sub-class-code="subClassCode"
+      form-type="edit"
+    />
+  </div>
+  <Error
+    v-else
+    :status-code="403"
+  />
+</template>
diff --git a/app/pages/(features)/ambulatory/encounter/[id]/process.vue b/app/pages/(features)/ambulatory/encounter/[id]/process.vue
new file mode 100644
index 00000000..355bc9ec
--- /dev/null
+++ b/app/pages/(features)/ambulatory/encounter/[id]/process.vue
@@ -0,0 +1,59 @@
+<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/process.vue'
+
+const { getRouteTitle, getPageAccess, hasCreateAccess, hasReadAccess, hasUpdateAccess, hasDeleteAccess } = 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,
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
+// Preps role checking
+const route = useRoute()
+const menu = computed(() => route.query.menu as string | undefined)
+const accessKey = computed(() => `/ambulatory/encounter/[id]/process` + (menu.value ? `?menu=${menu.value}` : ''))
+const roleAccess: Record<string, Permission[]> = permissions[accessKey.value] || {}
+const hasAccess = getPageAccess(roleAccess, 'read') || true
+const canCreate = hasCreateAccess(roleAccess)
+const canRead = hasReadAccess(roleAccess)
+const canUpdate = hasUpdateAccess(roleAccess)
+const canDelete = hasDeleteAccess(roleAccess)
+</script>
+
+<template>
+  <!--
+  {{ accessKey }}
+  {{ roleAccess }}
+  {{ hasAccess }}
+  {{ canUpdate }}
+   -->
+  <div v-if="hasAccess">
+    <Content
+      class-code="ambulatory"
+      :can-create="canCreate"
+      :can-read="canRead"
+      :can-update="canUpdate"
+      :can-delete="canDelete"
+    />
+  </div>
+  <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
new file mode 100644
index 00000000..89b9e6fb
--- /dev/null
+++ b/app/pages/(features)/ambulatory/encounter/add.vue
@@ -0,0 +1,46 @@
+<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'],
+  title: 'Tambah Kunjungan',
+  contentFrame: 'cf-full-width',
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/add'] || {}
+const hasAccess = getPageAccess(roleAccess, 'create')
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content
+      :id="0"
+      class-code="ambulatory"
+      sub-class-code="reg"
+      form-type="add"
+    />
+  </div>
+  <Error
+    v-else
+    :status-code="403"
+  />
+</template>
diff --git a/app/pages/(features)/ambulatory/encounter/index.vue b/app/pages/(features)/ambulatory/encounter/index.vue
new file mode 100644
index 00000000..6f7df89c
--- /dev/null
+++ b/app/pages/(features)/ambulatory/encounter/index.vue
@@ -0,0 +1,58 @@
+<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/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'],
+  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 hasAccess = getPageAccess(roleAccess, 'read')
+const canCreate = getPageAccess(roleAccess, 'create')
+const canRemove = getPageAccess(roleAccess, 'delete')
+
+// User info
+const { user } = useUserStore()
+const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+</script>
+
+<template>
+  <div>
+    <div v-if="hasAccess">
+      <Content
+        class-code="ambulatory"
+        :sub-class-code="subClassCode"
+        :can-create="canCreate"
+        :can-delete="canRemove"
+      />
+    </div>
+    <Error
+      v-else
+      :status-code="403"
+    />
+  </div>
+</template>
diff --git a/app/pages/(features)/children-action/thalasemia/index.vue b/app/pages/(features)/ambulatory/registration-queue/index.vue
similarity index 100%
rename from app/pages/(features)/children-action/thalasemia/index.vue
rename to app/pages/(features)/ambulatory/registration-queue/index.vue
diff --git a/app/pages/(features)/outpation-action/chemotherapy/[mode]/[id]/verification.vue b/app/pages/(features)/chemotherapy/[mode]/[id]/verification.vue
similarity index 100%
rename from app/pages/(features)/outpation-action/chemotherapy/[mode]/[id]/verification.vue
rename to app/pages/(features)/chemotherapy/[mode]/[id]/verification.vue
diff --git a/app/pages/(features)/outpation-action/chemotherapy/[mode]/index.vue b/app/pages/(features)/chemotherapy/[mode]/index.vue
similarity index 100%
rename from app/pages/(features)/outpation-action/chemotherapy/[mode]/index.vue
rename to app/pages/(features)/chemotherapy/[mode]/index.vue
diff --git a/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue b/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue
new file mode 100644
index 00000000..ad5dfe37
--- /dev/null
+++ b/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/ambulatory'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import Content from '~/components/content/encounter/detail.vue'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['emp|doc', 'emp|nur', 'emp|reg', 'emp|pha', 'emp|pay', 'emp|mng'],
+  title: 'Detail Kunjungan',
+  contentFrame: 'cf-full-width',
+})
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/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}`,
+})
+</script>
+
+<template>
+  <div v-if="canRead">
+    <Content />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
diff --git a/app/pages/(features)/chemotherapy/encounter/[id]/process.vue b/app/pages/(features)/chemotherapy/encounter/[id]/process.vue
new file mode 100644
index 00000000..9884974a
--- /dev/null
+++ b/app/pages/(features)/chemotherapy/encounter/[id]/process.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/chemoteraphy'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import Content from '~/components/content/encounter/process.vue'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['emp|doc', 'emp|nur', 'emp|reg', 'emp|pha', 'emp|pay', 'emp|mng'],
+  title: 'Tambah Kunjungan',
+  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}`,
+})
+</script>
+
+<template>
+  <div v-if="canRead">
+    <Content class-code="ambulatory" sub-class-code="chemo" />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
diff --git a/app/pages/(features)/outpatient/encounter/add.vue b/app/pages/(features)/chemotherapy/encounter/add.vue
similarity index 51%
rename from app/pages/(features)/outpatient/encounter/add.vue
rename to app/pages/(features)/chemotherapy/encounter/add.vue
index 948b16c6..a7ceb7e9 100644
--- a/app/pages/(features)/outpatient/encounter/add.vue
+++ b/app/pages/(features)/chemotherapy/encounter/add.vue
@@ -1,44 +1,46 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/ambulatory'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/entry.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Tambah Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
+// 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) {
-  throw createError({
-    statusCode: 403,
-    statusMessage: 'Access denied',
-  })
+  navigateTo('/403')
 }
 
+// Define permission-based computed properties
+const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
+
 // Define permission-based computed properties
 const canCreate = hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry
+    <Content
       :id="0"
       class-code="ambulatory"
-      sub-class-code="reg"
+      sub-class-code="chemo"
       form-type="Tambah"
     />
   </div>
diff --git a/app/pages/(features)/outpatient/encounter/index.vue b/app/pages/(features)/chemotherapy/encounter/index.vue
similarity index 62%
rename from app/pages/(features)/outpatient/encounter/index.vue
rename to app/pages/(features)/chemotherapy/encounter/index.vue
index 1e679c5d..293b3adf 100644
--- a/app/pages/(features)/outpatient/encounter/index.vue
+++ b/app/pages/(features)/chemotherapy/encounter/index.vue
@@ -1,23 +1,19 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/ambulatory'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+import Content from '~/components/content/encounter/list.vue'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/encounter']
-
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
 const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
@@ -28,14 +24,20 @@ if (!hasAccess) {
 
 // Define permission-based computed properties
 const canRead = hasReadAccess(roleAccess)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentEncounterList
+      <Content
         class-code="ambulatory"
-        sub-class-code="reg"
+        sub-class-code="chemo"
         type="encounter"
       />
     </div>
diff --git a/app/pages/(features)/outpation-action/chemotherapy/index.vue b/app/pages/(features)/chemotherapy/index.vue
similarity index 100%
rename from app/pages/(features)/outpation-action/chemotherapy/index.vue
rename to app/pages/(features)/chemotherapy/index.vue
diff --git a/app/pages/(features)/outpation-action/chemotherapy/list.vue b/app/pages/(features)/chemotherapy/list.vue
similarity index 75%
rename from app/pages/(features)/outpation-action/chemotherapy/list.vue
rename to app/pages/(features)/chemotherapy/list.vue
index a141baaa..34093b2d 100644
--- a/app/pages/(features)/outpation-action/chemotherapy/list.vue
+++ b/app/pages/(features)/chemotherapy/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { PagePermission } from '~/models/role'
+import type { Permission } from '~/models/role'
+import { permissions } from '~/const/page-permission/chemoteraphy'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
   middleware: ['rbac'],
@@ -16,7 +16,7 @@ useHead({
   title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
+const roleAccess: Record<string, Permission[]> = permissions['/chemotherapy'] || {}
 
 const { checkRole, hasReadAccess } = useRBAC()
 
@@ -27,7 +27,7 @@ if (!hasAccess) {
 }
 
 // Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
+const canRead = hasReadAccess(roleAccess)
 </script>
 
 <template>
diff --git a/app/pages/(features)/doctor/add.vue b/app/pages/(features)/doctor/add.vue
deleted file mode 100644
index a76811de..00000000
--- a/app/pages/(features)/doctor/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<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 Dokter',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-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 = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentDoctorAdd />
-  </div>
-  <Error v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/doctor/index.vue b/app/pages/(features)/doctor/index.vue
deleted file mode 100644
index 078df778..00000000
--- a/app/pages/(features)/doctor/index.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<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 Dokter',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-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 = hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentDoctorList />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/outpatient/consultation/index.vue b/app/pages/(features)/echocardiography/index.vue
similarity index 100%
rename from app/pages/(features)/outpatient/consultation/index.vue
rename to app/pages/(features)/echocardiography/index.vue
diff --git a/app/pages/(features)/emergency/encounter/[id]/detail.vue b/app/pages/(features)/emergency/encounter/[id]/detail.vue
new file mode 100644
index 00000000..70a111c9
--- /dev/null
+++ b/app/pages/(features)/emergency/encounter/[id]/detail.vue
@@ -0,0 +1,38 @@
+<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'],
+  title: 'Detail Kunjungan',
+  contentFrame: 'cf-full-width',
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/emergency/encounter/[id]'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
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
new file mode 100644
index 00000000..927ea20e
--- /dev/null
+++ b/app/pages/(features)/emergency/encounter/[id]/process.vue
@@ -0,0 +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: ['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/[id]/process'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content class-code="emergency" />
+  </div>
+  <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 aa382643..234bc8a4 100644
--- a/app/pages/(features)/emergency/encounter/add.vue
+++ b/app/pages/(features)/emergency/encounter/add.vue
@@ -1,45 +1,42 @@
 <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 { getRouteTitle, getPageAccess } = usePageChecker()
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Tambah 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, 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 = 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">
-    <ContentEncounterEntry
+  <div v-if="hasAccess">
+    <Content
       :id="0"
       class-code="emergency"
       sub-class-code="emg"
-      form-type="Tambah"
+      form-type="add"
     />
   </div>
   <Error
diff --git a/app/pages/(features)/emergency/encounter/index.vue b/app/pages/(features)/emergency/encounter/index.vue
index ed05c25e..197a305e 100644
--- a/app/pages/(features)/emergency/encounter/index.vue
+++ b/app/pages/(features)/emergency/encounter/index.vue
@@ -1,42 +1,49 @@
 <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'
+// 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: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/emergency/encounter']
+// Define common things
+const route = useRoute()
 
-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)
+// 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">
-      <ContentEncounterList
+    <div v-if="hasAccess">
+      <Content
         class-code="emergency"
         sub-class-code="emg"
-        type="encounter"
+        :can-create="canCreate"
+        :can-delete="canRemove"
       />
     </div>
     <Error
diff --git a/app/pages/(features)/outpatient/polyclinic-queue/index.vue b/app/pages/(features)/hemophilia/index.vue
similarity index 100%
rename from app/pages/(features)/outpatient/polyclinic-queue/index.vue
rename to app/pages/(features)/hemophilia/index.vue
diff --git a/app/pages/(features)/human-src/employee/[id]/edit.vue b/app/pages/(features)/human-src/employee/[id]/edit.vue
new file mode 100644
index 00000000..00d68602
--- /dev/null
+++ b/app/pages/(features)/human-src/employee/[id]/edit.vue
@@ -0,0 +1,3 @@
+<template>
+
+</template>
diff --git a/app/pages/(features)/human-src/employee/[id]/index.vue b/app/pages/(features)/human-src/employee/[id]/index.vue
new file mode 100644
index 00000000..00d68602
--- /dev/null
+++ b/app/pages/(features)/human-src/employee/[id]/index.vue
@@ -0,0 +1,3 @@
+<template>
+
+</template>
diff --git a/app/pages/(features)/human-src/specialist-intern/add.vue b/app/pages/(features)/human-src/intern/add.vue
similarity index 100%
rename from app/pages/(features)/human-src/specialist-intern/add.vue
rename to app/pages/(features)/human-src/intern/add.vue
diff --git a/app/pages/(features)/human-src/specialist-intern/index.vue b/app/pages/(features)/human-src/intern/index.vue
similarity index 100%
rename from app/pages/(features)/human-src/specialist-intern/index.vue
rename to app/pages/(features)/human-src/intern/index.vue
diff --git a/app/pages/(features)/service-src/bed/index.vue b/app/pages/(features)/infra-src/bed/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/bed/index.vue
rename to app/pages/(features)/infra-src/bed/index.vue
diff --git a/app/pages/(features)/service-src/building/index.vue b/app/pages/(features)/infra-src/building/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/building/index.vue
rename to app/pages/(features)/infra-src/building/index.vue
diff --git a/app/pages/(features)/service-src/chamber/index.vue b/app/pages/(features)/infra-src/chamber/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/chamber/index.vue
rename to app/pages/(features)/infra-src/chamber/index.vue
diff --git a/app/pages/(features)/service-src/counter/index.vue b/app/pages/(features)/infra-src/counter/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/counter/index.vue
rename to app/pages/(features)/infra-src/counter/index.vue
diff --git a/app/pages/(features)/service-src/floor/index.vue b/app/pages/(features)/infra-src/floor/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/floor/index.vue
rename to app/pages/(features)/infra-src/floor/index.vue
diff --git a/app/pages/(features)/service-src/public-screen/index.vue b/app/pages/(features)/infra-src/public-screen/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/public-screen/index.vue
rename to app/pages/(features)/infra-src/public-screen/index.vue
diff --git a/app/pages/(features)/service-src/room/index.vue b/app/pages/(features)/infra-src/room/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/room/index.vue
rename to app/pages/(features)/infra-src/room/index.vue
diff --git a/app/pages/(features)/service-src/warehouse/index.vue b/app/pages/(features)/infra-src/warehouse/index.vue
similarity index 100%
rename from app/pages/(features)/service-src/warehouse/index.vue
rename to app/pages/(features)/infra-src/warehouse/index.vue
diff --git a/app/pages/(features)/inpatient/encounter/[id]/detail.vue b/app/pages/(features)/inpatient/encounter/[id]/detail.vue
new file mode 100644
index 00000000..c68961a6
--- /dev/null
+++ b/app/pages/(features)/inpatient/encounter/[id]/detail.vue
@@ -0,0 +1,38 @@
+<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'],
+  title: 'Detail Kunjungan',
+  contentFrame: 'cf-full-width',
+})
+
+useHead({
+  title: () => `${getRouteTitle()}`,
+})
+
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/inpatient/encounter/[id]'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content />
+  </div>
+  <Error v-else :status-code="403" />
+</template>
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
new file mode 100644
index 00000000..4f985765
--- /dev/null
+++ b/app/pages/(features)/inpatient/encounter/[id]/process.vue
@@ -0,0 +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: ['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/[id]/process'] || {}
+const hasAccess = getPageAccess(roleAccess, 'read')
+</script>
+
+<template>
+  <div v-if="hasAccess">
+    <Content class-code="inpatient" />
+  </div>
+  <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 bd827f79..2d75d7d6 100644
--- a/app/pages/(features)/inpatient/encounter/add.vue
+++ b/app/pages/(features)/inpatient/encounter/add.vue
@@ -1,45 +1,42 @@
 <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 { getRouteTitle, getPageAccess } = usePageChecker()
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg'],
   title: 'Tambah 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, 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 = 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">
-    <ContentEncounterEntry
+  <div v-if="hasAccess">
+    <Content
       :id="0"
       class-code="inpatient"
-      sub-class-code="icu"
-      form-type="Tambah"
+      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 7c9d1ac5..189b2611 100644
--- a/app/pages/(features)/inpatient/encounter/index.vue
+++ b/app/pages/(features)/inpatient/encounter/index.vue
@@ -1,42 +1,49 @@
 <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'
+// 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: ['system', 'doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: ['emp|reg', 'emp|nur', 'emp|doc', 'emp|miw', 'emp|thr', 'emp|nut', 'emp|pha', 'emp|lab'],
   title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${getRouteTitle()}`,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/inpatient/encounter']
+// Define common things
+const route = useRoute()
 
-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)
+// 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">
-      <ContentEncounterList
+    <div v-if="hasAccess">
+      <Content
         class-code="inpatient"
         sub-class-code="vk"
-        type="encounter"
+        :can-create="canCreate"
+        :can-delete="canRemove"
       />
     </div>
     <Error
diff --git a/app/pages/(features)/integration/bpjs/control-letter/index.vue b/app/pages/(features)/integration/bpjs-vclaim/control-letter/index.vue
similarity index 100%
rename from app/pages/(features)/integration/bpjs/control-letter/index.vue
rename to app/pages/(features)/integration/bpjs-vclaim/control-letter/index.vue
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
new file mode 100644
index 00000000..0adf6527
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs-vclaim/sep/add.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: 'Tambah 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="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
new file mode 100644
index 00000000..d5faaa8a
--- /dev/null
+++ b/app/pages/(features)/integration/bpjs-vclaim/sep/index.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import Error from '~/components/pub/my-ui/error/error.vue'
+import Content from '~/components/content/sep/list.vue'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Daftar SEP',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const canRead = true
+</script>
+
+<template>
+  <div>
+    <div v-if="canRead">
+      <Content />
+    </div>
+    <Error v-else :status-code="403" />
+  </div>
+</template>
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)/outpatient/encounter/[id]/index.vue b/app/pages/(features)/integration/bpjs/prb/[prb_id]/index.vue
similarity index 85%
rename from app/pages/(features)/outpatient/encounter/[id]/index.vue
rename to app/pages/(features)/integration/bpjs/prb/[prb_id]/index.vue
index 1864cf2c..1d66b563 100644
--- a/app/pages/(features)/outpatient/encounter/[id]/index.vue
+++ b/app/pages/(features)/integration/bpjs/prb/[prb_id]/index.vue
@@ -6,8 +6,8 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Detail Surat Kontrol',
-  contentFrame: 'cf-container-md',
+  title: 'Detail PRB',
+  contentFrame: 'cf-full-width',
 })
 
 const route = useRoute()
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <ContentOutpatientEncounterDetail :patient-id="Number(route.params.id)" />
+      <ContentPrbDetail :patient-id="Number(route.params.id)" />
     </div>
     <Error v-else :status-code="403" />
   </div>
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)/outpatient/encounter/[id]/edit.vue b/app/pages/(features)/outpatient/encounter/[id]/edit.vue
deleted file mode 100644
index 9713675f..00000000
--- a/app/pages/(features)/outpatient/encounter/[id]/edit.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<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: 'Edit Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/outpatient/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
-})
-</script>
-
-<template>
-  <div v-if="canUpdate">
-    <ContentEncounterEntry
-      :id="encounterId"
-      class-code="ambulatory"
-      sub-class-code="reg"
-      form-type="Edit"
-    />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>
-
diff --git a/app/pages/(features)/patient/[id]/detail.vue b/app/pages/(features)/patient/[id]/detail.vue
deleted file mode 100644
index 33a36f0f..00000000
--- a/app/pages/(features)/patient/[id]/detail.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<script setup lang="ts">
-definePageMeta({
-  roles: ['sys', 'doc'],
-})
-</script>
-
-<template>
-  <div>detail pasien</div>
-</template>
diff --git a/app/pages/(features)/patient/[id]/edit.vue b/app/pages/(features)/patient/[id]/edit.vue
deleted file mode 100644
index 2b7e8a31..00000000
--- a/app/pages/(features)/patient/[id]/edit.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<script setup lang="ts">
-definePageMeta({
-  roles: ['sys', 'doc'],
-})
-</script>
-
-<template>
-  <div>edit pasien</div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter-queue/index.vue b/app/pages/(features)/rehab/encounter-queue/index.vue
deleted file mode 100644
index 8616dd19..00000000
--- a/app/pages/(features)/rehab/encounter-queue/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div>Examination Queue</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
index 1cf5cc7c..e06920ba 100644
--- 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
@@ -4,19 +4,19 @@ 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',
+    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,
+    title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/encounter`]
 
 const { checkRole, hasReadAccess } = useRBAC()
 
@@ -32,10 +32,10 @@ const canRead = true
 </script>
 
 <template>
-  <div>
-    <div v-if="canRead">
-      <ContentDocumentUploadEdit/>
+    <div>
+        <div v-if="canRead">
+            <ContentDocumentUploadEdit />
+        </div>
+        <Error v-else :status-code="403" />
     </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
+</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
index e04220f3..fcc7432e 100644
--- a/app/pages/(features)/rehab/encounter/[id]/document-upload/add.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/document-upload/add.vue
@@ -4,19 +4,19 @@ 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',
+    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,
+    title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/encounter`]
 
 const { checkRole, hasReadAccess } = useRBAC()
 
@@ -33,10 +33,10 @@ const callbackUrl = route.query['return-path'] as string | undefined
 </script>
 
 <template>
-  <div>
-    <div v-if="canRead">
-      <ContentDocumentUploadAdd :callback-url="callbackUrl" />
+    <div>
+        <div v-if="canRead">
+            <ContentDocumentUploadAdd :callback-url="callbackUrl" />
+        </div>
+        <Error v-else :status-code="403" />
     </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
+</template>
\ No newline at end of file
diff --git a/app/pages/(features)/rehab/encounter/[id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/edit.vue
deleted file mode 100644
index 02dc5428..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/edit.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<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: 'Edit Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/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
-})
-</script>
-
-<template>
-  <div v-if="canUpdate">
-    <ContentEncounterEntry
-      :id="encounterId"
-      class-code="ambulatory"
-      sub-class-code="rehab"
-      form-type="Edit"
-    />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
new file mode 100644
index 00000000..91076c03
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
@@ -0,0 +1,44 @@
+<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: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+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)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <ContentKfrEntry mode="edit" />
+  </div>
+  <Error
+    v-else
+    :status-code="403"
+  />
+</template>
diff --git a/app/pages/(features)/rehab/encounter/add.vue b/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
similarity index 73%
rename from app/pages/(features)/rehab/encounter/add.vue
rename to app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
index fe7dd98c..e8d1c895 100644
--- a/app/pages/(features)/rehab/encounter/add.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
+  title: 'Protokol Terapi',
   contentFrame: 'cf-full-width',
 })
 
@@ -22,25 +22,20 @@ 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',
-  })
-}
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canCreate = true // hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry
-      :id="0"
-      class-code="ambulatory"
-      sub-class-code="rehab"
-      form-type="Tambah"
-    />
+    <ContentKfrEntry />
   </div>
   <Error
     v-else
diff --git a/app/pages/(features)/patient/index.vue b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
similarity index 82%
rename from app/pages/(features)/patient/index.vue
rename to app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
index 1877289e..e1059769 100644
--- a/app/pages/(features)/patient/index.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar Pasien',
+  title: 'Update PRB',
   contentFrame: 'cf-full-width',
 })
 
@@ -22,18 +22,19 @@ const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
 const hasAccess = checkRole(roleAccess)
-if (!hasAccess) {
-  navigateTo('/403')
-}
+// if (!hasAccess) {
+//   navigateTo('/403')
+// }
 
 // Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
+// const canRead = hasReadAccess(roleAccess)
+const canRead = true
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentPatientList />
+      <ContentPrbEntry />
     </div>
     <Error v-else :status-code="403" />
   </div>
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 e25b0e77..49a5dd6d 100644
--- a/app/pages/(features)/rehab/encounter/[id]/process.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/process.vue
@@ -2,6 +2,7 @@
 import type { PagePermission } from '~/models/role'
 import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import EncounterProcess from '~/components/content/encounter/process.vue'
 
 definePageMeta({
   middleware: ['rbac'],
@@ -34,8 +35,8 @@ const pagePermission = getPagePermissions(roleAccess)
 </script>
 
 <template>
-    <div v-if="pagePermission.canRead">
-    <ContentEncounterProcess />
+  <div v-if="pagePermission.canRead">
+    <EncounterProcess class-code="ambulatory" sub-class-code="rehab" />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
similarity index 96%
rename from app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue
rename to app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
index cc5d182f..a90f1d10 100644
--- a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <ContentControlLetterEdit />
+      <ContentSurgeryReportEntry />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
similarity index 90%
rename from app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue
rename to app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
index 612315ad..df4cfdef 100644
--- a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
@@ -7,7 +7,7 @@ definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
   title: 'Detail Surat Kontrol',
-  contentFrame: 'cf-container-md',
+  contentFrame: 'cf-full-width',
 })
 
 const route = useRoute()
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <ContentControlLetterDetail :patient-id="Number(route.params.id)" />
+      <ContentSurgeryReportDetail :patient-id="Number(route.params.id)" />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue b/app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
similarity index 94%
rename from app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue
rename to app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
index fa0b386b..58faedef 100644
--- a/app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
@@ -34,7 +34,7 @@ const callbackUrl = route.query['return-path'] as string | undefined
 <template>
   <div>
     <div v-if="pagePermission.canRead">
-      <ContentControlLetterAdd :callback-url="callbackUrl" />
+      <ContentSurgeryReportEntry :callback-url="callbackUrl" />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/rehab/registration/[id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
similarity index 66%
rename from app/pages/(features)/rehab/registration/[id]/edit.vue
rename to app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
index c6af01a9..9593e171 100644
--- a/app/pages/(features)/rehab/registration/[id]/edit.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
+  title: 'Protokol Terapi',
   contentFrame: 'cf-full-width',
 })
 
@@ -16,26 +16,29 @@ useHead({
   title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
 
 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',
-  })
-}
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canCreate = true // hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry :id="1" form-type="Edit" />
+    <ContentTherapyProtocolEdit />
   </div>
-  <Error v-else :status-code="403" />
+  <Error
+    v-else
+    :status-code="403"
+  />
 </template>
diff --git a/app/pages/(features)/patient/add.vue b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
similarity index 66%
rename from app/pages/(features)/patient/add.vue
rename to app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
index 412c2b3e..cf35e5ec 100644
--- a/app/pages/(features)/patient/add.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Pasien',
+  title: 'Protokol Terapi',
   contentFrame: 'cf-full-width',
 })
 
@@ -16,26 +16,29 @@ useHead({
   title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
 
 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',
-  })
-}
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canCreate = true // hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentPatientAdd />
+    <ContentTherapyProtocolAdd />
   </div>
-  <Error v-else :status-code="403" />
+  <Error
+    v-else
+    :status-code="403"
+  />
 </template>
diff --git a/app/pages/(features)/integration/bpjs/sep/index.vue b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
similarity index 76%
rename from app/pages/(features)/integration/bpjs/sep/index.vue
rename to app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
index d99dbb5d..a2f68104 100644
--- a/app/pages/(features)/integration/bpjs/sep/index.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar User',
+  title: 'Detail Data Vaksin',
   contentFrame: 'cf-full-width',
 })
 
@@ -16,7 +16,7 @@ useHead({
   title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
+const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/encounter`]
 
 const { checkRole, hasReadAccess } = useRBAC()
 
@@ -27,13 +27,14 @@ const hasAccess = checkRole(roleAccess)
 // }
 
 // Define permission-based computed properties
-const canRead = true // hasReadAccess(roleAccess)
+// const canRead = hasReadAccess(roleAccess)
+const canRead = true
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentSepList />
+      <ContentVaccineDataDetail :patient-id="Number(route.params.id)" />
     </div>
     <Error v-else :status-code="403" />
   </div>
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/pages/(features)/rehab/encounter/index.vue b/app/pages/(features)/rehab/encounter/index.vue
deleted file mode 100644
index 1dd93aa0..00000000
--- a/app/pages/(features)/rehab/encounter/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<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: ['system', 'emp-doc', 'emp-nur', 'emp-reg', 'emp-pha', 'emp-pay', 'emp-mng'],
-  title: 'Daftar Kunjungan',
-  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 = true // hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentEncounterList
-        class-code="ambulatory"
-        sub-class-code="rehab"
-        type="encounter"
-      />
-    </div>
-    <Error
-      v-else
-      :status-code="403"
-    />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/registration-queue/index.vue b/app/pages/(features)/rehab/registration-queue/index.vue
deleted file mode 100644
index d06e73ad..00000000
--- a/app/pages/(features)/rehab/registration-queue/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-  <FlowRehabRegistrationHome />
-</template>
diff --git a/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue b/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue
deleted file mode 100644
index 6a45818c..00000000
--- a/app/pages/(features)/rehab/registration-queue/sep-prosedur/add.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah SEP Prosedur',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-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 = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentDoctorAdd />
-  </div>
-  <PubMyUiError v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/rehab/registration/add.vue b/app/pages/(features)/rehab/registration/add.vue
deleted file mode 100644
index 87053270..00000000
--- a/app/pages/(features)/rehab/registration/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<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 Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
-
-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 = hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <template v-if="canCreate">
-    <ContentEncounterEntry form-type="Tambah" />
-  </template>
-  <Error v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/rehab/registration/index.vue b/app/pages/(features)/rehab/registration/index.vue
deleted file mode 100644
index 5b4fbfb8..00000000
--- a/app/pages/(features)/rehab/registration/index.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<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: 'Pendaftaran',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
-
-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)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentEncounterList type="registration" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/outpatient/registration-queue/index.vue b/app/pages/(features)/spirometry/index.vue
similarity index 100%
rename from app/pages/(features)/outpatient/registration-queue/index.vue
rename to app/pages/(features)/spirometry/index.vue
diff --git a/app/pages/(features)/outpation-action/hemophilia/index.vue b/app/pages/(features)/thalasemia/index.vue
similarity index 100%
rename from app/pages/(features)/outpation-action/hemophilia/index.vue
rename to app/pages/(features)/thalasemia/index.vue
diff --git a/app/pages/(features)/rehab/registration/[id]/detail.vue b/app/pages/(features)/therapy-protocol/[id]/detail.vue
similarity index 70%
rename from app/pages/(features)/rehab/registration/[id]/detail.vue
rename to app/pages/(features)/therapy-protocol/[id]/detail.vue
index 77c30c00..5fc1b9a6 100644
--- a/app/pages/(features)/rehab/registration/[id]/detail.vue
+++ b/app/pages/(features)/therapy-protocol/[id]/detail.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
+  title: 'Detail Protokol Terapi',
   contentFrame: 'cf-full-width',
 })
 
@@ -16,26 +16,26 @@ useHead({
   title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/registration']
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
 
 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',
-  })
-}
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canCreate = true // hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry :id="1" form-type="Detail" />
+    <ContentTherapyProtocolDetail/>
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/detail.vue b/app/pages/(features)/therapy-protocol/[id]/edit.vue
similarity index 77%
rename from app/pages/(features)/rehab/encounter/[id]/detail.vue
rename to app/pages/(features)/therapy-protocol/[id]/edit.vue
index e3d45895..c0629508 100644
--- a/app/pages/(features)/rehab/encounter/[id]/detail.vue
+++ b/app/pages/(features)/therapy-protocol/[id]/edit.vue
@@ -6,7 +6,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
+  title: 'Edit Protokol Terapi',
   contentFrame: 'cf-full-width',
 })
 
@@ -22,20 +22,20 @@ 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',
-  })
-}
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
 
 // Define permission-based computed properties
-const canCreate = hasCreateAccess(roleAccess)
+const canCreate = true // hasCreateAccess(roleAccess)
 </script>
 
 <template>
   <div v-if="canCreate">
-    <ContentEncounterEntry :id="1" form-type="Detail" />
+    <ContentTherapyProtocolEdit />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/integration/bpjs/sep/add.vue b/app/pages/(features)/therapy-protocol/add.vue
similarity index 76%
rename from app/pages/(features)/integration/bpjs/sep/add.vue
rename to app/pages/(features)/therapy-protocol/add.vue
index 0658780b..a489abc5 100644
--- a/app/pages/(features)/integration/bpjs/sep/add.vue
+++ b/app/pages/(features)/therapy-protocol/add.vue
@@ -4,19 +4,19 @@ import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
-  middleware: [],
+  middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah SEP',
+  title: 'Tambah Protokol Terapi',
   contentFrame: 'cf-full-width',
 })
 
 const route = useRoute()
 
 useHead({
-  title: () => route.meta.title as string,
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
 
 const { checkRole, hasCreateAccess } = useRBAC()
 
@@ -35,7 +35,7 @@ const canCreate = true // hasCreateAccess(roleAccess)
 
 <template>
   <div v-if="canCreate">
-    <ContentSepEntry />
+    <ContentTherapyProtocolAdd />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/tools-equipment-src/medicine/index.vue b/app/pages/(features)/tools-equipment-src/medicine/index.vue
index 33f16618..25e5105e 100644
--- a/app/pages/(features)/tools-equipment-src/medicine/index.vue
+++ b/app/pages/(features)/tools-equipment-src/medicine/index.vue
@@ -5,7 +5,7 @@ import { PAGE_PERMISSIONS } from '~/lib/page-permission'
 
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  roles: [],
   title: 'Daftar Dokter',
   contentFrame: 'cf-full-width',
 })
@@ -16,7 +16,7 @@ useHead({
   title: () => route.meta.title as string,
 })
 
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/tools-equipment-src/medicine']!
 
 const { checkRole, hasReadAccess } = useRBAC()
 
diff --git a/app/schemas/consultation.schema.ts b/app/schemas/consultation.schema.ts
index b1d306f5..56ac8837 100644
--- a/app/schemas/consultation.schema.ts
+++ b/app/schemas/consultation.schema.ts
@@ -3,7 +3,7 @@ import type { CreateDto } from '~/models/consultation'
 
 const ConsultationSchema = z.object({
   date: z.string({ required_error: 'Tanggal harus diisi' }),
-  dstUnit_id: z.number({ required_error: 'Unit harus diisi' }),
+  dstUnit_code: z.string({ required_error: 'Unit harus diisi' }),
   problem: z.string({ required_error: 'Uraian harus diisi' }).min(20, 'Uraian minimum 20 karakter'),
 })
 
diff --git a/app/schemas/encounter.schema.ts b/app/schemas/encounter.schema.ts
index e3c9affc..872c1e97 100644
--- a/app/schemas/encounter.schema.ts
+++ b/app/schemas/encounter.schema.ts
@@ -4,8 +4,9 @@ import { InternalReferenceSchema } from './internal-reference.schema'
 // Check In
 const CheckInSchema = z.object({
   // registeredAt: z.string({ required_error: 'Tanggal masuk harus diisi' }),
-  responsible_doctor_id: z.number({ required_error: 'Dokter harus diisi' }).gt(0, 'Dokter harus diisi'),
-  adm_employee_id: z.number({ required_error: 'PJA harus diisi' }).gt(0, 'PJA harus diisi'),
+  responsible_doctor_code: z.string({ required_error: 'Dokter harus diisi' }),
+  // adm_employee_id: z.number({ required_error: 'PJA harus diisi' }).gt(0, 'PJA harus diisi'),
+  registeredAt: z.string({ required_error: 'waktu harus diisi' }),
 })
 type CheckInFormData = z.infer<typeof CheckInSchema>
 
diff --git a/app/schemas/integration-bpjs.schema.ts b/app/schemas/integration-bpjs.schema.ts
index 47206edf..452735f7 100644
--- a/app/schemas/integration-bpjs.schema.ts
+++ b/app/schemas/integration-bpjs.schema.ts
@@ -78,7 +78,7 @@ const IntegrationBpjsSchema = z
       .optional(),
     destinationClinic: z
       .string({ required_error: ERROR_MESSAGES.required.destinationClinic })
-      .min(1, ERROR_MESSAGES.required.destinationClinic),
+      .min(1, ERROR_MESSAGES.required.destinationClinic).optional(),
     attendingDoctor: z
       .string({ required_error: ERROR_MESSAGES.required.attendingDoctor })
       .min(1, ERROR_MESSAGES.required.attendingDoctor),
@@ -89,7 +89,7 @@ const IntegrationBpjsSchema = z
     cataract: z.string({ required_error: ERROR_MESSAGES.required.cataract }).min(1, ERROR_MESSAGES.required.cataract),
     clinicExcecutive: z
       .string({ required_error: ERROR_MESSAGES.required.clinicExcecutive })
-      .min(1, ERROR_MESSAGES.required.clinicExcecutive),
+      .min(1, ERROR_MESSAGES.required.clinicExcecutive).optional(),
     subSpecialistId: z
       .string({ required_error: ERROR_MESSAGES.required.subSpecialistId })
       .min(1, ERROR_MESSAGES.required.subSpecialistId)
diff --git a/app/schemas/integration-encounter.schema.ts b/app/schemas/integration-encounter.schema.ts
index 32327328..f2c8dfce 100644
--- a/app/schemas/integration-encounter.schema.ts
+++ b/app/schemas/integration-encounter.schema.ts
@@ -2,10 +2,12 @@ import { z } from 'zod'
 
 const ERROR_MESSAGES = {
   required: {
-    doctorId: 'Dokter wajib diisi',
+    doctor_code: 'Dokter wajib diisi',
     registerDate: 'Tanggal Daftar wajib diisi',
-    paymentType: 'Jenis Pembayaran wajib diisi',
-    subSpecialistId: 'Subspesialis wajib diisi',
+    paymentMethod_code: 'Jenis Pembayaran wajib diisi',
+    unit_code: 'Spesialis wajib diisi',
+    // specialist_code: 'Spesialis wajib diisi',
+    // subSpecialist_code: 'Subspesialis wajib diisi',
     patientCategory: 'Kelompok Peserta wajib diisi',
     cardNumber: 'No. Kartu BPJS wajib diisi',
     sepType: 'Jenis SEP wajib diisi',
@@ -21,22 +23,22 @@ const IntegrationEncounterSchema = z
     patientName: z.string().optional(),
     nationalIdentity: z.string().optional(),
     medicalRecordNumber: z.string().optional(),
-    
+
     // Visit data
-    doctorId: z
-      .string({ required_error: ERROR_MESSAGES.required.doctorId })
-      .min(1, ERROR_MESSAGES.required.doctorId),
-    subSpecialistId: z
-      .string({ required_error: ERROR_MESSAGES.required.subSpecialistId })
-      .min(1, ERROR_MESSAGES.required.subSpecialistId)
+    doctor_code: z
+      .string({ required_error: ERROR_MESSAGES.required.doctor_code })
+      .min(1, ERROR_MESSAGES.required.doctor_code),
+    unit_code: z
+      .string({ required_error: ERROR_MESSAGES.required.unit_code })
+      .min(1, ERROR_MESSAGES.required.unit_code)
       .optional(),
     registerDate: z
       .string({ required_error: ERROR_MESSAGES.required.registerDate })
       .min(1, ERROR_MESSAGES.required.registerDate),
-    paymentType: z
-      .string({ required_error: ERROR_MESSAGES.required.paymentType })
-      .min(1, ERROR_MESSAGES.required.paymentType),
-    
+    paymentMethod_code: z
+      .string({ required_error: ERROR_MESSAGES.required.paymentMethod_code })
+      .min(1, ERROR_MESSAGES.required.paymentMethod_code),
+
     // BPJS related fields
     patientCategory: z
       .string()
@@ -51,10 +53,9 @@ 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
     sepFile: z
       .any()
@@ -76,7 +77,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn, then patient category is required
-      if (data.paymentType === 'jkn') {
+      if (data.paymentMethod_code === 'jkn') {
         return data.patientCategory && data.patientCategory.trim() !== ''
       }
       return true
@@ -89,7 +90,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn, then card number is required
-      if (data.paymentType === 'jkn') {
+      if (data.paymentMethod_code === 'jkn') {
         return data.cardNumber && data.cardNumber.trim() !== ''
       }
       return true
@@ -102,7 +103,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn, then SEP type is required
-      if (data.paymentType === 'jkn') {
+      if (data.paymentMethod_code === 'jkn') {
         return data.sepType && data.sepType.trim() !== ''
       }
       return true
@@ -115,7 +116,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn and SEP type is selected, then SEP number is required
-      if (data.paymentType === 'jkn' && data.sepType && data.sepType.trim() !== '') {
+      if (data.paymentMethod_code === 'jkn' && data.sepType && data.sepType.trim() !== '') {
         return data.sepNumber && data.sepNumber.trim() !== ''
       }
       return true
diff --git a/app/schemas/kfr.schema.ts b/app/schemas/kfr.schema.ts
new file mode 100644
index 00000000..3bbe43c6
--- /dev/null
+++ b/app/schemas/kfr.schema.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod'
+
+type KfrFormData = z.infer<typeof KfrSchema>
+const KfrSchema = z.object({
+  subjective: z.string({required_error: 'Mohon lengkapi Form',}),
+  objective: z.string({required_error: 'Mohon lengkapi Form',}),
+  assesment: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningGoal: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningAction: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningEducation: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningFrequency: z.number({required_error: 'Mohon lengkapi Form',}),
+  followUpPlan: z.enum(['EVALUASI', 'RUJUK', "SELESAI"], {required_error: 'Mohon lengkapi status pasien', }),
+  followUpPlanDesc: z.string({required_error: 'Mohon lengkapi Form',}),
+})
+
+export { KfrSchema,  }
+export type { KfrFormData,  }
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 50ade93e..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,
@@ -179,6 +205,14 @@ const InstructionSchema = z.object({
   other: z.string().default(''),
 })
 
+export const CprjSoapiSchema = z.object({
+  subjective: z.string().default(''),
+  objective: z.string().default(''),
+  assesment: z.string().default(''),
+  plan: z.string().default(''),
+  review: z.string().default(''),
+})
+
 export const SoapSchema = z.object({
   subject: SubjectSchema,
   object: ObjectSchema,
diff --git a/app/schemas/surgery-report.schema.ts b/app/schemas/surgery-report.schema.ts
new file mode 100644
index 00000000..5c1a024b
--- /dev/null
+++ b/app/schemas/surgery-report.schema.ts
@@ -0,0 +1,47 @@
+import { z } from 'zod'
+
+const SurgeryReportSchema = 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 SurgeryReportFormData = z.infer<typeof SurgeryReportSchema>
+
+export { SurgeryReportSchema }
+export type { SurgeryReportFormData }
diff --git a/app/schemas/therapy-protocol.schema.ts b/app/schemas/therapy-protocol.schema.ts
new file mode 100644
index 00000000..1c4e85a8
--- /dev/null
+++ b/app/schemas/therapy-protocol.schema.ts
@@ -0,0 +1,159 @@
+import { z } from 'zod'
+
+const TherapyProtocolSchema = z.object({
+  examinationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  relationshipToInsured: z.enum(['spouse', 'child'], {
+    required_error: 'Pilih hubungan',
+  }),
+  anamnesis: z.string({
+    required_error: 'Mohon lengkapi catatan anamnesa',
+  }),
+  medicalHistory: z.string({
+    required_error: 'Mohon lengkapi catatan riwayat penyakit',
+  }),
+  medicationHistory: z.string({
+    required_error: 'Mohon lengkapi catatan riwayat obat',
+  }),
+
+  supportDiagnosis: z.array(
+    z.object({
+      diagnosis: z.string({
+        required_error: 'Isi diagnosis',
+      }),
+    }),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  functionalDiagnosis: z.array(
+    z
+      .object({
+        diagnosis: z.string({}),
+      })
+      .optional(),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  treatmentDiagnosis: z.array(
+    z.object({
+      diagnosis: z.string({
+        required_error: 'Isi diagnosis',
+      }),
+    }),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  supportExamination: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan penunjang',
+  }),
+
+  recommendation: z.string({
+    required_error: 'Mohon lengkapi catatan anjuran',
+  }),
+  evaluation: z.string({
+    required_error: 'Mohon lengkapi catatan evaluasi',
+  }),
+  isWorkRelatedDisease: z.string({
+    required_error: 'Pilih apakah penyakit berkaitan dengan pekerjaan',
+  }),
+})
+
+
+
+const PickerItemSchema = z.object({
+  id: z.number().optional(),
+  code: z.string(),
+  name: z.string()
+})
+
+const TherapyProtocolMedicRehabilitationSchema = z.object({
+  form1ExaminationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  form1Diagnose: z.string({
+    required_error: 'Mohon lengkapi catatan diagnosa',
+  }),
+  form1TherapyRequest: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form1TargetPeriod: z.number({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form1TherapyTarget: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+
+  form2RelationshipToInsured: z.enum(['spouse', 'child'], {
+    required_error: 'Pilih hubungan',
+  }),
+  anamnesis: z.string({
+    required_error: 'Mohon lengkapi catatan anamnesa',
+  }),
+  form2PhysicalExamination: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan fisik',
+  }),
+
+  medicalDiagnoses: z.array(PickerItemSchema).default([]),
+  functionDiagnoses: z.array(PickerItemSchema).default([]),
+  procedures: z.array(PickerItemSchema).default([]),
+
+  supportingExams: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan penunjang',
+  }),
+  evaluation: z.string({
+    required_error: 'Mohon lengkapi catatan evaluasi',
+  }),
+  instruction: z.string({
+    required_error: 'Mohon lengkapi catatan anjuran',
+  }),
+  workCauseStatus: z.enum(['YA', 'TIDAK'], {
+    required_error: 'Pilih apakah penyakit berkaitan dengan pekerjaan',
+  }),
+
+  form3ExaminationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  form3Diagnose: z.string({
+    required_error: 'Mohon lengkapi catatan diagnosa',
+  }),
+  form3TherapyRequest: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form3ProgramActivities: z.array(
+    z.string({
+      required_error: 'Mohon lengkapi Program/Kegiatan',
+    }),
+    {
+      required_error: 'Isi Program/Kegiatan',
+    },
+  ).default(['']),
+})
+
+
+// {
+//     "encounter_id": 4,
+//     "doctor_code": "doc-3",
+//     "anamnesis": "",
+//     "medicalDiagnoses": "", //json
+//     "functionDiagnoses": "", //json
+//     "procedures":"", 
+//     "supportingExams":"",
+//     "instruction":"",
+//     "evaluation":"",
+//     "workCauseStatus":"YA",
+//     "frequency":1,
+//     "intervalUnit_code":"day",
+//     "duration":30,
+//     "durationUnit_code":"min"
+// }
+
+
+type TherapyProtocolFormData = z.infer<typeof TherapyProtocolSchema>
+type TherapyProtocolMedicRehabilitationFormData = z.infer<typeof TherapyProtocolMedicRehabilitationSchema>
+
+export { TherapyProtocolSchema, TherapyProtocolMedicRehabilitationSchema }
+export type { TherapyProtocolFormData, TherapyProtocolMedicRehabilitationFormData }
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/schemas/verification.schema.ts b/app/schemas/verification.schema.ts
index db0319cf..22061c10 100644
--- a/app/schemas/verification.schema.ts
+++ b/app/schemas/verification.schema.ts
@@ -16,4 +16,4 @@ const VerificationSchema = z.object({
 type VerificationFormData = z.infer<typeof VerificationSchema>
 
 export { VerificationSchema, }
-export type { VerificationFormData, }
\ No newline at end of file
+export type { VerificationFormData, }
diff --git a/app/services/_crud-base.ts b/app/services/_crud-base.ts
index e3c57689..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,25 @@ 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) {
+    console.error(`Error putting ${name}:`, error)
+    throw new Error(`Failed to put ${name}`)
+  }
+}
+
+export async function updateCustom(path: string, data: any, name: string = 'item') {
+  try {
+    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) {
@@ -79,6 +107,25 @@ 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) {
+    console.error(`Error deleting ${name}:`, error)
+    throw new Error(`Failed to delete ${name}`)
+  }
+}
+
+export async function removeCustom(path: string, data: any, name: string = 'item') {
+  try {
+    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/doctor.service.ts b/app/services/doctor.service.ts
index e6ae0051..5b855715 100644
--- a/app/services/doctor.service.ts
+++ b/app/services/doctor.service.ts
@@ -13,8 +13,8 @@ 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 getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
 }
 
 export function update(id: number | string, data: any) {
@@ -32,7 +32,7 @@ export async function getValueLabelList(params: any = null, useCodeAsValue = fal
     const resultData = result.body?.data || []
     data = resultData.map((item: Doctor) => ({
       value: useCodeAsValue ? item.code
-        : item.id ? Number(item.id) 
+        : item.id ? Number(item.id)
           : item.id,
       label: item.employee?.person?.name || '',
     }))
diff --git a/app/services/encounter.service.ts b/app/services/encounter.service.ts
index 6e42fd41..3643277a 100644
--- a/app/services/encounter.service.ts
+++ b/app/services/encounter.service.ts
@@ -28,6 +28,11 @@ export function remove(id: number | string) {
   return base.remove(path, id, name)
 }
 
+export function cancel(id: number | string) {
+  let url = `${path}/${id}/cancel`
+  return base.updateCustom(url, null, name)
+}
+
 export async function getValueLabelList(params: any = null): Promise<{ value: string; label: string }[]> {
   let data: { value: string; label: string }[] = []
   const result = await getList(params)
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/kfr.service.ts b/app/services/kfr.service.ts
new file mode 100644
index 00000000..7259aaa3
--- /dev/null
+++ b/app/services/kfr.service.ts
@@ -0,0 +1,27 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+
+const path = '/api/v1/kfr'
+const name = 'kfr'
+
+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/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/surgery-report.service.ts b/app/services/surgery-report.service.ts
new file mode 100644
index 00000000..e53874de
--- /dev/null
+++ b/app/services/surgery-report.service.ts
@@ -0,0 +1,28 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+import { encounterClassCodes } from '~/lib/constants'
+
+const path = '/api/v1/surgery-report'
+const name = 'surgery-report'
+
+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/therapy-protocol.service.ts b/app/services/therapy-protocol.service.ts
new file mode 100644
index 00000000..329115f6
--- /dev/null
+++ b/app/services/therapy-protocol.service.ts
@@ -0,0 +1,27 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+
+const path = '/api/v1/therapy-protocol'
+const name = 'therapy-protocol'
+
+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/unit.service.ts b/app/services/unit.service.ts
index 948ac6b6..7d041250 100644
--- a/app/services/unit.service.ts
+++ b/app/services/unit.service.ts
@@ -27,17 +27,14 @@ export function remove(id: number | string) {
   return base.remove(path, id, name)
 }
 
-export async function getValueLabelList(params: any = null, useCodeAsValue = false): 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: Unit) => ({
-      value: useCodeAsValue ? item.code
-        : item.id ? Number(item.id) 
-          : item.code,
-      label: item.name,
-    }))
+    data = !useId ?
+      resultData.map((item: Unit) => ({ value: item.code, label: item.name })) :
+      resultData.map((item: Unit) => ({ value: item.id, label: item.name }))
   }
   return data
 }
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 007e91c5..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}`
   }
@@ -15,15 +16,30 @@ export function getList(params: any = null) {
   if (params?.letterNumber && params.mode === 'by-sep') {
     url += `/${params.letterNumber}`
   }
-  if (params?.letterNumber && params.mode === 'by-schedule') {
-    url += `/jadwalDokter?jeniskontrol=${params.controlType}&kodepoli=${params.poliCode}&tanggalkontrol=${params.controlDate}`
+  if (params?.controlDate && params.mode === 'by-schedule') {
+    url += `/jadwalDokter?jeniskontrol=${params.controlType}&kodepoli=${params.polyCode}&tanggalkontrol=${params.controlDate}`
     delete params.controlType
-    delete params.poliCode
     delete params.controlDate
+    delete params.polyCode
   }
   if (params) {
     delete params.letterNumber
     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 0c5da64e..ea1807e2 100644
--- a/app/services/vclaim-monitoring-visit.service.ts
+++ b/app/services/vclaim-monitoring-visit.service.ts
@@ -1,71 +1,19 @@
 // Base
 import * as base from './_crud-base'
 
-const path = '/api/vclaim/v1/monitoring/visit'
+const path = '/api/v1/monitoring/visit'
 const name = 'monitoring-visit'
 
-const dummyResponse = {
-  metaData: {
-    code: '200',
-    message: 'Sukses',
-  },
-  response: {
-    sep: [
-      {
-        diagnosa: 'K65.0',
-        jnsPelayanan: 'R.Inap',
-        kelasRawat: '2',
-        nama: 'HANIF ABDURRAHMAN',
-        noKartu: '0001819122189',
-        noSep: '0301R00110170000004',
-        noRujukan: '0301U01108180200084',
-        poli: null,
-        tglPlgSep: '2017-10-03',
-        tglSep: '2017-10-01',
-      },
-      {
-        diagnosa: 'I50.0',
-        jnsPelayanan: 'R.Inap',
-        kelasRawat: '3',
-        nama: 'ASRIZAL',
-        noKartu: '0002283324674',
-        noSep: '0301R00110170000005',
-        noRujukan: '0301U01108180200184',
-        poli: null,
-        tglPlgSep: '2017-10-10',
-        tglSep: '2017-10-01',
-      },
-    ],
-  },
-}
-
 export async function getList(params: any = null) {
-  try {
-    let url = path
-    if (params?.date && params.serviceType) {
-      url += `/${params.date}/${params.serviceType}`
-    }
-    if (params) {
-      delete params.date
-      delete params.serviceType
-    }
-    const resp = await base.getList(url, params, name)
-    
-    // Jika success false, return dummy response
-    if (!resp.success || !resp.body?.response) {
-      return {
-        success: true,
-        body: dummyResponse,
-      }
-    }
-    
-    return resp
-  } catch (error) {
-    // Jika terjadi error, return dummy response
-    console.error(`Error fetching ${name}s:`, error)
-    return {
-      success: true,
-      body: dummyResponse,
-    }
+  let url = path
+  if (params?.date && params.serviceType) {
+    url += `/${params.date}/${params.serviceType}`
   }
+  if (params) {
+    delete params.date
+    delete params.serviceType
+  }
+  const resp = await base.getList(url, params, name)
+
+  return resp
 }
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 fdccc9c4..d432cdfd 100644
--- a/app/services/vclaim-sep.service.ts
+++ b/app/services/vclaim-sep.service.ts
@@ -4,15 +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
@@ -20,8 +37,25 @@ export function getList(params: any = null) {
   return base.getList(url, params, name)
 }
 
+export function getDetail(id: number | string) {
+  const isNew = true
+  const url = !isNew ? pathOld : path
+  return base.getDetail(url, id, 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(
   data: IntegrationBpjsFormData & {
+    userName: string
+    polyCode?: string
     referralFrom?: string
     referralTo?: string
     referralLetterDate?: string
@@ -31,13 +65,13 @@ export function makeSepData(
   const content = {
     noKartu: data.cardNumber || '',
     tglSep: data.sepDate,
-    ppkPelayanan: data.fromClinic || '',
-    jnsPelayanan: data.admissionType ? String(data.admissionType) : '1',
+    ppkPelayanan: destinationClinic || data.fromClinic || '',
+    jnsPelayanan: data.serviceType ? String(data.serviceType) : '2',
     noMR: data.medicalRecordNumber || '',
     catatan: data.note || '',
     diagAwal: data.initialDiagnosis || '',
     poli: {
-      tujuan: data.destinationClinic || '',
+      tujuan: data.polyCode || '',
       eksekutif: data.clinicExcecutive === 'yes' ? '1' : '0',
     },
     cob: {
@@ -46,19 +80,21 @@ export function makeSepData(
     katarak: {
       katarak: data.cataract === 'yes' ? '1' : '0',
     },
-    tujuanKunj: data.purposeOfVisit || '',
+    tujuanKunj: data.purposeOfVisit || '0',
     flagProcedure: data.procedureType || '',
     kdPenunjang: data.supportCode || '',
     assesmentPel: data.serviceAssessment || '',
     skdp: {
       noSurat: ['3'].includes(data.admissionType) ? data.referralLetterNumber : '',
-      kodeDPJP: ['3'].includes(data.admissionType)? data.attendingDoctor : '',
+      kodeDPJP: ['3'].includes(data.admissionType) ? data.attendingDoctor : '',
     },
     rujukan: {
-      asalRujukan: ['2'].includes(data.admissionType) ? data?.referralFrom || '' : '',
-      tglRujukan: ['2'].includes(data.admissionType) ? data?.referralLetterDate || '' : '',
-      noRujukan: ['2'].includes(data.admissionType) ? data?.referralLetterNumber || '' : '',
-      ppkRujukan: ['2'].includes(data.admissionType) ? data?.referralTo || '' : '',
+      // Handle referral data for admissionType !== '3'
+      // asalRujukan: 1 = Faskes 1, 2 = Faskes RS
+      asalRujukan: !['3'].includes(data.admissionType) ? data?.referralFrom || '' : '',
+      tglRujukan: !['3'].includes(data.admissionType) ? data?.referralLetterDate || '' : '',
+      noRujukan: !['3'].includes(data.admissionType) ? data?.referralLetterNumber || '' : '',
+      ppkRujukan: !['3'].includes(data.admissionType) ? data?.referralTo || '' : '',
     },
     klsRawat: {
       klsRawatHak: data.classLevel || '',
@@ -68,7 +104,7 @@ export function makeSepData(
     },
     dpjpLayan: data.attendingDoctor || '',
     noTelp: data.phoneNumber || '',
-    user: data.patientName || '',
+    user: data.userName || '',
     jaminan: {
       lakaLantas: data.trafficAccident || '0',
       noLP: data.lpNumber || '',
@@ -93,3 +129,14 @@ export function makeSepData(
     },
   }
 }
+
+export function makeSepDataForRemove(data: any) {
+  return {
+    request: {
+      t_sep: {
+        noSep: data.sepNumber,
+        user: data.userName,
+      },
+    },
+  }
+}
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/app/stores/user.ts b/app/stores/user.ts
index 97bd4665..f7fe9fb5 100644
--- a/app/stores/user.ts
+++ b/app/stores/user.ts
@@ -1,19 +1,21 @@
 export const useUserStore = defineStore(
   'user',
   () => {
+    // should be auth type
     const user = ref<any | null>(null)
     // const token = useCookie('authentication')
 
     const isAuthenticated = computed(() => !!user.value)
 
-    const userRole = computed(() => {
+    const userRoles = computed(() => {
       return user.value?.roles || []
-      // return roles.map((input: string) => {
-      //   const parts = input.split('|')
-      //   return parts.length > 1 ? parts[1]: parts[0]
-      // })
     })
 
+    const userActiveRole = ref('') // watched user failed, so create a ref here
+    // computed(() => {
+    //   // return user.value?.activeRole || ''
+    // })
+
     const login = async (userData: any) => {
       user.value = userData
     }
@@ -25,10 +27,11 @@ export const useUserStore = defineStore(
     const setActiveRole = (role: string) => {
       if (user.value && user.value.roles.includes(role)) {
         user.value.activeRole = role
+        userActiveRole.value = role
       }
     }
 
-    const getActiveRole = () => {
+    const getActiveRole = (): string | undefined => {
       if (user.value?.activeRole) {
         return user.value.activeRole
       }
@@ -36,12 +39,14 @@ export const useUserStore = defineStore(
         user.value.activeRole = user.value.roles[0]
         return user.value.activeRole
       }
+      return undefined
     }
 
     return {
       user,
       isAuthenticated,
-      userRole,
+      userRoles,
+      userActiveRole,
       login,
       logout,
       setActiveRole,
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/package.json b/package.json
index d415abde..08b0d87c 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,12 @@
     "date-fns": "^4.1.0",
     "embla-carousel": "^8.5.2",
     "embla-carousel-vue": "^8.5.2",
+    "file-saver": "^2.0.5",
     "h3": "^1.15.4",
     "pinia": "^3.0.3",
     "pinia-plugin-persistedstate": "^4.4.1",
-    "tailwindcss-animate": "^1.0.7"
+    "tailwindcss-animate": "^1.0.7",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.10.1",
@@ -36,6 +38,7 @@
     "@nuxtjs/color-mode": "^3.5.2",
     "@nuxtjs/tailwindcss": "6.14.0",
     "@pinia/nuxt": "^0.11.2",
+    "@types/file-saver": "^2.0.7",
     "@unocss/eslint-plugin": "^66.0.0",
     "@unocss/nuxt": "^66.0.0",
     "@vee-validate/zod": "^4.15.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5ae777c3..565ff313 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -32,6 +32,9 @@ dependencies:
   embla-carousel-vue:
     specifier: ^8.5.2
     version: 8.6.0(vue@3.5.21)
+  file-saver:
+    specifier: ^2.0.5
+    version: 2.0.5
   h3:
     specifier: ^1.15.4
     version: 1.15.4
@@ -44,6 +47,9 @@ dependencies:
   tailwindcss-animate:
     specifier: ^1.0.7
     version: 1.0.7(tailwindcss@3.4.17)
+  xlsx:
+    specifier: ^0.18.5
+    version: 0.18.5
 
 devDependencies:
   '@antfu/eslint-config':
@@ -67,6 +73,9 @@ devDependencies:
   '@pinia/nuxt':
     specifier: ^0.11.2
     version: 0.11.2(pinia@3.0.3)
+  '@types/file-saver':
+    specifier: ^2.0.7
+    version: 2.0.7
   '@unocss/eslint-plugin':
     specifier: ^66.0.0
     version: 66.5.1(eslint@9.36.0)(typescript@5.9.2)
@@ -3182,6 +3191,10 @@ packages:
   /@types/estree@1.0.8:
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
+  /@types/file-saver@2.0.7:
+    resolution: {integrity: sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==}
+    dev: true
+
   /@types/geojson@7946.0.16:
     resolution: {integrity: sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==}
     dev: false
@@ -4588,6 +4601,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  /adler-32@1.3.1:
+    resolution: {integrity: sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==}
+    engines: {node: '>=0.8'}
+    dev: false
+
   /agent-base@7.1.4:
     resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
@@ -4796,12 +4814,12 @@ packages:
     dev: true
     optional: true
 
-  /my-ui64-js@1.5.1:
+  /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: true
 
-  /my-uiline-browser-mapping@2.8.6:
-    resolution: {integrity: sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==}
+  /baseline-browser-mapping@2.8.29:
+    resolution: {integrity: sha512-sXdt2elaVnhpDNRDz+1BDx1JQoJRuNk7oVlAlbGiFkLikHCAQiccexF/9e91zVi6RCgqspl04aP+6Cnl9zRLrA==}
     hasBin: true
     dev: true
 
@@ -4845,7 +4863,7 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      baseline-browser-mapping: 2.8.6
+      baseline-browser-mapping: 2.8.29
       caniuse-lite: 1.0.30001743
       electron-to-chromium: 1.5.222
       node-releases: 2.0.21
@@ -4966,6 +4984,14 @@ packages:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
     dev: true
 
+  /cfb@1.2.2:
+    resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==}
+    engines: {node: '>=0.8'}
+    dependencies:
+      adler-32: 1.3.1
+      crc-32: 1.2.2
+    dev: false
+
   /chai@5.3.3:
     resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
     engines: {node: '>=18'}
@@ -5084,6 +5110,11 @@ packages:
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     dev: true
 
+  /codepage@1.15.0:
+    resolution: {integrity: sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==}
+    engines: {node: '>=0.8'}
+    dev: false
+
   /color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
@@ -5244,7 +5275,6 @@ packages:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
     engines: {node: '>=0.8'}
     hasBin: true
-    dev: true
 
   /crc32-stream@6.0.0:
     resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==}
@@ -6754,6 +6784,10 @@ packages:
       flat-cache: 4.0.1
     dev: true
 
+  /file-saver@2.0.5:
+    resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
+    dev: false
+
   /file-uri-to-path@1.0.0:
     resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
     dev: true
@@ -6814,6 +6848,11 @@ packages:
     engines: {node: '>=0.4.x'}
     dev: true
 
+  /frac@1.1.2:
+    resolution: {integrity: sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==}
+    engines: {node: '>=0.8'}
+    dev: false
+
   /fraction.js@4.3.7:
     resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
     dev: true
@@ -10219,6 +10258,13 @@ packages:
     resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==}
     engines: {node: '>=0.10.0'}
 
+  /ssf@0.11.2:
+    resolution: {integrity: sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==}
+    engines: {node: '>=0.8'}
+    dependencies:
+      frac: 1.1.2
+    dev: false
+
   /stable-hash-x@0.2.0:
     resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==}
     engines: {node: '>=12.0.0'}
@@ -11603,11 +11649,21 @@ packages:
       stackback: 0.0.2
     dev: true
 
+  /wmf@1.0.2:
+    resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
+    engines: {node: '>=0.8'}
+    dev: false
+
   /word-wrap@1.2.5:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /word@0.3.0:
+    resolution: {integrity: sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==}
+    engines: {node: '>=0.8'}
+    dev: false
+
   /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -11648,6 +11704,20 @@ packages:
       is-wsl: 3.1.0
     dev: true
 
+  /xlsx@0.18.5:
+    resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==}
+    engines: {node: '>=0.8'}
+    hasBin: true
+    dependencies:
+      adler-32: 1.3.1
+      cfb: 1.2.2
+      codepage: 1.15.0
+      crc-32: 1.2.2
+      ssf: 0.11.2
+      wmf: 1.0.2
+      word: 0.3.0
+    dev: false
+
   /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
diff --git a/public/bpjs.png b/public/bpjs.png
new file mode 100644
index 00000000..781e19b0
Binary files /dev/null and b/public/bpjs.png differ
diff --git a/public/side-menu-items/emp-doc.json b/public/side-menu-items/emp-doc.json
index b7ecb430..292d8c5d 100644
--- a/public/side-menu-items/emp-doc.json
+++ b/public/side-menu-items/emp-doc.json
@@ -12,14 +12,14 @@
         "icon": "i-lucide-stethoscope",
         "children": [
           {
-            "title": "Triase",
+            "title": "Kunjungan",
             "icon": "i-lucide-stethoscope",
-            "link": "/outpatient/encounter"
+            "link": "/ambulatory/encounter"
           },
           {
             "title": "Konsultasi",
             "icon": "i-lucide-building-2",
-            "link": "/outpatient/consultation"
+            "link": "/ambulatory/consultation"
           }
         ]
       },
@@ -44,22 +44,6 @@
           }
         ]
       },
-      {
-        "title": "Rehabilitasi Medik",
-        "icon": "i-lucide-bike",
-        "children": [
-          {
-            "title": "Kunjungan",
-            "icon": "i-lucide-building-2",
-            "link": "/rehab/encounter"
-          },
-          {
-            "title": "Konsultasi",
-            "icon": "i-lucide-building-2",
-            "link": "/rehab/consultation"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",
diff --git a/public/side-menu-items/emp-mid.json b/public/side-menu-items/emp-mid.json
index 80eeee7c..1c6e5aef 100644
--- a/public/side-menu-items/emp-mid.json
+++ b/public/side-menu-items/emp-mid.json
@@ -10,7 +10,7 @@
       {
         "title": "Rawat Jalan",
         "icon": "i-lucide-stethoscope",
-        "link": "/outpatient/encounter"
+        "link": "/ambulatory/encounter"
       },
       {
         "title": "IGD",
diff --git a/public/side-menu-items/emp-nur.json b/public/side-menu-items/emp-nur.json
index 1c993144..f940219e 100644
--- a/public/side-menu-items/emp-nur.json
+++ b/public/side-menu-items/emp-nur.json
@@ -13,11 +13,11 @@
         "children": [
           {
             "title": "Antrian Poliklinik",
-            "link": "/outpatient/encounter-queue"
+            "link": "/ambulatory/encounter-queue"
           },
           {
             "title": "Kunjungan",
-            "link": "/outpatient/encounter"
+            "link": "/ambulatory/encounter"
           }
         ]
       },
@@ -35,21 +35,6 @@
           }
         ]
       },
-      {
-        "title": "Rehabilitasi Medik",
-        "icon": "i-lucide-bike",
-        "link": "/rehab",
-        "children": [
-          {
-            "title": "Antrean Poliklinik",
-            "link": "/rehab/encounter-queue"
-          },
-          {
-            "title": "Kunjungan",
-            "link": "/rehab/encounter"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",
@@ -63,12 +48,12 @@
       {
         "title": "Kemoterapi",
         "icon": "i-lucide-droplets",
-        "link": "/outpation-action/chemotherapy"
+        "link": "/chemotherapy"
       },
       {
         "title": "Hemofilia",
         "icon": "i-lucide-droplet-off",
-        "link": "/outpation-action/hemophilia"
+        "link": "/hemophilia"
       }
     ]
   },
@@ -78,17 +63,17 @@
       {
         "title": "Thalasemi",
         "icon": "i-lucide-baby",
-        "link": "/children-action/thalasemia"
+        "link": "/thalasemia"
       },
       {
         "title": "Echocardiography",
         "icon": "i-lucide-baby",
-        "link": "/children-action/echocardiography"
+        "link": "/echocardiography"
       },
       {
         "title": "Spirometri",
         "icon": "i-lucide-baby",
-        "link": "/children-action/spirometry"
+        "link": "/spirometry"
       }
     ]
   }
diff --git a/public/side-menu-items/emp-nut.json b/public/side-menu-items/emp-nut.json
index ef71282a..43f3e503 100644
--- a/public/side-menu-items/emp-nut.json
+++ b/public/side-menu-items/emp-nut.json
@@ -10,7 +10,7 @@
       {
         "title": "Rawat Jalan",
         "icon": "i-lucide-stethoscope",
-        "link": "/outpatient/encounter"
+        "link": "/ambulatory/encounter"
       },
       {
         "title": "IGD",
diff --git a/public/side-menu-items/emp-reg.json b/public/side-menu-items/emp-reg.json
index 86d6d4ed..df874e65 100644
--- a/public/side-menu-items/emp-reg.json
+++ b/public/side-menu-items/emp-reg.json
@@ -13,11 +13,11 @@
         "children": [
           {
             "title": "Antrian Pendaftaran",
-            "link": "/outpatient/registration-queue"
+            "link": "/ambulatory/registration-queue"
           },
           {
             "title": "Kunjungan",
-            "link": "/outpatient/encounter"
+            "link": "/ambulatory/encounter"
           }
         ]
       },
@@ -26,21 +26,6 @@
         "icon": "i-lucide-zap",
         "link": "/emergency/encounter"
       },
-      {
-        "title": "Rehabilitasi Medik",
-        "icon": "i-lucide-bike",
-        "link": "/rehab",
-        "children": [
-          {
-            "title": "Antrean Pendaftaran",
-            "link": "/rehab/registration-queue"
-          },
-          {
-            "title": "Kunjungan",
-            "link": "/rehab/encounter"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",
diff --git a/public/side-menu-items/sys.json b/public/side-menu-items/sys.json
index 039066a4..996c2a6b 100644
--- a/public/side-menu-items/sys.json
+++ b/public/side-menu-items/sys.json
@@ -13,19 +13,19 @@
         "children": [
           {
             "title": "Antrian Pendaftaran",
-            "link": "/outpatient/registration-queue"
+            "link": "/ambulatory/registration-queue"
           },
           {
             "title": "Antrian Poliklinik",
-            "link": "/outpatient/polyclinic-queue"
+            "link": "/ambulatory/encounter-queue"
           },
           {
             "title": "Kunjungan",
-            "link": "/outpatient/encounter"
+            "link": "/ambulatory/encounter"
           },
           {
             "title": "Konsultasi",
-            "link": "/outpatient/consultation"
+            "link": "/ambulatory/consultation"
           }
         ]
       },
@@ -47,28 +47,6 @@
           }
         ]
       },
-      {
-        "title": "Rehab Medik",
-        "icon": "i-lucide-bike",
-        "children": [
-          {
-            "title": "Antrean Pendaftaran",
-            "link": "/rehab/registration-queue"
-          },
-          {
-            "title": "Antrean Poliklinik",
-            "link": "/rehab/polyclinic-queue"
-          },
-          {
-            "title": "Kunjungan",
-            "link": "/rehab/encounter"
-          },
-          {
-            "title": "Konsultasi",
-            "link": "/rehab/consultation"
-          }
-        ]
-      },
       {
         "title": "Rawat Inap",
         "icon": "i-lucide-building-2",
@@ -101,10 +79,15 @@
           }
         ]
       },
+      {
+        "title": "Radiologi - Order",
+        "icon": "i-lucide-radio",
+        "link": "/radiology-order"
+      },
       {
         "title": "Lab - Order",
         "icon": "i-lucide-microscope",
-        "link": "/pc-lab-order"
+        "link": "/cp-lab-order"
       },
       {
         "title": "Lab Mikro - Order",
@@ -114,12 +97,7 @@
       {
         "title": "Lab PA - Order",
         "icon": "i-lucide-microscope",
-        "link": "/pa-lab-order"
-      },
-      {
-        "title": "Radiologi - Order",
-        "icon": "i-lucide-radio",
-        "link": "/radiology-order"
+        "link": "/ap-lab-order"
       },
       {
         "title": "Gizi",
@@ -193,17 +171,17 @@
           {
             "title": "SEP",
             "icon": "i-lucide-circuit-board",
-            "link": "/integration/bpjs/sep"
+            "link": "/integration/bpjs-vclaim/sep"
           },
           {
             "title": "Peserta",
             "icon": "i-lucide-circuit-board",
-            "link": "/integration/bpjs/member"
+            "link": "/integration/bpjs-vclaim/member"
           },
           {
             "title": "Surat Kontrol",
             "icon": "i-lucide-circuit-board",
-            "link": "/integration/bpjs/control-letter"
+            "link": "/integration/bpjs-vclaim/control-letter"
           }
         ]
       },
@@ -284,40 +262,40 @@
         ]
       },
       {
-        "title": "Layanan",
+        "title": "Infrastruktur",
         "icon": "i-lucide-layout-list",
         "children": [
-          {
-            "title": "Counter",
-            "link": "/service-src/counter"
-          },
-          {
-            "title": "Public Screen (Big Screen)",
-            "link": "/service-src/public-screen"
-          },
           {
             "title": "Kasur",
-            "link": "/service-src/bed"
+            "link": "/infra-src/bed"
           },
           {
             "title": "Kamar",
-            "link": "/service-src/chamber"
+            "link": "/infra-src/chamber"
           },
           {
             "title": "Ruang",
-            "link": "/service-src/room"
+            "link": "/infra-src/room"
           },
           {
             "title": "Depo",
-            "link": "/service-src/warehouse"
+            "link": "/infra-src/warehouse"
           },
           {
             "title": "Lantai",
-            "link": "/service-src/floor"
+            "link": "/infra-src/floor"
           },
           {
             "title": "Gedung",
-            "link": "/service-src/building"
+            "link": "/infra-src/building"
+          },
+          {
+            "title": "Counter",
+            "link": "/infra-src/counter"
+          },
+          {
+            "title": "Public Screen (Big Screen)",
+            "link": "/infra-src/public-screen"
           }
         ]
       },
@@ -369,4 +347,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/public/side-menu-items/system.json b/public/side-menu-items/system.json
index e12f58ec..19d20336 100644
--- a/public/side-menu-items/system.json
+++ b/public/side-menu-items/system.json
@@ -13,19 +13,19 @@
         "children": [
           {
             "title": "Antrian Pendaftaran",
-            "link": "/outpatient/registration-queue"
+            "link": "/ambulatory/registration-queue"
           },
           {
             "title": "Antrian Poliklinik",
-            "link": "/outpatient/encounter-queue"
+            "link": "/ambulatory/encounter-queue"
           },
           {
             "title": "Kunjungan",
-            "link": "/outpatient/encounter"
+            "link": "/ambulatory/encounter"
           },
           {
             "title": "Konsultasi",
-            "link": "/outpatient/consultation"
+            "link": "/ambulatory/consultation"
           }
         ]
       },
@@ -193,17 +193,22 @@
           {
             "title": "SEP",
             "icon": "i-lucide-circuit-board",
-            "link": "/integration/bpjs/sep"
+            "link": "/integration/bpjs-vclaim/sep"
           },
           {
             "title": "Peserta",
             "icon": "i-lucide-circuit-board",
-            "link": "/integration/bpjs/member"
+            "link": "/integration/bpjs-vclaim/member"
+          },
+          {
+            "title": "PRB",
+            "icon": "i-lucide-circuit-board",
+            "link": "/integration/bpjs/prb"
           },
           {
             "title": "Surat Kontrol",
             "icon": "i-lucide-circuit-board",
-            "link": "/integration/bpjs/control-letter"
+            "link": "/integration/bpjs-vclaim/control-letter"
           }
         ]
       },
@@ -389,4 +394,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/server/api/[...req].ts b/server/api/[...req].ts
index 5948eda6..79f90d1d 100644
--- a/server/api/[...req].ts
+++ b/server/api/[...req].ts
@@ -1,21 +1,17 @@
 import { defineEventHandler, getCookie, getRequestHeaders, getRequestURL, readBody } from 'h3'
 
 export default defineEventHandler(async (event) => {
-  const { method } = event.node.req
+  const { method } = event.node.req as any
   const headers = getRequestHeaders(event)
   const url = getRequestURL(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 || '')
   }
@@ -36,7 +32,7 @@ export default defineEventHandler(async (event) => {
   }
 
   let body: any
-  if (['POST', 'PATCH'].includes(method!)) {
+  if (['POST', 'PATCH', 'PUT', 'DELETE'].includes(method)) {
     if (headers['content-type']?.includes('multipart/form-data')) {
       body = await readBody(event)
     } else {