diff --git a/app/components/app/divison/entry-form.vue b/app/components/app/division/entry-form-prev.vue
similarity index 100%
rename from app/components/app/divison/entry-form.vue
rename to app/components/app/division/entry-form-prev.vue
diff --git a/app/components/app/division/entry-form.vue b/app/components/app/division/entry-form.vue
new file mode 100644
index 00000000..5f4b3299
--- /dev/null
+++ b/app/components/app/division/entry-form.vue
@@ -0,0 +1,102 @@
+<script setup lang="ts">
+// Components
+import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
+import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+
+// Types
+import type { DivisionFormData } from '~/schemas/division.schema.ts'
+
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  values: any
+  isLoading?: boolean
+  isReadonly?: boolean
+}
+
+const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
+const emit = defineEmits<{
+  submit: [values: DivisionFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    code: '',
+    name: '',
+    division_id: '',
+  } as Partial<DivisionFormData>,
+})
+
+const [code, codeAttrs] = defineField('code')
+const [name, nameAttrs] = defineField('name')
+const [division, divisionAttrs] = defineField('division_id')
+
+// Fill fields from props.values if provided
+if (props.values) {
+  if (props.values.code !== undefined) code.value = props.values.code
+  if (props.values.name !== undefined) name.value = props.values.name
+  if (props.values.division_id !== undefined) division.value = props.values.division_id
+}
+
+const resetForm = () => {
+  code.value = ''
+  name.value = ''
+  division.value = ''
+}
+
+// Form submission handler
+function onSubmitForm(values: any) {
+  const formData: DivisionFormData = {
+    name: name.value || '',
+    code: code.value || '',
+    division_id: division.value || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+// Form cancel handler
+function onCancelForm() {
+  emit('cancel', resetForm)
+}
+</script>
+
+<template>
+  <form id="form-division" @submit.prevent>
+    <Block labelSize="thin" class="!mb-2.5 !pt-0 xl:!mb-3" :colCount="1">
+      <Cell>
+        <Label height="compact">Kode</Label>
+        <Field :errMessage="errors.code">
+          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Nama</Label>
+        <Field :errMessage="errors.name">
+          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+    </Block>
+    <div class="my-2 flex justify-end gap-2 py-2">
+      <Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
+      <Button
+        v-if="!isReadonly"
+        type="button"
+        class="w-[120px]"
+        :disabled="isLoading || !meta.valid"
+        @click="onSubmitForm"
+      >
+        Simpan
+      </Button>
+    </div>
+  </form>
+</template>
diff --git a/app/components/app/divison/list-cfg.ts b/app/components/app/division/list-cfg.ts
similarity index 92%
rename from app/components/app/divison/list-cfg.ts
rename to app/components/app/division/list-cfg.ts
index 99526e10..3674b5c2 100644
--- a/app/components/app/divison/list-cfg.ts
+++ b/app/components/app/division/list-cfg.ts
@@ -48,8 +48,4 @@ export const funcComponent: RecStrFuncComponent = {
   },
 }
 
-export const funcHtml: RecStrFuncUnknown = {
-  patient_address(_rec) {
-    return '-'
-  },
-}
+export const funcHtml: RecStrFuncUnknown = {}
diff --git a/app/components/app/divison/list.vue b/app/components/app/division/list.vue
similarity index 100%
rename from app/components/app/divison/list.vue
rename to app/components/app/division/list.vue
diff --git a/app/components/app/divison/tree.vue b/app/components/app/division/tree.vue
similarity index 100%
rename from app/components/app/divison/tree.vue
rename to app/components/app/division/tree.vue
diff --git a/app/components/app/equipment/entry-form.vue b/app/components/app/equipment/entry-form.vue
index c15fa156..07f5af19 100644
--- a/app/components/app/equipment/entry-form.vue
+++ b/app/components/app/equipment/entry-form.vue
@@ -6,7 +6,7 @@ import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
 import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 
 // Types
-import type { MaterialFormData } from '~/schemas/material.schema'
+import type { MaterialFormData } from '~/schemas/material.schema.ts'
 
 // Helpers
 import type z from 'zod'
diff --git a/app/components/app/medicine-group/entry-form.vue b/app/components/app/medicine-group/entry-form.vue
index 5474d364..2f955980 100644
--- a/app/components/app/medicine-group/entry-form.vue
+++ b/app/components/app/medicine-group/entry-form.vue
@@ -8,7 +8,7 @@ import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Types
-import type { MedicineBaseFormData } from '~/schemas/medicine.schema'
+import type { BaseFormData } from '~/schemas/base.schema.ts'
 
 // Helpers
 import type z from 'zod'
@@ -26,7 +26,7 @@ const props = defineProps<Props>()
 const isLoading = props.isLoading !== undefined ? props.isLoading : false
 const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
-  submit: [values: MedicineBaseFormData, resetForm: () => void]
+  submit: [values: BaseFormData, resetForm: () => void]
   cancel: [resetForm: () => void]
 }>()
 
diff --git a/app/components/app/medicine-group/list-cfg.ts b/app/components/app/medicine-group/list-cfg.ts
index e2c72f9c..4d053e5e 100644
--- a/app/components/app/medicine-group/list-cfg.ts
+++ b/app/components/app/medicine-group/list-cfg.ts
@@ -10,11 +10,6 @@ import { defineAsyncComponent } from 'vue'
 
 const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 
-const _doctorStatus = {
-  0: 'Tidak Aktif',
-  1: 'Aktif',
-}
-
 export const cols: Col[] = [{}, {}, { width: 50 }]
 
 export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Aksi' }]]
@@ -39,8 +34,4 @@ export const funcComponent: RecStrFuncComponent = {
   },
 }
 
-export const funcHtml: RecStrFuncUnknown = {
-  patient_address(_rec) {
-    return '-'
-  },
-}
+export const funcHtml: RecStrFuncUnknown = {}
diff --git a/app/components/app/medicine-method/entry-form.vue b/app/components/app/medicine-method/entry-form.vue
index b2fbdc94..1be0a4a2 100644
--- a/app/components/app/medicine-method/entry-form.vue
+++ b/app/components/app/medicine-method/entry-form.vue
@@ -8,7 +8,7 @@ import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Types
-import type { MedicineBaseFormData } from '~/schemas/medicine.schema'
+import type { BaseFormData } from '~/schemas/base.schema.ts'
 
 // Helpers
 import type z from 'zod'
@@ -26,7 +26,7 @@ const props = defineProps<Props>()
 const isLoading = props.isLoading !== undefined ? props.isLoading : false
 const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
-  submit: [values: MedicineBaseFormData, resetForm: () => void]
+  submit: [values: BaseFormData, resetForm: () => void]
   cancel: [resetForm: () => void]
 }>()
 
diff --git a/app/components/app/medicine-method/list-cfg.ts b/app/components/app/medicine-method/list-cfg.ts
index e2c72f9c..4d053e5e 100644
--- a/app/components/app/medicine-method/list-cfg.ts
+++ b/app/components/app/medicine-method/list-cfg.ts
@@ -10,11 +10,6 @@ import { defineAsyncComponent } from 'vue'
 
 const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 
-const _doctorStatus = {
-  0: 'Tidak Aktif',
-  1: 'Aktif',
-}
-
 export const cols: Col[] = [{}, {}, { width: 50 }]
 
 export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Aksi' }]]
@@ -39,8 +34,4 @@ export const funcComponent: RecStrFuncComponent = {
   },
 }
 
-export const funcHtml: RecStrFuncUnknown = {
-  patient_address(_rec) {
-    return '-'
-  },
-}
+export const funcHtml: RecStrFuncUnknown = {}
diff --git a/app/components/app/medicine/entry-form.vue b/app/components/app/medicine/entry-form.vue
index 719eea5d..332b8399 100644
--- a/app/components/app/medicine/entry-form.vue
+++ b/app/components/app/medicine/entry-form.vue
@@ -1,80 +1,183 @@
 <script setup lang="ts">
-import Block from '~/components/pub/custom-ui/form/block.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
+// Components
+import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
+import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+import Button from '~/components/pub/ui/button/Button.vue'
 
-const props = defineProps<{ modelValue: any }>()
-const emit = defineEmits(['update:modelValue', 'event'])
+// Helpers
+import type z from 'zod'
+import { useForm } from 'vee-validate'
+import { toTypedSchema } from '@vee-validate/zod'
 
-const data = computed({
-  get: () => props.modelValue,
-  set: (val) => emit('update:modelValue', val),
+interface Props {
+  schema?: z.ZodSchema<any>
+  values?: any
+  isLoading?: boolean
+  isReadonly?: boolean
+  medicineGroups?: { value: string, label: string }[]
+  medicineMethods?: { value: string, label: string }[]
+  uoms?: { value: string, label: string }[]
+  infras?: { value: number|null, label: string }[]
+}
+
+const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
+const emit = defineEmits<{
+  submit: [values: any, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const { defineField, errors, meta } = useForm({
+  validationSchema: props.schema ? toTypedSchema(props.schema) : undefined,
+  initialValues: {
+    code: '',
+    name: '',
+    medicineGroup_code: '',
+    medicineMethod_code: '',
+    uom_code: '',
+    infra_id: null,
+    stock: 0,
+  },
 })
 
-const items = [
-  { value: '1', label: 'item 1' },
-  { value: '2', label: 'item 2' },
-  { value: '3', label: 'item 3' },
-  { value: '4', label: 'item 4' },
-]
+const [code, codeAttrs] = defineField('code')
+const [name, nameAttrs] = defineField('name')
+const [medicineGroup_code, medicineGroupAttrs] = defineField('medicineGroup_code')
+const [medicineMethod_code, medicineMethodAttrs] = defineField('medicineMethod_code')
+const [uom_code, uomAttrs] = defineField('uom_code')
+const [infra_id, infraAttrs] = defineField('infra_id')
+const [stock, stockAttrs] = defineField('stock')
+
+if (props.values) {
+  if (props.values.code !== undefined) code.value = props.values.code
+  if (props.values.name !== undefined) name.value = props.values.name
+  if (props.values.medicineGroup_code !== undefined) medicineGroup_code.value = props.values.medicineGroup_code
+  if (props.values.medicineMethod_code !== undefined) medicineMethod_code.value = props.values.medicineMethod_code
+  if (props.values.uom_code !== undefined) uom_code.value = props.values.uom_code
+  if (props.values.infra_id !== undefined) infra_id.value = props.values.infra_id
+  if (props.values.stock !== undefined) stock.value = props.values.stock
+}
+
+const resetForm = () => {
+  code.value = ''
+  name.value = ''
+  medicineGroup_code.value = ''
+  medicineMethod_code.value = ''
+  uom_code.value = ''
+  infra_id.value = null
+  stock.value = 0
+}
+
+function onSubmitForm() {
+  const formData = {
+    code: code.value || '',
+    name: name.value || '',
+    medicineGroup_code: medicineGroup_code.value || '',
+    medicineMethod_code: medicineMethod_code.value || '',
+    uom_code: uom_code.value || '',
+    infra_id: infra_id.value === '' ? null : infra_id.value,
+    stock: stock.value || 0,
+  }
+  emit('submit', formData, resetForm)
+}
+
+function onCancelForm() {
+  emit('cancel', resetForm)
+}
 </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="flex flex-col justify-between">
-        <Block>
-          <FieldGroup :column="2">
-            <Label>Nama</Label>
-            <Field>
-              <Input type="text" name="identity_number" />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Kode</Label>
-            <Field name="sip_number">
-              <Input type="text" name="sip_no" />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Cara Pemberian</Label>
-            <Field name="phone">
-              <Select :items="items" />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Bentuk Sediaan</Label>
-            <Field>
-              <Select :items="items" />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Dosis</Label>
-            <Field>
-              <Input type="number" name="outPatient_rate" />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Infra</Label>
-            <Field>
-              <Input />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Stock</Label>
-            <Field>
-              <Input type="number" />
-            </Field>
-          </FieldGroup>
-          <FieldGroup :column="2">
-            <Label>Status</Label>
-            <Field>
-              <Input />
-            </Field>
-          </FieldGroup>
-        </Block>
-      </div>
+  <form id="form-medicine" @submit.prevent>
+    <Block labelSize="thin" class="!mb-2.5 !pt-0 xl:!mb-3" :colCount="1">
+      <Cell>
+        <Label height="">Kode</Label>
+        <Field :errMessage="errors.code">
+          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading || isReadonly" class="input input-bordered w-full" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Nama</Label>
+        <Field :errMessage="errors.name">
+          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" class="input input-bordered w-full" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Kelompok Obat</Label>
+        <Field :errMessage="errors.medicineGroup_code">
+          <Select
+            id="medicineGroup_code"
+            v-model="medicineGroup_code"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Pilih kelompok obat"
+            v-bind="medicineGroupAttrs"
+            :items="props.medicineGroups || []"
+            :disabled="isLoading || isReadonly"
+          />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Metode Pemberian</Label>
+        <Field :errMessage="errors.medicineMethod_code">
+          <Select
+            id="medicineMethod_code"
+            v-model="medicineMethod_code"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Pilih metode pemberian"
+            v-bind="medicineMethodAttrs"
+            :items="props.medicineMethods || []"
+            :disabled="isLoading || isReadonly"
+          />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Satuan</Label>
+        <Field :errMessage="errors.uom_code">
+          <Select
+            id="uom_code"
+            v-model="uom_code"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Pilih satuan"
+            v-bind="uomAttrs"
+            :items="props.uoms || []"
+            :disabled="isLoading || isReadonly"
+          />
+        </Field>
+      </Cell>
+      <!-- <Cell>
+        <Label height="compact">Infra</Label>
+        <Field :errMessage="errors.infra_id">
+          <Select
+            id="infra_id"
+            v-model="infra_id"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Tidak ada"
+            v-bind="infraAttrs"
+            :items="props.infras || []"
+            :disabled="isLoading || isReadonly"
+          />
+        </Field>
+      </Cell> -->
+      <Cell>
+        <Label height="compact">Stok</Label>
+        <Field :errMessage="errors.stock">
+          <Input id="stock" v-model="stock" type="number" v-bind="stockAttrs" :disabled="isLoading || isReadonly" class="input input-bordered w-full" />
+        </Field>
+      </Cell>
+    </Block>
+    <div class="my-2 flex justify-end gap-2 py-2">
+      <Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
+      <Button
+        v-if="!isReadonly"
+        type="button"
+        class="w-[120px]"
+        :disabled="isLoading || !meta.valid"
+        @click="onSubmitForm"
+      >
+        Simpan
+      </Button>
     </div>
   </form>
 </template>
diff --git a/app/components/app/medicine/list-cfg.ts b/app/components/app/medicine/list-cfg.ts
index e86a0646..3440e5f9 100644
--- a/app/components/app/medicine/list-cfg.ts
+++ b/app/components/app/medicine/list-cfg.ts
@@ -18,16 +18,15 @@ export const header: Th[][] = [
   [
     { label: 'Kode' },
     { label: 'Name' },
-    { label: 'Kategori' },
     { label: 'Golongan' },
     { label: 'Metode Pemberian' },
-    { label: 'Bentuk' },
+    { label: "Satuan" },
     { label: 'Stok' },
     { label: 'Aksi' },
   ],
 ]
 
-export const keys = ['code', 'name', 'category', 'group', 'method', 'unit', 'total', 'action']
+export const keys = ['code', 'name', 'group', 'method', 'unit', 'stock', 'action']
 
 export const delKeyNames: KeyLabel[] = [
   { key: 'code', label: 'Kode' },
@@ -35,17 +34,14 @@ export const delKeyNames: KeyLabel[] = [
 ]
 
 export const funcParsed: RecStrFuncUnknown = {
-  cateogry: (rec: unknown): unknown => {
-    return (rec as SmallDetailDto).medicineCategory?.name || '-'
-  },
   group: (rec: unknown): unknown => {
-    return (rec as SmallDetailDto).medicineGroup?.name || '-'
+    return (rec as SmallDetailDto).medicineGroup_code || '-'
   },
   method: (rec: unknown): unknown => {
-    return (rec as SmallDetailDto).medicineMethod?.name || '-'
+    return (rec as SmallDetailDto).medicineMethod_code || '-'
   },
   unit: (rec: unknown): unknown => {
-    return (rec as SmallDetailDto).medicineUnit?.name || '-'
+    return (rec as SmallDetailDto).uom_code || '-'
   },
 }
 
@@ -60,8 +56,4 @@ export const funcComponent: RecStrFuncComponent = {
   },
 }
 
-export const funcHtml: RecStrFuncUnknown = {
-  // (_rec) {
-  //   return '-'
-  // },
-}
+export const funcHtml: RecStrFuncUnknown = {}
diff --git a/app/components/app/medicine/list.vue b/app/components/app/medicine/list.vue
index 5b8778d9..d44aa4d8 100644
--- a/app/components/app/medicine/list.vue
+++ b/app/components/app/medicine/list.vue
@@ -1,19 +1,35 @@
 <script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/custom-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/custom-ui/pagination/pagination-view.vue'
 import { cols, funcComponent, funcHtml, funcParsed, header, keys } from './list-cfg'
 
-defineProps<{
+interface Props {
   data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
 }>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
 </script>
 
 <template>
-  <PubBaseDataTable
-    :rows="data"
-    :cols="cols"
-    :header="header"
-    :keys="keys"
-    :func-parsed="funcParsed"
-    :func-html="funcHtml"
-    :func-component="funcComponent"
-  />
+  <div class="space-y-4">
+    <PubBaseDataTable
+      :rows="data"
+      :cols="cols"
+      :header="header"
+      :keys="keys"
+      :func-parsed="funcParsed"
+      :func-html="funcHtml"
+      :func-component="funcComponent"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
 </template>
diff --git a/app/components/app/specialist/entry-form-prev.vue b/app/components/app/specialist/entry-form-prev.vue
new file mode 100644
index 00000000..2dbfffc1
--- /dev/null
+++ b/app/components/app/specialist/entry-form-prev.vue
@@ -0,0 +1,181 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
+import Field from '~/components/pub/custom-ui/form/field.vue'
+import Label from '~/components/pub/custom-ui/form/label.vue'
+
+interface SpecialistFormData {
+  name: string
+  code: string
+  installationId: string
+  unitId: string
+}
+
+const props = defineProps<{
+  schema: any
+  initialValues?: Partial<SpecialistFormData>
+  errors?: FormErrors
+  installation: {
+    msg: {
+      placeholder: string
+      search: string
+      empty: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+  unit: {
+    msg: {
+      placeholder: string
+      search: string
+      empty: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+}>()
+
+const emit = defineEmits<{
+  'submit': [values: SpecialistFormData, resetForm: () => void]
+  'cancel': [resetForm: () => void]
+  'installationChanged': [id: string]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: SpecialistFormData = {
+    name: values.name || '',
+    code: values.code || '',
+    installationId: values.installationId || '',
+    unitId: values.unitId || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+// Watch for installation changes
+function onInstallationChanged(installationId: string, setFieldValue: any) {
+  setFieldValue('unitId', '', false)
+  emit('installationChanged', installationId || '')
+}
+</script>
+
+<template>
+  <Form
+    v-slot="{ handleSubmit, resetForm, values, setFieldValue }" as="" keep-values :validation-schema="formSchema"
+    :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-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+          <FieldGroup>
+            <Label label-for="name">Nama</Label>
+            <Field id="name" :errors="errors">
+              <FormField v-slot="{ componentField }" name="name">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="name"
+                      type="text"
+                      placeholder="Masukkan nama spesialisasi"
+                      autocomplete="off"
+                      v-bind="componentField"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="code">Kode</Label>
+            <Field id="code" :errors="errors">
+              <FormField v-slot="{ componentField }" name="code">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="code"
+                      type="text"
+                      placeholder="Masukkan kode spesialisasi"
+                      autocomplete="off"
+                      v-bind="componentField"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="installationId">Instalasi</Label>
+            <Field id="installationId" :errors="errors">
+              <FormField v-slot="{ componentField }" name="installationId">
+                <FormItem>
+                  <FormControl>
+                    <Combobox
+                      id="installationId"
+                      v-bind="componentField"
+                      :items="installation.items"
+                      :placeholder="installation.msg.placeholder"
+                      :search-placeholder="installation.msg.search"
+                      :empty-message="installation.msg.empty"
+                      @update:model-value="(value) => onInstallationChanged(value, setFieldValue)"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="unitId">Unit</Label>
+            <Field id="unitId" :errors="errors">
+              <FormField v-slot="{ componentField }" name="unitId">
+                <FormItem>
+                  <FormControl>
+                    <Combobox
+                      id="unitId"
+                      :disabled="!values.installationId"
+                      v-bind="componentField"
+                      :items="unit.items"
+                      :placeholder="unit.msg.placeholder"
+                      :search-placeholder="unit.msg.search"
+                      :empty-message="unit.msg.empty"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+        </div>
+      </div>
+
+      <div class="flex justify-end gap-2 mt-4">
+        <Button type="button" variant="outline" @click="onCancelForm({ resetForm })">
+          Batal
+        </Button>
+        <Button type="submit">
+          Simpan
+        </Button>
+      </div>
+    </form>
+  </Form>
+</template>
diff --git a/app/components/app/specialist/entry-form.vue b/app/components/app/specialist/entry-form.vue
index f9044f0e..7254ec98 100644
--- a/app/components/app/specialist/entry-form.vue
+++ b/app/components/app/specialist/entry-form.vue
@@ -1,182 +1,128 @@
 <script setup lang="ts">
-import type { FormErrors } from '~/types/error'
-import { toTypedSchema } from '@vee-validate/zod'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
-import { Form } from '~/components/pub/ui/form'
+// Components
+import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
+import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
 
-interface SpecialistFormData {
-  name: string
-  code: string
-  installationId: string
-  unitId: string
+// Types
+import type { SpecialistFormData } from '~/schemas/specialist.schema.ts'
+
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  units: any[]
+  values: any
+  isLoading?: boolean
+  isReadonly?: boolean
 }
 
-const props = defineProps<{
-  schema: any
-  initialValues?: Partial<SpecialistFormData>
-  errors?: FormErrors
-  installation: {
-    msg: {
-      placeholder: string
-      search: string
-      empty: string
-    }
-    items: {
-      value: string
-      label: string
-      code: string
-    }[]
-  }
-  unit: {
-    msg: {
-      placeholder: string
-      search: string
-      empty: string
-    }
-    items: {
-      value: string
-      label: string
-      code: string
-    }[]
-  }
-}>()
-
+const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
-  'submit': [values: SpecialistFormData, resetForm: () => void]
-  'cancel': [resetForm: () => void]
-  'installationChanged': [id: string]
+  submit: [values: SpecialistFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
 }>()
 
-const formSchema = toTypedSchema(props.schema)
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    code: '',
+    name: '',
+    unit_id: 0,
+  } as Partial<SpecialistFormData>,
+})
+
+const [code, codeAttrs] = defineField('code')
+const [name, nameAttrs] = defineField('name')
+const [unit, unitAttrs] = defineField('unit_id')
+
+// Fill fields from props.values if provided
+if (props.values) {
+  if (props.values.code !== undefined) code.value = props.values.code
+  if (props.values.name !== undefined) name.value = props.values.name
+  if (props.values.unit_id !== undefined) unit.value = props.values.unit_id
+}
+
+const resetForm = () => {
+  code.value = ''
+  name.value = ''
+  unit.value = ''
+}
 
 // Form submission handler
-function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+function onSubmitForm(values: any) {
   const formData: SpecialistFormData = {
-    name: values.name || '',
-    code: values.code || '',
-    installationId: values.installationId || '',
-    unitId: values.unitId || '',
+    name: name.value || '',
+    code: code.value || '',
+    unit_id: unit.value || '',
   }
   emit('submit', formData, resetForm)
 }
 
 // Form cancel handler
-function onCancelForm({ resetForm }: { resetForm: () => void }) {
+function onCancelForm() {
   emit('cancel', resetForm)
 }
-
-// Watch for installation changes
-function onInstallationChanged(installationId: string, setFieldValue: any) {
-  setFieldValue('unitId', '', false)
-  emit('installationChanged', installationId || '')
-}
 </script>
 
 <template>
-  <Form
-    v-slot="{ handleSubmit, resetForm, values, setFieldValue }" as="" keep-values :validation-schema="formSchema"
-    :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-3 text-lg xl:text-xl">
-        <div class="flex flex-col justify-between">
-          <FieldGroup>
-            <Label label-for="name">Nama</Label>
-            <Field id="name" :errors="errors">
-              <FormField v-slot="{ componentField }" name="name">
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      id="name"
-                      type="text"
-                      placeholder="Masukkan nama spesialisasi"
-                      autocomplete="off"
-                      v-bind="componentField"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="code">Kode</Label>
-            <Field id="code" :errors="errors">
-              <FormField v-slot="{ componentField }" name="code">
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      id="code"
-                      type="text"
-                      placeholder="Masukkan kode spesialisasi"
-                      autocomplete="off"
-                      v-bind="componentField"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="installationId">Instalasi</Label>
-            <Field id="installationId" :errors="errors">
-              <FormField v-slot="{ componentField }" name="installationId">
-                <FormItem>
-                  <FormControl>
-                    <Combobox
-                      id="installationId"
-                      v-bind="componentField"
-                      :items="installation.items"
-                      :placeholder="installation.msg.placeholder"
-                      :search-placeholder="installation.msg.search"
-                      :empty-message="installation.msg.empty"
-                      @update:model-value="(value) => onInstallationChanged(value, setFieldValue)"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="unitId">Unit</Label>
-            <Field id="unitId" :errors="errors">
-              <FormField v-slot="{ componentField }" name="unitId">
-                <FormItem>
-                  <FormControl>
-                    <Combobox
-                      id="unitId"
-                      :disabled="!values.installationId"
-                      v-bind="componentField"
-                      :items="unit.items"
-                      :placeholder="unit.msg.placeholder"
-                      :search-placeholder="unit.msg.search"
-                      :empty-message="unit.msg.empty"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-        </div>
-      </div>
-
-      <div class="flex justify-end gap-2 mt-4">
-        <Button type="button" variant="outline" @click="onCancelForm({ resetForm })">
-          Batal
-        </Button>
-        <Button type="submit">
-          Simpan
-        </Button>
-      </div>
-    </form>
-  </Form>
+  <form id="form-specialist" @submit.prevent>
+    <Block labelSize="thin" class="!mb-2.5 !pt-0 xl:!mb-3" :colCount="1">
+      <Cell>
+        <Label height="compact">Kode</Label>
+        <Field :errMessage="errors.code">
+          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Nama</Label>
+        <Field :errMessage="errors.name">
+          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Unit</Label>
+        <Field :errMessage="errors.unit">
+          <!-- <Combobox
+            id="unit"
+            placeholder="Pilih Unit"
+            search-placeholder="Cari unit"
+            empty-message="Unit tidak ditemukan"
+            v-model="unit"
+            v-bind="unitAttrs"
+            :items="units"
+            :disabled="isLoading || isReadonly"
+          /> -->
+          <Select
+            id="unit"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Pilih unit"
+            v-model="unit"
+            v-bind="unitAttrs"
+            :items="units"
+            :disabled="isLoading || isReadonly"
+          />
+        </Field>
+      </Cell>
+    </Block>
+    <div class="my-2 flex justify-end gap-2 py-2">
+      <Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
+      <Button
+        v-if="!isReadonly"
+        type="button"
+        class="w-[120px]"
+        :disabled="isLoading || !meta.valid"
+        @click="onSubmitForm"
+      >
+        Simpan
+      </Button>
+    </div>
+  </form>
 </template>
diff --git a/app/components/app/specialist/list-cfg.ts b/app/components/app/specialist/list-cfg.ts
index 367d4d9f..2ddc5007 100644
--- a/app/components/app/specialist/list-cfg.ts
+++ b/app/components/app/specialist/list-cfg.ts
@@ -10,15 +10,13 @@ import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-ud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 
-export const cols: Col[] = [{ width: 100 }, {}, {}, {}, { width: 50 }]
+export const cols: Col[] = [{}, {}, {}, { width: 50 }]
 
-export const header: Th[][] = [
-  [{ label: 'Id' }, { label: 'Name' }, { label: 'Code' }, { label: 'Unit' }, { label: '' }],
-]
+export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Unit' }, { label: '' }]]
 
-export const keys = ['id', 'name', 'cellphone', 'religion_code', 'action']
+export const keys = ['code', 'name', 'unit', 'action']
 
 export const delKeyNames: KeyLabel[] = [
   { key: 'code', label: 'Kode' },
@@ -28,7 +26,11 @@ export const delKeyNames: KeyLabel[] = [
 export const funcParsed: RecStrFuncUnknown = {
   name: (rec: unknown): unknown => {
     const recX = rec as SmallDetailDto
-    return `${recX.firstName} ${recX.lastName || ''}`.trim()
+    return `${recX.name}`.trim()
+  },
+  unit: (rec: unknown): unknown => {
+    const recX = rec as SmallDetailDto
+    return recX.unit_id || '-'
   },
 }
 
@@ -38,13 +40,9 @@ export const funcComponent: RecStrFuncComponent = {
       idx,
       rec: rec as object,
       component: action,
-      props: {
-        size: 'sm',
-      },
     }
     return res
   },
 }
 
-export const funcHtml: RecStrFuncUnknown = {
-}
+export const funcHtml: RecStrFuncUnknown = {}
diff --git a/app/components/app/specialist/list.vue b/app/components/app/specialist/list.vue
index e9489ef1..cde2a4ce 100644
--- a/app/components/app/specialist/list.vue
+++ b/app/components/app/specialist/list.vue
@@ -22,10 +22,15 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubBaseDataTable
-      :rows="data" :cols="cols" :header="header" :keys="keys" :func-parsed="funcParsed"
-      :func-html="funcHtml" :func-component="funcComponent" :skeleton-size="paginationMeta?.pageSize"
+      :rows="data"
+      :cols="cols"
+      :header="header"
+      :keys="keys"
+      :func-parsed="funcParsed"
+      :func-html="funcHtml"
+      :func-component="funcComponent"
+      :skeleton-size="paginationMeta?.pageSize"
     />
-
     <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
   </div>
 </template>
diff --git a/app/components/app/subspecialist/entry-form-prev.vue b/app/components/app/subspecialist/entry-form-prev.vue
new file mode 100644
index 00000000..9d31fd3f
--- /dev/null
+++ b/app/components/app/subspecialist/entry-form-prev.vue
@@ -0,0 +1,213 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
+import Field from '~/components/pub/custom-ui/form/field.vue'
+import Label from '~/components/pub/custom-ui/form/label.vue'
+
+interface SubSpecialistFormData {
+  name: string
+  code: string
+  installationId: string
+  unitId: string
+  specialistId: string
+}
+
+const props = defineProps<{
+  schema: any
+  initialValues?: Partial<SubSpecialistFormData>
+  errors?: FormErrors
+  installation: {
+    msg: {
+      placeholder: string
+      search: string
+      empty: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+  unit: {
+    msg: {
+      placeholder: string
+      search: string
+      empty: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+  specialist: {
+    msg: {
+      placeholder: string
+      search: string
+      empty: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+}>()
+
+const emit = defineEmits<{
+  'submit': [values: SubSpecialistFormData, resetForm: () => void]
+  'cancel': [resetForm: () => void]
+  'installationChanged': [id: string]
+  'unitChanged': [id: string]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: SubSpecialistFormData = {
+    name: values.name || '',
+    code: values.code || '',
+    installationId: values.installationId || '',
+    unitId: values.unitId || '',
+    specialistId: values.specialistId || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+// Watch for installation changes
+function onInstallationChanged(installationId: string, setFieldValue: any) {
+  setFieldValue('unitId', '', false)
+  setFieldValue('specialistId', '', false)
+  emit('installationChanged', installationId || '')
+}
+
+function onUnitChanged(unitId: string, setFieldValue: any) {
+  setFieldValue('specialistId', '', false)
+  emit('unitChanged', unitId || '')
+}
+</script>
+
+<template>
+  <Form
+    v-slot="{
+      handleSubmit,
+      resetForm,
+      values,
+     setFieldValue,
+    }" as="" keep-values :validation-schema="formSchema"
+    :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-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+          <FieldGroup>
+            <Label label-for="name">Nama</Label>
+            <Field id="name" :errors="errors">
+              <FormField v-slot="{ componentField }" name="name">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="name" type="text" placeholder="Masukkan nama spesialisasi" autocomplete="off"
+                      v-bind="componentField"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="code">Kode</Label>
+            <Field id="code" :errors="errors">
+              <FormField v-slot="{ componentField }" name="code">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="code" type="text" placeholder="Masukkan kode spesialisasi" autocomplete="off"
+                      v-bind="componentField"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="installationId">Instalasi</Label>
+            <Field id="installationId" :errors="errors">
+              <FormField v-slot="{ componentField }" name="installationId">
+                <FormItem>
+                  <FormControl>
+                    <Combobox
+                      id="installationId" v-bind="componentField" :items="installation.items"
+                      :placeholder="installation.msg.placeholder" :search-placeholder="installation.msg.search"
+                      :empty-message="installation.msg.empty"
+                      @update:model-value="(value) => onInstallationChanged(value, setFieldValue)"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="unitId">Unit</Label>
+            <Field id="unitId" :errors="errors">
+              <FormField v-slot="{ componentField }" name="unitId">
+                <FormItem>
+                  <FormControl>
+                    <Combobox
+                      id="unitId" :disabled="!values.installationId" v-bind="componentField" :items="unit.items"
+                      :placeholder="unit.msg.placeholder" :search-placeholder="unit.msg.search"
+                      :empty-message="unit.msg.empty"
+                      @update:model-value="(value) => onUnitChanged(value, setFieldValue)"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="specialistId">Specialist</Label>
+            <Field id="specialistId" :errors="errors">
+              <FormField v-slot="{ componentField }" name="specialistId">
+                <FormItem>
+                  <FormControl>
+                    <Combobox
+                      id="specialistId" :disabled="!values.unitId" v-bind="componentField" :items="specialist.items"
+                      :placeholder="specialist.msg.placeholder" :search-placeholder="specialist.msg.search"
+                      :empty-message="specialist.msg.empty"
+                      />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+        </div>
+      </div>
+
+      <div class="flex justify-end gap-2 mt-4">
+        <Button type="button" variant="outline" @click="onCancelForm({ resetForm })">
+          Batal
+        </Button>
+        <Button type="submit">
+          Simpan
+        </Button>
+      </div>
+    </form>
+  </Form>
+</template>
diff --git a/app/components/app/subspecialist/entry-form.vue b/app/components/app/subspecialist/entry-form.vue
index f5115504..6aea232d 100644
--- a/app/components/app/subspecialist/entry-form.vue
+++ b/app/components/app/subspecialist/entry-form.vue
@@ -1,214 +1,128 @@
 <script setup lang="ts">
-import type { FormErrors } from '~/types/error'
-import { toTypedSchema } from '@vee-validate/zod'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
-import { Form } from '~/components/pub/ui/form'
+// Components
+import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
+import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
+// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
 
-interface SubSpecialistFormData {
-  name: string
-  code: string
-  installationId: string
-  unitId: string
-  specialistId: string
+// Types
+import type { SubspecialistFormData } from '~/schemas/subspecialist.schema.ts'
+
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  specialists: any[]
+  values: any
+  isLoading?: boolean
+  isReadonly?: boolean
 }
 
-const props = defineProps<{
-  schema: any
-  initialValues?: Partial<SubSpecialistFormData>
-  errors?: FormErrors
-  installation: {
-    msg: {
-      placeholder: string
-      search: string
-      empty: string
-    }
-    items: {
-      value: string
-      label: string
-      code: string
-    }[]
-  }
-  unit: {
-    msg: {
-      placeholder: string
-      search: string
-      empty: string
-    }
-    items: {
-      value: string
-      label: string
-      code: string
-    }[]
-  }
-  specialist: {
-    msg: {
-      placeholder: string
-      search: string
-      empty: string
-    }
-    items: {
-      value: string
-      label: string
-      code: string
-    }[]
-  }
-}>()
-
+const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
-  'submit': [values: SubSpecialistFormData, resetForm: () => void]
-  'cancel': [resetForm: () => void]
-  'installationChanged': [id: string]
-  'unitChanged': [id: string]
+  submit: [values: SubspecialistFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
 }>()
 
-const formSchema = toTypedSchema(props.schema)
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    code: '',
+    name: '',
+    specialist_id: 0,
+  } as Partial<SubspecialistFormData>,
+})
+
+const [code, codeAttrs] = defineField('code')
+const [name, nameAttrs] = defineField('name')
+const [specialist, specialistAttrs] = defineField('specialist_id')
+
+// Fill fields from props.values if provided
+if (props.values) {
+  if (props.values.code !== undefined) code.value = props.values.code
+  if (props.values.name !== undefined) name.value = props.values.name
+  if (props.values.specialist_id !== undefined) specialist.value = props.values.specialist_id
+}
+
+const resetForm = () => {
+  code.value = ''
+  name.value = ''
+  specialist.value = ''
+}
 
 // Form submission handler
-function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
-  const formData: SubSpecialistFormData = {
-    name: values.name || '',
-    code: values.code || '',
-    installationId: values.installationId || '',
-    unitId: values.unitId || '',
-    specialistId: values.specialistId || '',
+function onSubmitForm(values: any) {
+  const formData: SubspecialistFormData = {
+    name: name.value || '',
+    code: code.value || '',
+    specialist_id: specialist.value || '',
   }
   emit('submit', formData, resetForm)
 }
 
 // Form cancel handler
-function onCancelForm({ resetForm }: { resetForm: () => void }) {
+function onCancelForm() {
   emit('cancel', resetForm)
 }
-
-// Watch for installation changes
-function onInstallationChanged(installationId: string, setFieldValue: any) {
-  setFieldValue('unitId', '', false)
-  setFieldValue('specialistId', '', false)
-  emit('installationChanged', installationId || '')
-}
-
-function onUnitChanged(unitId: string, setFieldValue: any) {
-  setFieldValue('specialistId', '', false)
-  emit('unitChanged', unitId || '')
-}
 </script>
 
 <template>
-  <Form
-    v-slot="{
-      handleSubmit,
-      resetForm,
-      values,
-     setFieldValue,
-    }" as="" keep-values :validation-schema="formSchema"
-    :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-3 text-lg xl:text-xl">
-        <div class="flex flex-col justify-between">
-          <FieldGroup>
-            <Label label-for="name">Nama</Label>
-            <Field id="name" :errors="errors">
-              <FormField v-slot="{ componentField }" name="name">
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      id="name" type="text" placeholder="Masukkan nama spesialisasi" autocomplete="off"
-                      v-bind="componentField"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="code">Kode</Label>
-            <Field id="code" :errors="errors">
-              <FormField v-slot="{ componentField }" name="code">
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      id="code" type="text" placeholder="Masukkan kode spesialisasi" autocomplete="off"
-                      v-bind="componentField"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="installationId">Instalasi</Label>
-            <Field id="installationId" :errors="errors">
-              <FormField v-slot="{ componentField }" name="installationId">
-                <FormItem>
-                  <FormControl>
-                    <Combobox
-                      id="installationId" v-bind="componentField" :items="installation.items"
-                      :placeholder="installation.msg.placeholder" :search-placeholder="installation.msg.search"
-                      :empty-message="installation.msg.empty"
-                      @update:model-value="(value) => onInstallationChanged(value, setFieldValue)"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="unitId">Unit</Label>
-            <Field id="unitId" :errors="errors">
-              <FormField v-slot="{ componentField }" name="unitId">
-                <FormItem>
-                  <FormControl>
-                    <Combobox
-                      id="unitId" :disabled="!values.installationId" v-bind="componentField" :items="unit.items"
-                      :placeholder="unit.msg.placeholder" :search-placeholder="unit.msg.search"
-                      :empty-message="unit.msg.empty"
-                      @update:model-value="(value) => onUnitChanged(value, setFieldValue)"
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="specialistId">Specialist</Label>
-            <Field id="specialistId" :errors="errors">
-              <FormField v-slot="{ componentField }" name="specialistId">
-                <FormItem>
-                  <FormControl>
-                    <Combobox
-                      id="specialistId" :disabled="!values.unitId" v-bind="componentField" :items="specialist.items"
-                      :placeholder="specialist.msg.placeholder" :search-placeholder="specialist.msg.search"
-                      :empty-message="specialist.msg.empty"
-                      />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-        </div>
-      </div>
-
-      <div class="flex justify-end gap-2 mt-4">
-        <Button type="button" variant="outline" @click="onCancelForm({ resetForm })">
-          Batal
-        </Button>
-        <Button type="submit">
-          Simpan
-        </Button>
-      </div>
-    </form>
-  </Form>
+  <form id="form-specialist" @submit.prevent>
+    <Block labelSize="thin" class="!mb-2.5 !pt-0 xl:!mb-3" :colCount="1">
+      <Cell>
+        <Label height="compact">Kode</Label>
+        <Field :errMessage="errors.code">
+          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Nama</Label>
+        <Field :errMessage="errors.name">
+          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Spesialis</Label>
+        <Field :errMessage="errors.specialist">
+          <!-- <Combobox
+            id="specialis"
+            placeholder="Pilih spesialis"
+            search-placeholder="Cari spesialis"
+            empty-message="Spesialis tidak ditemukan"
+            v-model="specialist"
+            v-bind="specialistAttrs"
+            :items="specialists"
+            :disabled="isLoading || isReadonly"
+          /> -->
+          <Select
+            id="specialist"
+            icon-name="i-lucide-chevron-down"
+            placeholder="Pilih spesialis"
+            v-model="specialist"
+            v-bind="specialistAttrs"
+            :items="specialists"
+            :disabled="isLoading || isReadonly"
+          />
+        </Field>
+      </Cell>
+    </Block>
+    <div class="my-2 flex justify-end gap-2 py-2">
+      <Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
+      <Button
+        v-if="!isReadonly"
+        type="button"
+        class="w-[120px]"
+        :disabled="isLoading || !meta.valid"
+        @click="onSubmitForm"
+      >
+        Simpan
+      </Button>
+    </div>
+  </form>
 </template>
diff --git a/app/components/app/subspecialist/list-cfg.ts b/app/components/app/subspecialist/list-cfg.ts
index eb25f5d0..c7ded48e 100644
--- a/app/components/app/subspecialist/list-cfg.ts
+++ b/app/components/app/subspecialist/list-cfg.ts
@@ -10,14 +10,13 @@ import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-ud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 
-export const cols: Col[] = [{ width: 100 }, {}, {}, {}, { width: 50 }]
+export const cols: Col[] = [{}, {}, {}, { width: 50 }]
 
-export const header: Th[][] = [
-  [{ label: 'Id' }, { label: 'Nama' }, { label: 'Kode' }, { label: 'Specialist' }, { label: '' }],
-]
-export const keys = ['id', 'name', 'cellphone', 'religion_code', 'action']
+export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Specialis' }, { label: '' }]]
+
+export const keys = ['code', 'name', 'specialist', 'action']
 
 export const delKeyNames: KeyLabel[] = [
   { key: 'code', label: 'Kode' },
@@ -27,15 +26,11 @@ export const delKeyNames: KeyLabel[] = [
 export const funcParsed: RecStrFuncUnknown = {
   name: (rec: unknown): unknown => {
     const recX = rec as SmallDetailDto
-    return `${recX.firstName} ${recX.lastName || ''}`.trim()
-  },
-  unit: (rec: unknown): unknown => {
-    const recX = rec as SmallDetailDto
-    return recX.unit?.name || '-'
+    return `${recX.name}`.trim()
   },
   specialist: (rec: unknown): unknown => {
     const recX = rec as SmallDetailDto
-    return recX.specialist?.name || '-'
+    return recX.specialist_id || '-'
   },
 }
 
@@ -45,9 +40,6 @@ export const funcComponent: RecStrFuncComponent = {
       idx,
       rec: rec as object,
       component: action,
-      props: {
-        size: 'sm',
-      },
     }
     return res
   },
diff --git a/app/components/app/subspecialist/list.vue b/app/components/app/subspecialist/list.vue
index e9489ef1..cde2a4ce 100644
--- a/app/components/app/subspecialist/list.vue
+++ b/app/components/app/subspecialist/list.vue
@@ -22,10 +22,15 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubBaseDataTable
-      :rows="data" :cols="cols" :header="header" :keys="keys" :func-parsed="funcParsed"
-      :func-html="funcHtml" :func-component="funcComponent" :skeleton-size="paginationMeta?.pageSize"
+      :rows="data"
+      :cols="cols"
+      :header="header"
+      :keys="keys"
+      :func-parsed="funcParsed"
+      :func-html="funcHtml"
+      :func-component="funcComponent"
+      :skeleton-size="paginationMeta?.pageSize"
     />
-
     <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
   </div>
 </template>
diff --git a/app/components/app/tools/entry-form.vue b/app/components/app/tools/entry-form.vue
index f888c518..ac19794b 100644
--- a/app/components/app/tools/entry-form.vue
+++ b/app/components/app/tools/entry-form.vue
@@ -6,7 +6,7 @@ import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
 import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 
 // Types
-import type { DeviceFormData } from '~/schemas/device.schema'
+import type { DeviceFormData } from '~/schemas/device.schema.ts'
 
 // Helpers
 import type z from 'zod'
diff --git a/app/components/app/unit/entry-form-prev.vue b/app/components/app/unit/entry-form-prev.vue
new file mode 100644
index 00000000..463a6683
--- /dev/null
+++ b/app/components/app/unit/entry-form-prev.vue
@@ -0,0 +1,125 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
+import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
+import Field from '~/components/pub/custom-ui/form/field.vue'
+import Label from '~/components/pub/custom-ui/form/label.vue'
+
+interface UnitFormData {
+  name: string
+  code: string
+  parentId: string
+}
+
+const props = defineProps<{
+  unit: {
+    msg: {
+      placeholder: string
+      search: string
+      empty: string
+    }
+    items: {
+      value: string
+      label: string
+      code: string
+    }[]
+  }
+  schema: any
+  initialValues?: Partial<UnitFormData>
+  errors?: FormErrors
+}>()
+
+const emit = defineEmits<{
+  'submit': [values: UnitFormData, resetForm: () => void]
+  'cancel': [resetForm: () => void]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: UnitFormData = {
+    name: values.name || '',
+    code: values.code || '',
+    parentId: values.parentId || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+</script>
+
+<template>
+  <Form
+    v-slot="{ handleSubmit, resetForm }" as="" keep-values :validation-schema="formSchema"
+    :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-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+          <FieldGroup>
+            <Label label-for="name">Nama</Label>
+            <Field id="name" :errors="errors">
+              <FormField v-slot="{ componentField }" name="name">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="name" type="text" placeholder="Masukkan nama unit" autocomplete="off"
+                      v-bind="componentField"
+                      />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="code">Kode</Label>
+            <Field id="code" :errors="errors">
+              <FormField v-slot="{ componentField }" name="code">
+                <FormItem>
+                  <FormControl>
+                    <Input id="code" type="text" placeholder="Masukkan kode unit" autocomplete="off" v-bind="componentField" />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+
+          <FieldGroup>
+            <Label label-for="parentId">Instalasi</Label>
+            <Field id="parentId" :errors="errors">
+              <FormField v-slot="{ componentField }" name="parentId">
+                <FormItem>
+                  <FormControl>
+                    <Combobox
+                      id="parentId" v-bind="componentField" :items="unit.items"
+                      :placeholder="unit.msg.placeholder" :search-placeholder="unit.msg.search"
+                      :empty-message="unit.msg.empty"
+                      />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </FieldGroup>
+        </div>
+      </div>
+
+      <div class="flex justify-end gap-2 mt-4">
+        <Button type="button" variant="outline" @click="onCancelForm({ resetForm })">
+          Batal
+        </Button>
+        <Button type="submit">
+          Simpan
+        </Button>
+      </div>
+    </form>
+  </Form>
+</template>
diff --git a/app/components/app/unit/entry-form.vue b/app/components/app/unit/entry-form.vue
index ae710a2b..7bad3552 100644
--- a/app/components/app/unit/entry-form.vue
+++ b/app/components/app/unit/entry-form.vue
@@ -1,126 +1,102 @@
 <script setup lang="ts">
-import type { FormErrors } from '~/types/error'
-import { toTypedSchema } from '@vee-validate/zod'
-import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
-import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
-import Field from '~/components/pub/custom-ui/form/field.vue'
-import Label from '~/components/pub/custom-ui/form/label.vue'
-import { Form } from '~/components/pub/ui/form'
+// Components
+import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
+import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 
-interface UnitFormData {
-  name: string
-  code: string
-  parentId: string
+// Types
+import type { UnitFormData } from '~/schemas/unit.schema.ts'
+
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  values: any
+  isLoading?: boolean
+  isReadonly?: boolean
 }
 
-const props = defineProps<{
-  unit: {
-    msg: {
-      placeholder: string
-      search: string
-      empty: string
-    }
-    items: {
-      value: string
-      label: string
-      code: string
-    }[]
-  }
-  schema: any
-  initialValues?: Partial<UnitFormData>
-  errors?: FormErrors
-}>()
-
+const props = defineProps<Props>()
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const emit = defineEmits<{
-  'submit': [values: UnitFormData, resetForm: () => void]
-  'cancel': [resetForm: () => void]
+  submit: [values: UnitFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
 }>()
 
-const formSchema = toTypedSchema(props.schema)
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    code: '',
+    name: '',
+    installation: '',
+  } as Partial<UnitFormData>,
+})
+
+const [code, codeAttrs] = defineField('code')
+const [name, nameAttrs] = defineField('name')
+const [installation, installationAttrs] = defineField('installation')
+
+// Fill fields from props.values if provided
+if (props.values) {
+  if (props.values.code !== undefined) code.value = props.values.code
+  if (props.values.name !== undefined) name.value = props.values.name
+  if (props.values.installation !== undefined) installation.value = props.values.installation
+}
+
+const resetForm = () => {
+  code.value = ''
+  name.value = ''
+  installation.value = ''
+}
 
 // Form submission handler
-function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+function onSubmitForm(values: any) {
   const formData: UnitFormData = {
-    name: values.name || '',
-    code: values.code || '',
-    parentId: values.parentId || '',
+    name: name.value || '',
+    code: code.value || '',
+    installation: installation.value || '',
   }
   emit('submit', formData, resetForm)
 }
 
 // Form cancel handler
-function onCancelForm({ resetForm }: { resetForm: () => void }) {
+function onCancelForm() {
   emit('cancel', resetForm)
 }
 </script>
 
 <template>
-  <Form
-    v-slot="{ handleSubmit, resetForm }" as="" keep-values :validation-schema="formSchema"
-    :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-3 text-lg xl:text-xl">
-        <div class="flex flex-col justify-between">
-          <FieldGroup>
-            <Label label-for="name">Nama</Label>
-            <Field id="name" :errors="errors">
-              <FormField v-slot="{ componentField }" name="name">
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      id="name" type="text" placeholder="Masukkan nama unit" autocomplete="off"
-                      v-bind="componentField"
-                      />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="code">Kode</Label>
-            <Field id="code" :errors="errors">
-              <FormField v-slot="{ componentField }" name="code">
-                <FormItem>
-                  <FormControl>
-                    <Input id="code" type="text" placeholder="Masukkan kode unit" autocomplete="off" v-bind="componentField" />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-
-          <FieldGroup>
-            <Label label-for="parentId">Instalasi</Label>
-            <Field id="parentId" :errors="errors">
-              <FormField v-slot="{ componentField }" name="parentId">
-                <FormItem>
-                  <FormControl>
-                    <Combobox
-                      id="parentId" v-bind="componentField" :items="unit.items"
-                      :placeholder="unit.msg.placeholder" :search-placeholder="unit.msg.search"
-                      :empty-message="unit.msg.empty"
-                      />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-            </Field>
-          </FieldGroup>
-        </div>
-      </div>
-
-      <div class="flex justify-end gap-2 mt-4">
-        <Button type="button" variant="outline" @click="onCancelForm({ resetForm })">
-          Batal
-        </Button>
-        <Button type="submit">
-          Simpan
-        </Button>
-      </div>
-    </form>
-  </Form>
+  <form id="form-unit" @submit.prevent>
+    <Block labelSize="thin" class="!mb-2.5 !pt-0 xl:!mb-3" :colCount="1">
+      <Cell>
+        <Label height="compact">Kode</Label>
+        <Field :errMessage="errors.code">
+          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+      <Cell>
+        <Label height="compact">Nama</Label>
+        <Field :errMessage="errors.name">
+          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
+        </Field>
+      </Cell>
+    </Block>
+    <div class="my-2 flex justify-end gap-2 py-2">
+      <Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
+      <Button
+        v-if="!isReadonly"
+        type="button"
+        class="w-[120px]"
+        :disabled="isLoading || !meta.valid"
+        @click="onSubmitForm"
+      >
+        Simpan
+      </Button>
+    </div>
+  </form>
 </template>
diff --git a/app/components/app/unit/list-cfg.ts b/app/components/app/unit/list-cfg.ts
index 00423066..a6f5ffc7 100644
--- a/app/components/app/unit/list-cfg.ts
+++ b/app/components/app/unit/list-cfg.ts
@@ -10,33 +10,13 @@ import { defineAsyncComponent } from 'vue'
 
 type SmallDetailDto = any
 
-const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-ud.vue'))
+const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/data/dropdown-action-dud.vue'))
 
-export const cols: Col[] = [
-  { width: 100 },
-  { },
-  { },
-  { },
-  { width: 50 },
-]
+export const cols: Col[] = [{}, {}, {}, { width: 50 }]
 
-export const header: Th[][] = [
-  [
-    { label: 'Id' },
-    { label: 'Nama' },
-    { label: 'Kode' },
-    { label: 'Instalasi' },
-    { label: '' },
-  ],
-]
+export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Instalasi' }, { label: '' }]]
 
-export const keys = [
-  'id',
-  'firstName',
-  'cellphone',
-  'birth_place',
-  'action',
-]
+export const keys = ['code', 'name', 'installation', 'action']
 
 export const delKeyNames: KeyLabel[] = [
   { key: 'code', label: 'Kode' },
@@ -46,22 +26,10 @@ export const delKeyNames: KeyLabel[] = [
 export const funcParsed: RecStrFuncUnknown = {
   name: (rec: unknown): unknown => {
     const recX = rec as SmallDetailDto
-    return `${recX.frontTitle} ${recX.name}  ${recX.endTitle}`.trim()
+    return `${recX.name}`.trim()
   },
-  identity_number: (rec: unknown): unknown => {
-    const recX = rec as SmallDetailDto
-    if (recX.identity_number?.substring(0, 5) === 'BLANK') {
-      return '(TANPA NIK)'
-    }
-    return recX.identity_number
-  },
-  inPatient_itemPrice: (rec: unknown): unknown => {
-    const recX = rec as SmallDetailDto
-    return Number(recX.inPatient_itemPrice.price).toLocaleString('id-ID')
-  },
-  outPatient_itemPrice: (rec: unknown): unknown => {
-    const recX = rec as SmallDetailDto
-    return Number(recX.outPatient_itemPrice.price).toLocaleString('id-ID')
+  installation: (_rec: unknown): unknown => {
+    return '-'
   },
 }
 
@@ -71,16 +39,9 @@ export const funcComponent: RecStrFuncComponent = {
       idx,
       rec: rec as object,
       component: action,
-      props: {
-        size: 'sm',
-      },
     }
     return res
   },
 }
 
-export const funcHtml: RecStrFuncUnknown = {
-  patient_address(_rec) {
-    return '-'
-  },
-}
+export const funcHtml: RecStrFuncUnknown = {}
diff --git a/app/components/app/unit/list.vue b/app/components/app/unit/list.vue
index e9489ef1..cde2a4ce 100644
--- a/app/components/app/unit/list.vue
+++ b/app/components/app/unit/list.vue
@@ -22,10 +22,15 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubBaseDataTable
-      :rows="data" :cols="cols" :header="header" :keys="keys" :func-parsed="funcParsed"
-      :func-html="funcHtml" :func-component="funcComponent" :skeleton-size="paginationMeta?.pageSize"
+      :rows="data"
+      :cols="cols"
+      :header="header"
+      :keys="keys"
+      :func-parsed="funcParsed"
+      :func-html="funcHtml"
+      :func-component="funcComponent"
+      :skeleton-size="paginationMeta?.pageSize"
     />
-
     <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
   </div>
 </template>
diff --git a/app/components/app/uom/entry-form.vue b/app/components/app/uom/entry-form.vue
index 3bf95352..23c8ae0d 100644
--- a/app/components/app/uom/entry-form.vue
+++ b/app/components/app/uom/entry-form.vue
@@ -8,7 +8,7 @@ import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 import Button from '~/components/pub/ui/button/Button.vue'
 
 // Types
-import type { UomFormData } from '~/schemas/uom.schema'
+import type { UomFormData } from '~/schemas/uom.schema.ts'
 
 // Helpers
 import type z from 'zod'
diff --git a/app/components/content/device/entry.vue b/app/components/content/device/entry.vue
deleted file mode 100644
index 79a5b022..00000000
--- a/app/components/content/device/entry.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<script setup lang="ts">
-import { z, ZodError } from 'zod'
-import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
-
-const errors = ref({})
-const data = ref({
-  code: '',
-  name: '',
-  type: '',
-})
-
-const schema = z.object({
-  code: z.string().min(1, 'Code must be at least 1 characters long'),
-  name: z.string().min(1, 'Name must be at least 1 characters long'),
-  type: z.string(),
-})
-
-function onClick(type: string) {
-  if (type === 'cancel') {
-    navigateTo('/tools-equipment-src/device')
-  } else if (type === 'draft') {
-    // do something
-  } else if (type === 'submit') {
-    // do something
-    const input = data.value
-    console.log(input)
-    const errorsParsed: any = {}
-    try {
-      const result = schema.safeParse(input)
-      if (!result.success) {
-        // You can handle the error here, e.g. show a message
-        const errorsCaptures = result?.error?.errors || []
-        const errorMessage = result.error.errors[0]?.message ?? 'Validation error occurred'
-        errorsCaptures.forEach((value: any) => {
-          const keyName = value?.path?.length > 0 ? value.path[0] : 'key'
-          errorsParsed[keyName as string] = value.message || ''
-        })
-        console.log(errorMessage)
-      }
-    } catch (e) {
-      if (e instanceof ZodError) {
-        const jsonError = e.flatten()
-        console.log(JSON.stringify(jsonError, null, 2))
-      }
-    }
-    setTimeout(() => {
-      errors.value = errorsParsed
-    }, 0)
-  }
-}
-</script>
-
-<template>
-  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
-    <Icon name="i-lucide-paint-bucket" class="me-2" />
-    <span class="font-semibold">Tambah</span> Alat Kesehatan
-  </div>
-  <AppDeviceEntryForm v-model="data" :errors="errors" />
-  <div class="my-2 flex justify-end py-2">
-    <Action @click="onClick" />
-  </div>
-</template>
diff --git a/app/components/content/device/list.vue b/app/components/content/device/list.vue
deleted file mode 100644
index 8c7bd672..00000000
--- a/app/components/content/device/list.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-
-const data = ref([])
-
-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: 'Alat Kesehatan',
-  icon: 'i-lucide-paint-bucket',
-  addNav: {
-    label: 'Tambah',
-    onClick: () => navigateTo('/tools-equipment-src/device/add'),
-  },
-}
-
-async function getMaterialList() {
-  isLoading.dataListLoading = true
-
-  const resp = await xfetch('/api/v1/device')
-  if (resp.success) {
-    data.value = (resp.body as Record<string, any>).data
-  }
-
-  isLoading.dataListLoading = false
-}
-
-onMounted(() => {
-  getMaterialList()
-})
-
-provide('rec_id', recId)
-provide('rec_action', recAction)
-provide('rec_item', recItem)
-provide('table_data_loader', isLoading)
-</script>
-
-<template>
-  <div class="rounded-md border p-4">
-    <Header :prep="{ ...headerPrep }" :ref-search-nav="refSearchNav" />
-    <div class="rounded-md border p-4">
-      <AppMaterialList v-if="!isLoading.dataListLoading" :data="data" />
-    </div>
-  </div>
-</template>
diff --git a/app/components/content/division/list-prev.vue b/app/components/content/division/list-prev.vue
new file mode 100644
index 00000000..f7bd1c8d
--- /dev/null
+++ b/app/components/content/division/list-prev.vue
@@ -0,0 +1,208 @@
+<script setup lang="ts">
+import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import AppDivisionEntryForm from '~/components/app/division/entry-form.vue'
+import Dialog from '~/components/pub/base/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/custom-ui/data/types'
+import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { divisionConf, divisionTreeConfig, schema } from './entry'
+// #region State & Computed
+// Dialog state
+const isFormEntryDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+
+// Table action rowId provider
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+async function fetchDivisionData(_params: any) {
+  const endpoint = '/api/v1/_dev/division/list'
+  return await xfetch(endpoint)
+}
+
+// Menggunakan composable untuk pagination
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getDivisionList,
+} = usePaginatedList({
+  fetchFn: fetchDivisionData,
+  entityName: 'division',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Divisi',
+  icon: 'i-lucide-box',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (_val: string) => {
+      // Handle search input - this will be triggered by the header component
+    },
+    onClick: () => {
+      // Handle search button click if needed
+    },
+    onClear: () => {
+      // Handle search clear
+    },
+  },
+  addNav: {
+    label: 'Tambah Divisi',
+    icon: 'i-lucide-send',
+    onClick: () => {
+      isFormEntryDialogOpen.value = true
+    },
+  },
+}
+
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Functions
+
+async function handleDeleteRow(record: any) {
+  try {
+    // TODO : hit backend request untuk delete
+    console.log('Deleting record:', record)
+
+    // Simulate API call
+    // const response = await xfetch(`/api/v1/division/${record.id}`, {
+    //   method: 'DELETE'
+    // })
+
+    // Refresh data setelah berhasil delete
+    await getDivisionList()
+
+    // TODO: Show success message
+    console.log('Record deleted successfully')
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    // TODO: Show error message
+  } finally {
+    // Reset record state
+    recId.value = 0
+    recAction.value = ''
+    recItem.value = null
+  }
+}
+
+// #endregion region
+
+// #region Form event handlers
+
+function onCancelForm(resetForm: () => void) {
+  isFormEntryDialogOpen.value = false
+  setTimeout(() => {
+    resetForm()
+  }, 500)
+}
+
+async function onSubmitForm(values: any, resetForm: () => void) {
+  let isSuccess = false
+  try {
+    // TODO: Implement form submission logic
+    console.log('Form submitted:', values)
+
+    // Simulate API call
+    // const response = await xfetch('/api/v1/division', {
+    //   method: 'POST',
+    //   body: JSON.stringify(values)
+    // })
+
+    // If successful, mark as success and close dialog
+    isFormEntryDialogOpen.value = false
+    isSuccess = true
+
+    // Refresh data after successful submission
+    await getDivisionList()
+
+    // TODO: Show success message
+    console.log('Division created successfully')
+  } catch (error: unknown) {
+    console.warn('Error submitting form:', error)
+    isSuccess = false
+    // Don't close dialog or reset form on error
+    // TODO: Show error message to user
+  } finally {
+    if (isSuccess) {
+      setTimeout(() => {
+        resetForm()
+      }, 500)
+    }
+  }
+}
+// #endregion
+
+// #region Watchers
+
+// Watch for row actions
+watch(recId, () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      // TODO: Handle edit action
+      // isFormEntryDialogOpen.value = true
+      break
+    case ActionEvents.showConfirmDelete:
+      // Trigger confirmation modal open
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+// Handle confirmation result
+function handleConfirmDelete(record: any, action: string) {
+  console.log('Confirmed action:', action, 'for record:', record)
+  handleDeleteRow(record)
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+// #endregion
+</script>
+
+<template>
+  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+  <AppDivisonList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+  <Dialog v-model:open="isFormEntryDialogOpen" title="Tambah Divisi" size="lg" prevent-outside>
+
+    <AppDivisionEntryFormPrev
+      :division="divisionConf" :division-tree="divisionTreeConfig" :schema="schema"
+      :initial-values="{ name: '', code: '', parentId: '' }" @submit="onSubmitForm" @cancel="onCancelForm"
+    />
+
+  </Dialog>
+
+  <!-- Record Confirmation Modal -->
+  <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>
+</template>
+
+<style scoped>
+/* component style */
+</style>
diff --git a/app/components/content/division/list.vue b/app/components/content/division/list.vue
index 856318b9..0acae66d 100644
--- a/app/components/content/division/list.vue
+++ b/app/components/content/division/list.vue
@@ -1,28 +1,39 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
-import AppDivisionEntryForm from '~/components/app/divison/entry-form.vue'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import AppDivisionList from '~/components/app/division/list.vue'
+import AppDivisionEntryForm from '~/components/app/division/entry-form.vue'
+
+// Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
-import { divisionConf, divisionTreeConfig, schema } from './entry'
-// #region State & Computed
-// Dialog state
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
+import { toast } from '~/components/pub/ui/toast'
 
-// Table action rowId provider
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { DivisionSchema, type DivisionFormData } from '~/schemas/division.schema'
 
-async function fetchDivisionData(_params: any) {
-  const endpoint = '/api/v1/_dev/division/list'
-  return await xfetch(endpoint)
-}
+// Handlers
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/division.handler'
+
+// Services
+import { getDivisions, getDivisionDetail } from '~/services/division.service'
+
+const title = ref('')
 
-// Menggunakan composable untuk pagination
 const {
   data,
   isLoading,
@@ -32,7 +43,10 @@ const {
   handleSearch,
   fetchData: getDivisionList,
 } = usePaginatedList({
-  fetchFn: fetchDivisionData,
+  fetchFn: async ({ page, search }) => {
+    const result = await getDivisions({ search, page })
+    return { success: result.success || false, body: result.body || {} }
+  },
   entityName: 'division',
 })
 
@@ -44,21 +58,20 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {
-      // Handle search input - this will be triggered by the header component
-    },
-    onClick: () => {
-      // Handle search button click if needed
-    },
-    onClear: () => {
-      // Handle search clear
+    onInput: (value: string) => {
+      searchInput.value = value
     },
+    onClick: () => {},
+    onClear: () => {},
   },
   addNav: {
-    label: 'Tambah Divisi',
-    icon: 'i-lucide-send',
+    label: 'Tambah',
+    icon: 'i-lucide-plus',
     onClick: () => {
+      recItem.value = null
+      recId.value = 0
       isFormEntryDialogOpen.value = true
+      isReadonly.value = false
     },
   },
 }
@@ -67,142 +80,83 @@ provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
-// #endregion
 
-// #region Functions
-
-async function handleDeleteRow(record: any) {
-  try {
-    // TODO : hit backend request untuk delete
-    console.log('Deleting record:', record)
-
-    // Simulate API call
-    // const response = await xfetch(`/api/v1/division/${record.id}`, {
-    //   method: 'DELETE'
-    // })
-
-    // Refresh data setelah berhasil delete
-    await getDivisionList()
-
-    // TODO: Show success message
-    console.log('Record deleted successfully')
-  } catch (error) {
-    console.error('Error deleting record:', error)
-    // TODO: Show error message
-  } finally {
-    // Reset record state
-    recId.value = 0
-    recAction.value = ''
-    recItem.value = null
+const getCurrentDivisionDetail = async (id: number | string) => {
+  const result = await getDivisionDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
   }
 }
 
-// #endregion region
-
-// #region Form event handlers
-
-function onCancelForm(resetForm: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    resetForm()
-  }, 500)
-}
-
-async function onSubmitForm(values: any, resetForm: () => void) {
-  let isSuccess = false
-  try {
-    // TODO: Implement form submission logic
-    console.log('Form submitted:', values)
-
-    // Simulate API call
-    // const response = await xfetch('/api/v1/division', {
-    //   method: 'POST',
-    //   body: JSON.stringify(values)
-    // })
-
-    // If successful, mark as success and close dialog
-    isFormEntryDialogOpen.value = false
-    isSuccess = true
-
-    // Refresh data after successful submission
-    await getDivisionList()
-
-    // TODO: Show success message
-    console.log('Division created successfully')
-  } catch (error: unknown) {
-    console.warn('Error submitting form:', error)
-    isSuccess = false
-    // Don't close dialog or reset form on error
-    // TODO: Show error message to user
-  } finally {
-    if (isSuccess) {
-      setTimeout(() => {
-        resetForm()
-      }, 500)
-    }
-  }
-}
-// #endregion
-
-// #region Watchers
-
-// Watch for row actions
-watch(recId, () => {
+// Watch for row actions when recId or recAction changes
+watch([recId, recAction], () => {
   switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getCurrentDivisionDetail(recId.value)
+      title.value = 'Detail Divisi'
+      isReadonly.value = true
+      break
     case ActionEvents.showEdit:
-      // TODO: Handle edit action
-      // isFormEntryDialogOpen.value = true
+      getCurrentDivisionDetail(recId.value)
+      title.value = 'Edit Divisi'
+      isReadonly.value = false
       break
     case ActionEvents.showConfirmDelete:
-      // Trigger confirmation modal open
       isRecordConfirmationOpen.value = true
       break
   }
 })
 
-// Handle confirmation result
-function handleConfirmDelete(record: any, action: string) {
-  console.log('Confirmed action:', action, 'for record:', record)
-  handleDeleteRow(record)
-}
-
-function handleCancelConfirmation() {
-  // Reset record state when cancelled
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-// #endregion
+onMounted(async () => {
+  await getDivisionList()
+})
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
-  <AppDivisonList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
-
-  <Dialog v-model:open="isFormEntryDialogOpen" title="Tambah Divisi" size="lg" prevent-outside>
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
+  <AppDivisionList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
+  <Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Divisi'" size="lg" prevent-outside>
     <AppDivisionEntryForm
-      :division="divisionConf" :division-tree="divisionTreeConfig" :schema="schema"
-      :initial-values="{ name: '', code: '', parentId: '' }" @submit="onSubmitForm" @cancel="onCancelForm"
+      :schema="DivisionSchema"
+      :values="recItem"
+      :is-loading="isProcessing"
+      :is-readonly="isReadonly"
+      @submit="
+        (values: DivisionFormData | Record<string, any>, resetForm: () => void) => {
+          if (recId > 0) {
+            handleActionEdit(recId, values, getDivisionList, resetForm, toast)
+            return
+          }
+          handleActionSave(values, getDivisionList, resetForm, toast)
+        }
+      "
+      @cancel="handleCancelForm"
     />
-
   </Dialog>
 
   <!-- Record Confirmation Modal -->
   <RecordConfirmation
-      v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
-      @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation"
-    >
+    v-model:open="isRecordConfirmationOpen"
+    action="delete"
+    :record="recItem"
+    @confirm="() => handleActionRemove(recId, getDivisionList, toast)"
+    @cancel=""
+  >
     <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>
+        <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>
-
-<style scoped>
-/* component style */
-</style>
diff --git a/app/components/content/equipment/list.vue b/app/components/content/equipment/list.vue
index 37f2536a..b1b348d1 100644
--- a/app/components/content/equipment/list.vue
+++ b/app/components/content/equipment/list.vue
@@ -2,8 +2,9 @@
 // Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import AppEquipmentEntryForm from '~/components/app/equipment/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import AppEquipmentList from '~/components/app/equipment/list.vue'
+import AppEquipmentEntryForm from '~/components/app/equipment/entry-form.vue'
 
 // Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
@@ -60,15 +61,11 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {
-      // Handle search input - this will be triggered by the header component
-    },
-    onClick: () => {
-      // Handle search button click if needed
-    },
-    onClear: () => {
-      // Handle search clear
+    onInput: (value: string) => {
+      searchInput.value = value
     },
+    onClick: () => {},
+    onClear: () => {},
   },
   addNav: {
     label: 'Tambah Perlengkapan',
@@ -130,7 +127,13 @@ onMounted(async () => {
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" class="mb-4 xl:mb-5" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    @search="handleSearch"
+    :ref-search-nav="headerPrep.refSearchNav"
+    class="mb-4 xl:mb-5"
+  />
   <AppEquipmentList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
   <Dialog
diff --git a/app/components/content/material/entry.vue b/app/components/content/material/entry.vue
deleted file mode 100644
index 3fa3bfd2..00000000
--- a/app/components/content/material/entry.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<script setup lang="ts">
-// types
-import type { MaterialFormData } from '~/schemas/material.schema'
-import { MaterialSchema } from '~/schemas/material.schema'
-
-const isLoading = ref(false)
-const uoms = [
-  { value: 'uom-1', label: 'Satuan 1' },
-  { value: 'uom-2', label: 'Satuan 2' },
-  { value: 'uom-3', label: 'Satuan 3' },
-]
-const items = [
-  { value: 'item-1', label: 'Item 1' },
-  { value: 'item-2', label: 'Item 2' },
-  { value: 'item-3', label: 'Item 3' },
-]
-
-function onBack() {
-  navigateTo('/tools-equipment-src/equipment')
-}
-
-async function onSubmit(data: MaterialFormData) {
-  console.log(data)
-}
-</script>
-
-<template>
-  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
-    <Icon name="i-lucide-panel-bottom" class="me-2" />
-    <span class="font-semibold">Tambah</span> Perlengkapan (BMHP)
-  </div>
-  <AppMaterialEntryForm :is-loading="isLoading" :schema="MaterialSchema" :uoms="uoms" :items="items" @back="onBack"
-    @submit="onSubmit" />
-</template>
diff --git a/app/components/content/material/list.vue b/app/components/content/material/list.vue
deleted file mode 100644
index fa719f46..00000000
--- a/app/components/content/material/list.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-
-const data = ref([])
-
-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: 'Perlengkapan (BMHP)',
-  icon: 'i-lucide-panel-bottom',
-  addNav: {
-    label: 'Tambah',
-    onClick: () => navigateTo('/tools-equipment-src/equipment/add'),
-  },
-}
-
-async function getMaterialList() {
-  isLoading.dataListLoading = true
-
-  // const resp = await xfetch('/api/v1/material')
-  // if (resp.success) {
-  //   data.value = (resp.body as Record<string, any>).data
-  // }
-
-  isLoading.dataListLoading = false
-}
-
-onMounted(() => {
-  getMaterialList()
-})
-
-provide('rec_id', recId)
-provide('rec_action', recAction)
-provide('rec_item', recItem)
-provide('table_data_loader', isLoading)
-</script>
-
-<template>
-  <div class="rounded-md border p-4">
-    <Header :prep="{ ...headerPrep }" :ref-search-nav="refSearchNav" />
-    <div class="rounded-md border p-4">
-      <AppMaterialList v-if="!isLoading.dataListLoading" :data="data" />
-    </div>
-  </div>
-</template>
diff --git a/app/components/content/medicine-group/list.vue b/app/components/content/medicine-group/list.vue
index 5d3240bc..d56c4c49 100644
--- a/app/components/content/medicine-group/list.vue
+++ b/app/components/content/medicine-group/list.vue
@@ -2,8 +2,9 @@
 // Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import AppMedicineGroupEntryForm from '~/components/app/medicine-group/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import AppMedicineGroupList from '~/components/app/medicine-group/list.vue'
+import AppMedicineGroupEntryForm from '~/components/app/medicine-group/entry-form.vue'
 
 // Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
@@ -11,7 +12,7 @@ import { toast } from '~/components/pub/ui/toast'
 
 // Types
 import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
-import { MedicineBaseSchema, type MedicineBaseFormData } from '~/schemas/medicine.schema'
+import { BaseSchema, type BaseFormData } from '~/schemas/base.schema'
 
 // Handlers
 import {
@@ -57,7 +58,9 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {},
+    onInput: (value: string) => {
+      searchInput.value = value
+    },
     onClick: () => {},
     onClear: () => {},
   },
@@ -112,7 +115,13 @@ onMounted(async () => {
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" class="mb-4 xl:mb-5" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
   <AppMedicineGroupList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
   <Dialog
@@ -122,12 +131,12 @@ onMounted(async () => {
     prevent-outside
   >
     <AppMedicineGroupEntryForm
-      :schema="MedicineBaseSchema"
+      :schema="BaseSchema"
       :values="recItem"
       :is-loading="isProcessing"
       :is-readonly="isReadonly"
       @submit="
-        (values: MedicineBaseFormData | Record<string, any>, resetForm: () => void) => {
+        (values: BaseFormData | Record<string, any>, resetForm: () => void) => {
           if (recId > 0) {
             handleActionEdit(recId, values, getMedicineGroupList, resetForm, toast)
             return
diff --git a/app/components/content/medicine-method/list.vue b/app/components/content/medicine-method/list.vue
index c88920bf..1de41ddc 100644
--- a/app/components/content/medicine-method/list.vue
+++ b/app/components/content/medicine-method/list.vue
@@ -2,8 +2,9 @@
 // Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import AppMedicineMethodEntryForm from '~/components/app/medicine-method/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import AppMedicineMethodList from '~/components/app/medicine-method/list.vue'
+import AppMedicineMethodEntryForm from '~/components/app/medicine-method/entry-form.vue'
 
 // Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
@@ -11,7 +12,7 @@ import { toast } from '~/components/pub/ui/toast'
 
 // Types
 import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
-import { MedicineBaseSchema, type MedicineBaseFormData } from '~/schemas/medicine.schema'
+import { BaseSchema, type BaseFormData } from '~/schemas/base.schema'
 
 // Handlers
 import {
@@ -57,7 +58,9 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {},
+    onInput: (value: string) => {
+      searchInput.value = value
+    },
     onClick: () => {},
     onClear: () => {},
   },
@@ -112,7 +115,13 @@ onMounted(async () => {
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" class="mb-4 xl:mb-5" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
   <AppMedicineMethodList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
   <Dialog
@@ -122,12 +131,12 @@ onMounted(async () => {
     prevent-outside
   >
     <AppMedicineMethodEntryForm
-      :schema="MedicineBaseSchema"
+      :schema="BaseSchema"
       :values="recItem"
       :is-loading="isProcessing"
       :is-readonly="isReadonly"
       @submit="
-        (values: MedicineBaseFormData | Record<string, any>, resetForm: () => void) => {
+        (values: BaseFormData | Record<string, any>, resetForm: () => void) => {
           if (recId > 0) {
             handleActionEdit(recId, values, getMedicineMethodList, resetForm, toast)
             return
diff --git a/app/components/content/medicine/list.vue b/app/components/content/medicine/list.vue
index 19497a7e..820931e8 100644
--- a/app/components/content/medicine/list.vue
+++ b/app/components/content/medicine/list.vue
@@ -1,63 +1,206 @@
 <script setup lang="ts">
-import type { DataTableLoader } from '~/components/pub/base/data-table/type'
-import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+// Components
+import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import AppMedicineList from '~/components/app/medicine/list.vue'
+import AppMedicineEntryForm from '~/components/app/medicine/entry-form.vue'
 
-const data = ref([])
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
 
-const refSearchNav: RefSearchNav = {
-  onClick: () => {
-    // open filter modal
-  },
-  onInput: (_val: string) => {
-    // filter patient list
-  },
-  onClear: () => {
-    // clear url param
-  },
-}
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { MedicineSchema, type MedicineFormData } from '~/schemas/medicine.schema'
+import type { MedicineGroup } from '~/models/medicine-group'
+import type { MedicineMethod } from '~/models/medicine-method'
+import type { Uom } from '~/models/uom'
 
-// Loading state management
-const isLoading = reactive<DataTableLoader>({
-  summary: false,
-  isTableLoading: false,
+// Handlers
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/medicine.handler'
+
+// Services
+import { getMedicines, getMedicineDetail } from '~/services/medicine.service'
+import { getMedicineGroups } from '~/services/medicine-group.service'
+import { getMedicineMethods } from '~/services/medicine-method.service'
+import { getUoms } from '~/services/uom.service'
+
+const medicineGroups = ref<{ value: string; label: string }[]>([])
+const medicineMethods = ref<{ value: string; label: string }[]>([])
+const uoms = ref<{ value: string; label: string }[]>([])
+const title = ref('')
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getMedicineList,
+} = usePaginatedList({
+  fetchFn: async ({ page, search }) => {
+    const result = await getMedicines({ search, page })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'medicine',
 })
 
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-
-const hreaderPrep: HeaderPrep = {
+const headerPrep: HeaderPrep = {
   title: 'Obat',
   icon: 'i-lucide-medicine-bottle',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (value: string) => {
+      searchInput.value = value
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
   addNav: {
     label: 'Tambah',
-    onClick: () => navigateTo('/tools-equipment-src/medicine/add'),
+    icon: 'i-lucide-plus',
+    onClick: () => {
+      recItem.value = null
+      recId.value = 0
+      isFormEntryDialogOpen.value = true
+      isReadonly.value = false
+    },
   },
 }
 
-async function getPatientList() {
-  isLoading.isTableLoading = true
-  const resp = await xfetch('/api/v1/medicine')
-  if (resp.success) {
-    data.value = (resp.body as Record<string, any>).data
-  }
-  isLoading.isTableLoading = false
-}
-
-onMounted(() => {
-  getPatientList()
-})
-
 provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
+
+const getCurrentMedicineDetail = async (id: number | string) => {
+  const result = await getMedicineDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
+  }
+}
+
+const getMedicineGroupList = async () => {
+  const result = await getMedicineGroups()
+  if (result.success) {
+    const currentMedicineGroups = result.body?.data || []
+    medicineGroups.value = currentMedicineGroups.map((medicineGroup: MedicineGroup) => ({
+      value: medicineGroup.code,
+      label: medicineGroup.name,
+    }))
+  }
+}
+
+const getMedicineMethodList = async () => {
+  const result = await getMedicineMethods()
+  if (result.success) {
+    const currentMedicineMethods = result.body?.data || []
+    medicineMethods.value = currentMedicineMethods.map((medicineMethod: MedicineMethod) => ({
+      value: medicineMethod.code,
+      label: medicineMethod.name,
+    }))
+  }
+}
+
+const getUomList = async () => {
+  const result = await getUoms()
+  if (result.success) {
+    const currentUoms = result.body?.data || []
+    uoms.value = currentUoms.map((uom: Uom) => ({ value: uom.code || uom.erp_id, label: uom.name }))
+  }
+}
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getCurrentMedicineDetail(recId.value)
+      title.value = 'Detail Obat'
+      isReadonly.value = true
+      break
+    case ActionEvents.showEdit:
+      getCurrentMedicineDetail(recId.value)
+      title.value = 'Edit Obat'
+      isReadonly.value = false
+      break
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+onMounted(async () => {
+  await getMedicineGroupList()
+  await getMedicineMethodList()
+  await getUomList()
+  await getMedicineList()
+})
 </script>
 
 <template>
-  <Header :prep="{ ...hreaderPrep }" :ref-search-nav="refSearchNav" />
-  <div class="my-4 flex flex-1 flex-col gap-4 md:gap-8">
-    <AppMedicineList :data="data" />
-  </div>
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    @search="handleSearch"
+    :ref-search-nav="headerPrep.refSearchNav"
+    class="mb-4 xl:mb-5"
+  />
+  <AppMedicineList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+  <Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Obat'" size="lg" prevent-outside>
+    <AppMedicineEntryForm
+      :schema="MedicineSchema"
+      :values="recItem"
+      :medicineGroups="medicineGroups"
+      :medicineMethods="medicineMethods"
+      :uoms="uoms"
+      :is-loading="isProcessing"
+      :is-readonly="isReadonly"
+      @submit="
+        (values: MedicineFormData | Record<string, any>, resetForm: () => void) => {
+          if (recId > 0) {
+            handleActionEdit(recId, values, getMedicineList, resetForm, toast)
+            return
+          }
+          handleActionSave(values, getMedicineList, resetForm, toast)
+        }
+      "
+      @cancel="handleCancelForm"
+    />
+  </Dialog>
+
+  <!-- Record Confirmation Modal -->
+  <RecordConfirmation
+    v-model:open="isRecordConfirmationOpen"
+    action="delete"
+    :record="recItem"
+    @confirm="() => handleActionRemove(recId, getMedicineList, 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/specialist/list-prev.vue b/app/components/content/specialist/list-prev.vue
new file mode 100644
index 00000000..ee6d7f8b
--- /dev/null
+++ b/app/components/content/specialist/list-prev.vue
@@ -0,0 +1,240 @@
+<script setup lang="ts">
+import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import AppSpecialistEntryForm from '~/components/app/specialist/entry-form.vue'
+import Dialog from '~/components/pub/base/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/custom-ui/data/types'
+import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { createFilteredUnitConf, installationConf, schemaConf, unitConf } from './entry'
+
+// #region State & Computed
+// Dialog state
+const isFormEntryDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+
+// Table action rowId provider
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+// State untuk tracking installation yang dipilih di form
+const selectedInstallationId = ref<string>('')
+
+// Computed untuk filtered unit berdasarkan installation yang dipilih
+const filteredUnitConf = computed(() => {
+  if (!selectedInstallationId.value) {
+    return { ...unitConf, items: [] }
+  }
+  return createFilteredUnitConf(selectedInstallationId.value)
+})
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getSpecialistList,
+} = usePaginatedList({
+  fetchFn: fetchSpecialistData,
+  entityName: 'specialist',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Specialist',
+  icon: 'i-lucide-box',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (_val: string) => {
+      // Handle search input - this will be triggered by the header component
+    },
+    onClick: () => {
+      // Handle search button click if needed
+    },
+    onClear: () => {
+      // Handle search clear
+    },
+  },
+  addNav: {
+    label: 'Tambah Specialist',
+    icon: 'i-lucide-send',
+    onClick: () => {
+      isFormEntryDialogOpen.value = true
+    },
+  },
+}
+
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Functions
+async function fetchSpecialistData(params: any) {
+  const endpoint = transform('/api/v1/patient', params)
+  return await xfetch(endpoint)
+}
+
+async function handleDeleteRow(record: any) {
+  try {
+    // TODO : hit backend request untuk delete
+    console.log('Deleting record:', record)
+
+    // Simulate API call
+    // const response = await xfetch(`/api/v1/Installation/${record.id}`, {
+    //   method: 'DELETE'
+    // })
+
+    // Refresh data setelah berhasil delete
+    await getSpecialistList()
+
+    // TODO: Show success message
+    console.log('Record deleted successfully')
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    // TODO: Show error message
+  } finally {
+    // Reset record state
+    recId.value = 0
+    recAction.value = ''
+    recItem.value = null
+  }
+}
+
+// Handle confirmation result
+function handleConfirmDelete(record: any, action: string) {
+  console.log('Confirmed action:', action, 'for record:', record)
+  handleDeleteRow(record)
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+
+// #endregion region
+
+// #region Form event handlers
+
+function onCancelForm(resetForm: () => void) {
+  isFormEntryDialogOpen.value = false
+  // Reset installation selection ketika form dibatal
+  selectedInstallationId.value = ''
+  setTimeout(() => {
+    resetForm()
+  }, 500)
+}
+
+function onInstallationChanged(installationId: string) {
+  // Update local state untuk trigger re-render filtered units
+  selectedInstallationId.value = installationId
+
+  // The filteredUnitConf computed will automatically update
+  // based on the new selectedInstallationId value
+}
+
+async function onSubmitForm(values: any, resetForm: () => void) {
+  let isSuccess = false
+  try {
+    // TODO: Implement form submission logic
+    console.log('Form submitted:', values)
+
+    // Simulate API call
+    // const response = await xfetch('/api/v1/Installation', {
+    //   method: 'POST',
+    //   body: JSON.stringify(values)
+    // })
+
+    // If successful, mark as success and close dialog
+    isFormEntryDialogOpen.value = false
+    isSuccess = true
+
+    // Reset installation selection ketika form berhasil submit
+    selectedInstallationId.value = ''
+
+    // Refresh data after successful submission
+    await getSpecialistList()
+
+    // TODO: Show success message
+    console.log('Installation created successfully')
+  } catch (error: unknown) {
+    console.warn('Error submitting form:', error)
+    isSuccess = false
+    // Don't close dialog or reset form on error
+    // TODO: Show error message to user
+  } finally {
+    if (isSuccess) {
+      setTimeout(() => {
+        resetForm()
+      }, 500)
+    }
+  }
+}
+// #endregion
+
+// #region Watchers
+
+// Watch for row actions
+watch(recId, () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      // TODO: Handle edit action
+      // isFormEntryDialogOpen.value = true
+      break
+    case ActionEvents.showConfirmDelete:
+      // Trigger confirmation modal open
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+// Note: Installation change logic is now handled by the entry-form component
+// through the onInstallationChanged event handler
+// #endregion
+</script>
+
+<template>
+  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+  <AppSpecialistList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+  <Dialog v-model:open="isFormEntryDialogOpen" :title="headerPrep.addNav?.label!" size="lg" prevent-outside>
+    <AppSpecialistEntryFormPrev
+      :installation="installationConf"
+      :unit="filteredUnitConf"
+      :schema="schemaConf"
+      :disabled-unit="!selectedInstallationId"
+      :initial-values="{ name: '', code: '', installationId: '', unitId: '' }"
+      @submit="onSubmitForm"
+      @cancel="onCancelForm"
+      @installation-changed="onInstallationChanged"
+    />
+  </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>
+</template>
+
+<style scoped>
+/* component style */
+</style>
diff --git a/app/components/content/specialist/list.vue b/app/components/content/specialist/list.vue
index 7cf4e993..d1c3bb21 100644
--- a/app/components/content/specialist/list.vue
+++ b/app/components/content/specialist/list.vue
@@ -1,33 +1,41 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
-import AppSpecialistEntryForm from '~/components/app/specialist/entry-form.vue'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import AppSpecialistList from '~/components/app/specialist/list.vue'
+import AppSpecialistEntryForm from '~/components/app/specialist/entry-form.vue'
+
+// Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
-import { createFilteredUnitConf, installationConf, schemaConf, unitConf } from './entry'
+import { toast } from '~/components/pub/ui/toast'
 
-// #region State & Computed
-// Dialog state
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { SpecialistSchema, type SpecialistFormData } from '~/schemas/specialist.schema'
+import type { Unit } from '~/models/unit'
 
-// Table action rowId provider
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
+// Handlers
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/specialist.handler'
 
-// State untuk tracking installation yang dipilih di form
-const selectedInstallationId = ref<string>('')
+// Services
+import { getSpecialists, getSpecialistDetail } from '~/services/specialist.service'
+import { getUnits } from '~/services/unit.service'
 
-// Computed untuk filtered unit berdasarkan installation yang dipilih
-const filteredUnitConf = computed(() => {
-  if (!selectedInstallationId.value) {
-    return { ...unitConf, items: [] }
-  }
-  return createFilteredUnitConf(selectedInstallationId.value)
-})
+const units = ref<{ value: string; label: string }[]>([])
+const title = ref('')
 
 const {
   data,
@@ -38,7 +46,10 @@ const {
   handleSearch,
   fetchData: getSpecialistList,
 } = usePaginatedList({
-  fetchFn: fetchSpecialistData,
+  fetchFn: async ({ page, search }) => {
+    const result = await getSpecialists({ search, page })
+    return { success: result.success || false, body: result.body || {} }
+  },
   entityName: 'specialist',
 })
 
@@ -50,21 +61,20 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {
-      // Handle search input - this will be triggered by the header component
-    },
-    onClick: () => {
-      // Handle search button click if needed
-    },
-    onClear: () => {
-      // Handle search clear
+    onInput: (value: string) => {
+      searchInput.value = value
     },
+    onClick: () => {},
+    onClear: () => {},
   },
   addNav: {
-    label: 'Tambah Specialist',
-    icon: 'i-lucide-send',
+    label: 'Tambah',
+    icon: 'i-lucide-plus',
     onClick: () => {
+      recItem.value = null
+      recId.value = 0
       isFormEntryDialogOpen.value = true
+      isReadonly.value = false
     },
   },
 }
@@ -73,168 +83,98 @@ provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
-// #endregion
 
-// #region Functions
-async function fetchSpecialistData(params: any) {
-  const endpoint = transform('/api/v1/patient', params)
-  return await xfetch(endpoint)
-}
-
-async function handleDeleteRow(record: any) {
-  try {
-    // TODO : hit backend request untuk delete
-    console.log('Deleting record:', record)
-
-    // Simulate API call
-    // const response = await xfetch(`/api/v1/Installation/${record.id}`, {
-    //   method: 'DELETE'
-    // })
-
-    // Refresh data setelah berhasil delete
-    await getSpecialistList()
-
-    // TODO: Show success message
-    console.log('Record deleted successfully')
-  } catch (error) {
-    console.error('Error deleting record:', error)
-    // TODO: Show error message
-  } finally {
-    // Reset record state
-    recId.value = 0
-    recAction.value = ''
-    recItem.value = null
+const getCurrentSpecialistDetail = async (id: number | string) => {
+  const result = await getSpecialistDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
   }
 }
 
-// Handle confirmation result
-function handleConfirmDelete(record: any, action: string) {
-  console.log('Confirmed action:', action, 'for record:', record)
-  handleDeleteRow(record)
-}
-
-function handleCancelConfirmation() {
-  // Reset record state when cancelled
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-// #endregion region
-
-// #region Form event handlers
-
-function onCancelForm(resetForm: () => void) {
-  isFormEntryDialogOpen.value = false
-  // Reset installation selection ketika form dibatal
-  selectedInstallationId.value = ''
-  setTimeout(() => {
-    resetForm()
-  }, 500)
-}
-
-function onInstallationChanged(installationId: string) {
-  // Update local state untuk trigger re-render filtered units
-  selectedInstallationId.value = installationId
-
-  // The filteredUnitConf computed will automatically update
-  // based on the new selectedInstallationId value
-}
-
-async function onSubmitForm(values: any, resetForm: () => void) {
-  let isSuccess = false
-  try {
-    // TODO: Implement form submission logic
-    console.log('Form submitted:', values)
-
-    // Simulate API call
-    // const response = await xfetch('/api/v1/Installation', {
-    //   method: 'POST',
-    //   body: JSON.stringify(values)
-    // })
-
-    // If successful, mark as success and close dialog
-    isFormEntryDialogOpen.value = false
-    isSuccess = true
-
-    // Reset installation selection ketika form berhasil submit
-    selectedInstallationId.value = ''
-
-    // Refresh data after successful submission
-    await getSpecialistList()
-
-    // TODO: Show success message
-    console.log('Installation created successfully')
-  } catch (error: unknown) {
-    console.warn('Error submitting form:', error)
-    isSuccess = false
-    // Don't close dialog or reset form on error
-    // TODO: Show error message to user
-  } finally {
-    if (isSuccess) {
-      setTimeout(() => {
-        resetForm()
-      }, 500)
-    }
+const getUnitList = async () => {
+  const result = await getUnits()
+  if (result.success) {
+    const currentUnits = result.body?.data || []
+    units.value = currentUnits.map((item: Unit) => ({ value: item.id ? Number(item.id) : item.code, label: item.name }))
   }
 }
-// #endregion
 
-// #region Watchers
-
-// Watch for row actions
-watch(recId, () => {
+// Watch for row actions when recId or recAction changes
+watch([recId, recAction], () => {
   switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getCurrentSpecialistDetail(recId.value)
+      title.value = 'Detail Spesialis'
+      isReadonly.value = true
+      break
     case ActionEvents.showEdit:
-      // TODO: Handle edit action
-      // isFormEntryDialogOpen.value = true
+      getCurrentSpecialistDetail(recId.value)
+      title.value = 'Edit Spesialis'
+      isReadonly.value = false
       break
     case ActionEvents.showConfirmDelete:
-      // Trigger confirmation modal open
       isRecordConfirmationOpen.value = true
       break
   }
 })
 
-// Note: Installation change logic is now handled by the entry-form component
-// through the onInstallationChanged event handler
-// #endregion
+onMounted(async () => {
+  await getUnitList()
+  await getSpecialistList()
+})
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
   <AppSpecialistList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
-  <Dialog v-model:open="isFormEntryDialogOpen" :title="headerPrep.addNav?.label!" size="lg" prevent-outside>
+  <Dialog
+    v-model:open="isFormEntryDialogOpen"
+    :title="!!recItem ? title : 'Tambah Spesialis'"
+    size="lg"
+    prevent-outside
+  >
     <AppSpecialistEntryForm
-      :installation="installationConf"
-      :unit="filteredUnitConf"
-      :schema="schemaConf"
-      :disabled-unit="!selectedInstallationId"
-      :initial-values="{ name: '', code: '', installationId: '', unitId: '' }"
-      @submit="onSubmitForm"
-      @cancel="onCancelForm"
-      @installation-changed="onInstallationChanged"
+      :schema="SpecialistSchema"
+      :units="units"
+      :values="recItem"
+      :is-loading="isProcessing"
+      :is-readonly="isReadonly"
+      @submit="
+        (values: SpecialistFormData | Record<string, any>, resetForm: () => void) => {
+          if (recId > 0) {
+            handleActionEdit(recId, values, getSpecialistList, resetForm, toast)
+            return
+          }
+          handleActionSave(values, getSpecialistList, resetForm, toast)
+        }
+      "
+      @cancel="handleCancelForm"
     />
   </Dialog>
 
+  <!-- Record Confirmation Modal -->
   <RecordConfirmation
     v-model:open="isRecordConfirmationOpen"
     action="delete"
     :record="recItem"
-    @confirm="handleConfirmDelete"
-    @cancel="handleCancelConfirmation"
+    @confirm="() => handleActionRemove(recId, getSpecialistList, toast)"
+    @cancel=""
   >
     <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>
+        <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>
-
-<style scoped>
-/* component style */
-</style>
diff --git a/app/components/content/subspecialist/list-prev.vue b/app/components/content/subspecialist/list-prev.vue
new file mode 100644
index 00000000..a5496df6
--- /dev/null
+++ b/app/components/content/subspecialist/list-prev.vue
@@ -0,0 +1,239 @@
+<script setup lang="ts">
+import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import AppSubspecialistEntryForm from '~/components/app/subspecialist/entry-form.vue'
+import Dialog from '~/components/pub/base/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/custom-ui/data/types'
+import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { createFilteredUnitConf, installationConf, schemaConf, specialistConf, unitConf } from './entry'
+
+// #region State & Computed
+// Dialog state
+const isFormEntryDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+
+// Table action rowId provider
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+// State untuk tracking installation, unit, dan specialist yang dipilih di form
+const selectedInstallationId = ref<string>('')
+const selectedUnitId = ref<string>('')
+
+// Computed untuk filtered unit berdasarkan installation yang dipilih
+const filteredUnitConf = computed(() => {
+  if (!selectedInstallationId.value) {
+    return { ...unitConf, items: [] }
+  }
+  return createFilteredUnitConf(selectedInstallationId.value)
+})
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getSubSpecialistList,
+} = usePaginatedList({
+  fetchFn: fetchSubSpecialistData,
+  entityName: 'subspecialist',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Sub Specialist',
+  icon: 'i-lucide-box',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (_val: string) => {
+      // Handle search input - this will be triggered by the header component
+    },
+    onClick: () => {
+      // Handle search button click if needed
+    },
+    onClear: () => {
+      // Handle search clear
+    },
+  },
+  addNav: {
+    label: 'Tambah Sub Specialist',
+    icon: 'i-lucide-send',
+    onClick: () => {
+      isFormEntryDialogOpen.value = true
+    },
+  },
+}
+
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Functions
+async function fetchSubSpecialistData(params: any) {
+  const endpoint = transform('/api/v1/patient', params)
+  return await xfetch(endpoint)
+}
+
+async function handleDeleteRow(record: any) {
+  try {
+    // TODO : hit backend request untuk delete
+    console.log('Deleting record:', record)
+
+    // Simulate API call
+    // const response = await xfetch(`/api/v1/subspecialist/${record.id}`, {
+    //   method: 'DELETE'
+    // })
+
+    // Refresh data setelah berhasil delete
+    await getSubSpecialistList()
+
+    // TODO: Show success message
+    console.log('Record deleted successfully')
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    // TODO: Show error message
+  } finally {
+    // Reset record state
+    recId.value = 0
+    recAction.value = ''
+    recItem.value = null
+  }
+}
+
+// Handle confirmation result
+function handleConfirmDelete(record: any, action: string) {
+  console.log('Confirmed action:', action, 'for record:', record)
+  handleDeleteRow(record)
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+
+// #endregion region
+
+// #region Form event handlers
+
+function onCancelForm(resetForm: () => void) {
+  isFormEntryDialogOpen.value = false
+  selectedInstallationId.value = ''
+  selectedUnitId.value = ''
+
+  setTimeout(() => {
+    resetForm()
+  }, 500)
+}
+
+function onInstallationChanged(installationId: string) {
+  selectedInstallationId.value = installationId
+}
+
+function onUnitChanged(unitId: string) {
+  selectedUnitId.value = unitId
+}
+
+async function onSubmitForm(values: any, resetForm: () => void) {
+  let isSuccess = false
+  try {
+    // TODO: Implement form submission logic
+    console.log('Form submitted:', values)
+
+    // Simulate API call
+    // const response = await xfetch('/api/v1/subspecialist', {
+    //   method: 'POST',
+    //   body: JSON.stringify(values)
+    // })
+
+    // If successful, mark as success and close dialog
+    isFormEntryDialogOpen.value = false
+    isSuccess = true
+
+    // Reset selection ketika form berhasil submit
+    selectedInstallationId.value = ''
+    selectedUnitId.value = ''
+
+    // Refresh data after successful submission
+    await getSubSpecialistList()
+
+    // TODO: Show success message
+    console.log('Sub Specialist created successfully')
+  } catch (error: unknown) {
+    console.warn('Error submitting form:', error)
+    isSuccess = false
+    // Don't close dialog or reset form on error
+    // TODO: Show error message to user
+  } finally {
+    if (isSuccess) {
+      setTimeout(() => {
+        resetForm()
+      }, 500)
+    }
+  }
+}
+// #endregion
+
+// #region Watchers
+
+// Watch for row actions
+watch(recId, () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      // TODO: Handle edit action
+      // isFormEntryDialogOpen.value = true
+      break
+    case ActionEvents.showConfirmDelete:
+      // Trigger confirmation modal open
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+// #endregion
+</script>
+
+<template>
+  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+  <AppSubspecialistList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+  <Dialog v-model:open="isFormEntryDialogOpen" :title="headerPrep.addNav?.label!" size="lg" prevent-outside>
+    <AppSubspecialistEntryFormPrev
+      :installation="installationConf"
+      :unit="filteredUnitConf"
+      :specialist="specialistConf"
+      :schema="schemaConf"
+      :initial-values="{ name: '', code: '', installationId: '', unitId: '', specialistId: '' }"
+      @submit="onSubmitForm"
+      @cancel="onCancelForm"
+      @installation-changed="onInstallationChanged"
+      @unit-changed="onUnitChanged"
+    />
+  </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?.name"><strong>Nama:</strong> {{ record.name }}</p>
+        <p v-if="record?.code"><strong>Kode:</strong> {{ record.code }}</p>
+        <p v-if="record?.specialist"><strong>Specialist:</strong> {{ record.specialist?.name }}</p>
+      </div>
+    </template>
+  </RecordConfirmation>
+</template>
diff --git a/app/components/content/subspecialist/list.vue b/app/components/content/subspecialist/list.vue
index a478ef22..ad38241f 100644
--- a/app/components/content/subspecialist/list.vue
+++ b/app/components/content/subspecialist/list.vue
@@ -1,34 +1,41 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
-import AppSubspecialistEntryForm from '~/components/app/subspecialist/entry-form.vue'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import AppSubSpecialistList from '~/components/app/subspecialist/list.vue'
+import AppSubSpecialistEntryForm from '~/components/app/subspecialist/entry-form.vue'
+
+// Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
-import { createFilteredUnitConf, installationConf, schemaConf, specialistConf, unitConf } from './entry'
+import { toast } from '~/components/pub/ui/toast'
 
-// #region State & Computed
-// Dialog state
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { SubspecialistSchema, type SubspecialistFormData } from '~/schemas/subspecialist.schema'
+import type { Specialist } from '~/models/specialist'
 
-// Table action rowId provider
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
+// Handlers
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/subspecialist.handler'
 
-// State untuk tracking installation, unit, dan specialist yang dipilih di form
-const selectedInstallationId = ref<string>('')
-const selectedUnitId = ref<string>('')
+// Services
+import { getSubspecialists, getSubspecialistDetail } from '~/services/subspecialist.service'
+import { getSpecialists } from '~/services/specialist.service'
 
-// Computed untuk filtered unit berdasarkan installation yang dipilih
-const filteredUnitConf = computed(() => {
-  if (!selectedInstallationId.value) {
-    return { ...unitConf, items: [] }
-  }
-  return createFilteredUnitConf(selectedInstallationId.value)
-})
+const specialists = ref<{ value: string; label: string }[]>([])
+const title = ref('')
 
 const {
   data,
@@ -39,33 +46,35 @@ const {
   handleSearch,
   fetchData: getSubSpecialistList,
 } = usePaginatedList({
-  fetchFn: fetchSubSpecialistData,
+  fetchFn: async ({ page, search }) => {
+    const result = await getSubspecialists({ search, page })
+    return { success: result.success || false, body: result.body || {} }
+  },
   entityName: 'subspecialist',
 })
 
 const headerPrep: HeaderPrep = {
-  title: 'Sub Specialist',
+  title: 'SubSpecialist',
   icon: 'i-lucide-box',
   refSearchNav: {
     placeholder: 'Cari (min. 3 karakter)...',
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {
-      // Handle search input - this will be triggered by the header component
-    },
-    onClick: () => {
-      // Handle search button click if needed
-    },
-    onClear: () => {
-      // Handle search clear
+    onInput: (value: string) => {
+      searchInput.value = value
     },
+    onClick: () => {},
+    onClear: () => {},
   },
   addNav: {
-    label: 'Tambah Sub Specialist',
-    icon: 'i-lucide-send',
+    label: 'Tambah',
+    icon: 'i-lucide-plus',
     onClick: () => {
+      recItem.value = null
+      recId.value = 0
       isFormEntryDialogOpen.value = true
+      isReadonly.value = false
     },
   },
 }
@@ -74,165 +83,100 @@ provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
-// #endregion
 
-// #region Functions
-async function fetchSubSpecialistData(params: any) {
-  const endpoint = transform('/api/v1/patient', params)
-  return await xfetch(endpoint)
-}
-
-async function handleDeleteRow(record: any) {
-  try {
-    // TODO : hit backend request untuk delete
-    console.log('Deleting record:', record)
-
-    // Simulate API call
-    // const response = await xfetch(`/api/v1/subspecialist/${record.id}`, {
-    //   method: 'DELETE'
-    // })
-
-    // Refresh data setelah berhasil delete
-    await getSubSpecialistList()
-
-    // TODO: Show success message
-    console.log('Record deleted successfully')
-  } catch (error) {
-    console.error('Error deleting record:', error)
-    // TODO: Show error message
-  } finally {
-    // Reset record state
-    recId.value = 0
-    recAction.value = ''
-    recItem.value = null
+const getCurrentSubSpecialistDetail = async (id: number | string) => {
+  const result = await getSubspecialistDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
   }
 }
 
-// Handle confirmation result
-function handleConfirmDelete(record: any, action: string) {
-  console.log('Confirmed action:', action, 'for record:', record)
-  handleDeleteRow(record)
-}
-
-function handleCancelConfirmation() {
-  // Reset record state when cancelled
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-// #endregion region
-
-// #region Form event handlers
-
-function onCancelForm(resetForm: () => void) {
-  isFormEntryDialogOpen.value = false
-  selectedInstallationId.value = ''
-  selectedUnitId.value = ''
-
-  setTimeout(() => {
-    resetForm()
-  }, 500)
-}
-
-function onInstallationChanged(installationId: string) {
-  selectedInstallationId.value = installationId
-}
-
-function onUnitChanged(unitId: string) {
-  selectedUnitId.value = unitId
-}
-
-async function onSubmitForm(values: any, resetForm: () => void) {
-  let isSuccess = false
-  try {
-    // TODO: Implement form submission logic
-    console.log('Form submitted:', values)
-
-    // Simulate API call
-    // const response = await xfetch('/api/v1/subspecialist', {
-    //   method: 'POST',
-    //   body: JSON.stringify(values)
-    // })
-
-    // If successful, mark as success and close dialog
-    isFormEntryDialogOpen.value = false
-    isSuccess = true
-
-    // Reset selection ketika form berhasil submit
-    selectedInstallationId.value = ''
-    selectedUnitId.value = ''
-
-    // Refresh data after successful submission
-    await getSubSpecialistList()
-
-    // TODO: Show success message
-    console.log('Sub Specialist created successfully')
-  } catch (error: unknown) {
-    console.warn('Error submitting form:', error)
-    isSuccess = false
-    // Don't close dialog or reset form on error
-    // TODO: Show error message to user
-  } finally {
-    if (isSuccess) {
-      setTimeout(() => {
-        resetForm()
-      }, 500)
-    }
+const getSpecialistsList = async () => {
+  const result = await getSpecialists()
+  if (result.success) {
+    const currentSpecialists = result.body?.data || []
+    specialists.value = currentSpecialists.map((item: Specialist) => ({
+      value: item.id ? Number(item.id) : item.code,
+      label: item.name,
+    }))
   }
 }
-// #endregion
 
-// #region Watchers
-
-// Watch for row actions
-watch(recId, () => {
+// Watch for row actions when recId or recAction changes
+watch([recId, recAction], () => {
   switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getCurrentSubSpecialistDetail(recId.value)
+      title.value = 'Detail Sub Spesialis'
+      isReadonly.value = true
+      break
     case ActionEvents.showEdit:
-      // TODO: Handle edit action
-      // isFormEntryDialogOpen.value = true
+      getCurrentSubSpecialistDetail(recId.value)
+      title.value = 'Edit Sub Spesialis'
+      isReadonly.value = false
       break
     case ActionEvents.showConfirmDelete:
-      // Trigger confirmation modal open
       isRecordConfirmationOpen.value = true
       break
   }
 })
 
-// #endregion
+onMounted(async () => {
+  await getSpecialistsList()
+  await getSubSpecialistList()
+})
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
-  <AppSubspecialistList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
+  <AppSubSpecialistList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
-  <Dialog v-model:open="isFormEntryDialogOpen" :title="headerPrep.addNav?.label!" size="lg" prevent-outside>
-    <AppSubspecialistEntryForm
-      :installation="installationConf"
-      :unit="filteredUnitConf"
-      :specialist="specialistConf"
-      :schema="schemaConf"
-      :initial-values="{ name: '', code: '', installationId: '', unitId: '', specialistId: '' }"
-      @submit="onSubmitForm"
-      @cancel="onCancelForm"
-      @installation-changed="onInstallationChanged"
-      @unit-changed="onUnitChanged"
+  <Dialog
+    v-model:open="isFormEntryDialogOpen"
+    :title="!!recItem ? title : 'Tambah Sub Spesialis'"
+    size="lg"
+    prevent-outside
+  >
+    <AppSubSpecialistEntryForm
+      :schema="SubspecialistSchema"
+      :specialists="specialists"
+      :values="recItem"
+      :is-loading="isProcessing"
+      :is-readonly="isReadonly"
+      @submit="
+        (values: SubspecialistFormData | Record<string, any>, resetForm: () => void) => {
+          if (recId > 0) {
+            handleActionEdit(recId, values, getSubSpecialistList, resetForm, toast)
+            return
+          }
+          handleActionSave(values, getSubSpecialistList, resetForm, toast)
+        }
+      "
+      @cancel="handleCancelForm"
     />
   </Dialog>
 
+  <!-- Record Confirmation Modal -->
   <RecordConfirmation
     v-model:open="isRecordConfirmationOpen"
     action="delete"
     :record="recItem"
-    @confirm="handleConfirmDelete"
-    @cancel="handleCancelConfirmation"
+    @confirm="() => handleActionRemove(recId, getSubSpecialistList, 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>
-        <p v-if="record?.specialist"><strong>Specialist:</strong> {{ record.specialist?.name }}</p>
       </div>
     </template>
   </RecordConfirmation>
diff --git a/app/components/content/tools/list.vue b/app/components/content/tools/list.vue
index 0b270204..27e90f56 100644
--- a/app/components/content/tools/list.vue
+++ b/app/components/content/tools/list.vue
@@ -2,8 +2,9 @@
 // Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import AppToolsEntryForm from '~/components/app/tools/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import AppToolsList from '~/components/app/tools/list.vue'
+import AppToolsEntryForm from '~/components/app/tools/entry-form.vue'
 
 // Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
@@ -60,8 +61,8 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {
-      // Handle search input - this will be triggered by the header component
+    onInput: (value: string) => {
+      searchInput.value = value
     },
     onClick: () => {
       // Handle search button click if needed
@@ -131,7 +132,13 @@ onMounted(async () => {
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" class="mb-4 xl:mb-5" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    @search="handleSearch"
+    :ref-search-nav="headerPrep.refSearchNav"
+    class="mb-4 xl:mb-5"
+  />
   <AppToolsList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
   <Dialog
diff --git a/app/components/content/unit/list-prev.vue b/app/components/content/unit/list-prev.vue
new file mode 100644
index 00000000..9cee37a1
--- /dev/null
+++ b/app/components/content/unit/list-prev.vue
@@ -0,0 +1,207 @@
+<script setup lang="ts">
+import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import AppUnitEntryForm from '~/components/app/unit/entry-form.vue'
+import Dialog from '~/components/pub/base/modal/dialog.vue'
+import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/custom-ui/data/types'
+import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { schemaConf, unitConf } from './entry'
+
+// #region State & Computed
+// Dialog state
+const isFormEntryDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+
+// Table action rowId provider
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+async function fetchUnitData(params: any) {
+  const endpoint = transform('/api/v1/patient', params)
+  return await xfetch(endpoint)
+}
+
+// Menggunakan composable untuk pagination
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getUnitList,
+} = usePaginatedList({
+  fetchFn: fetchUnitData,
+  entityName: 'unit',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Unit',
+  icon: 'i-lucide-box',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (_val: string) => {
+      // Handle search input - this will be triggered by the header component
+    },
+    onClick: () => {
+      // Handle search button click if needed
+    },
+    onClear: () => {
+      // Handle search clear
+    },
+  },
+  addNav: {
+    label: 'Tambah Unit',
+    icon: 'i-lucide-send',
+    onClick: () => {
+      isFormEntryDialogOpen.value = true
+    },
+  },
+}
+
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Functions
+
+async function handleDeleteRow(record: any) {
+  try {
+    // TODO : hit backend request untuk delete
+    console.log('Deleting record:', record)
+
+    // Simulate API call
+    // const response = await xfetch(`/api/v1/unit/${record.id}`, {
+    //   method: 'DELETE'
+    // })
+
+    // Refresh data setelah berhasil delete
+    await getUnitList()
+
+    // TODO: Show success message
+    console.log('Record deleted successfully')
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    // TODO: Show error message
+  } finally {
+    // Reset record state
+    recId.value = 0
+    recAction.value = ''
+    recItem.value = null
+  }
+}
+
+// #endregion region
+
+// #region Form event handlers
+
+function onCancelForm(resetForm: () => void) {
+  isFormEntryDialogOpen.value = false
+  setTimeout(() => {
+    resetForm()
+  }, 500)
+}
+
+async function onSubmitForm(values: any, resetForm: () => void) {
+  let isSuccess = false
+  try {
+    // TODO: Implement form submission logic
+    console.log('Form submitted:', values)
+
+    // Simulate API call
+    // const response = await xfetch('/api/v1/unit', {
+    //   method: 'POST',
+    //   body: JSON.stringify(values)
+    // })
+
+    // If successful, mark as success and close dialog
+    isFormEntryDialogOpen.value = false
+    isSuccess = true
+
+    // Refresh data after successful submission
+    await getUnitList()
+
+    // TODO: Show success message
+    console.log('Unit created successfully')
+  } catch (error: unknown) {
+    console.warn('Error submitting form:', error)
+    isSuccess = false
+    // Don't close dialog or reset form on error
+    // TODO: Show error message to user
+  } finally {
+    if (isSuccess) {
+      setTimeout(() => {
+        resetForm()
+      }, 500)
+    }
+  }
+}
+// #endregion
+
+// #region Watchers
+
+// Watch for row actions
+watch(recId, () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      // TODO: Handle edit action
+      // isFormEntryDialogOpen.value = true
+      break
+    case ActionEvents.showConfirmDelete:
+      // Trigger confirmation modal open
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+
+// Handle confirmation result
+function handleConfirmDelete(record: any, action: string) {
+  console.log('Confirmed action:', action, 'for record:', record)
+  handleDeleteRow(record)
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+// #endregion
+</script>
+
+<template>
+  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+  <AppUnitList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+  <Dialog v-model:open="isFormEntryDialogOpen" title="Tambah Unit" size="lg" prevent-outside>
+    <AppUnitEntryFormPrev
+      :unit="unitConf" :schema="schemaConf" :initial-values="{ name: '', code: '', parentId: '' }"
+      @submit="onSubmitForm" @cancel="onCancelForm"
+/>
+  </Dialog>
+
+  <!-- Record Confirmation Modal -->
+  <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>
+</template>
+
+<style scoped>
+/* component style */
+</style>
diff --git a/app/components/content/unit/list.vue b/app/components/content/unit/list.vue
index b54b3c0c..3dcd184d 100644
--- a/app/components/content/unit/list.vue
+++ b/app/components/content/unit/list.vue
@@ -1,29 +1,39 @@
 <script setup lang="ts">
-import type { HeaderPrep } from '~/components/pub/custom-ui/data/types'
-import AppUnitEntryForm from '~/components/app/unit/entry-form.vue'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
+import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
-import { ActionEvents } from '~/components/pub/custom-ui/data/types'
-import Header from '~/components/pub/custom-ui/nav-header/header.vue'
+import AppUnitList from '~/components/app/unit/list.vue'
+import AppUnitEntryForm from '~/components/app/unit/entry-form.vue'
+
+// Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
-import { schemaConf, unitConf } from './entry'
+import { toast } from '~/components/pub/ui/toast'
 
-// #region State & Computed
-// Dialog state
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { UnitSchema, type UnitFormData } from '~/schemas/unit.schema'
 
-// Table action rowId provider
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
+// Handlers
+import {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/unit.handler'
 
-async function fetchUnitData(params: any) {
-  const endpoint = transform('/api/v1/patient', params)
-  return await xfetch(endpoint)
-}
+// Services
+import { getUnits, getUnitDetail } from '~/services/unit.service'
+
+const title = ref('')
 
-// Menggunakan composable untuk pagination
 const {
   data,
   isLoading,
@@ -33,7 +43,10 @@ const {
   handleSearch,
   fetchData: getUnitList,
 } = usePaginatedList({
-  fetchFn: fetchUnitData,
+  fetchFn: async ({ page, search }) => {
+    const result = await getUnits({ search, page })
+    return { success: result.success || false, body: result.body || {} }
+  },
   entityName: 'unit',
 })
 
@@ -45,21 +58,20 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {
-      // Handle search input - this will be triggered by the header component
-    },
-    onClick: () => {
-      // Handle search button click if needed
-    },
-    onClear: () => {
-      // Handle search clear
+    onInput: (value: string) => {
+      searchInput.value = value
     },
+    onClick: () => {},
+    onClear: () => {},
   },
   addNav: {
-    label: 'Tambah Unit',
-    icon: 'i-lucide-send',
+    label: 'Tambah',
+    icon: 'i-lucide-plus',
     onClick: () => {
+      recItem.value = null
+      recId.value = 0
       isFormEntryDialogOpen.value = true
+      isReadonly.value = false
     },
   },
 }
@@ -68,140 +80,83 @@ provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
-// #endregion
 
-// #region Functions
-
-async function handleDeleteRow(record: any) {
-  try {
-    // TODO : hit backend request untuk delete
-    console.log('Deleting record:', record)
-
-    // Simulate API call
-    // const response = await xfetch(`/api/v1/unit/${record.id}`, {
-    //   method: 'DELETE'
-    // })
-
-    // Refresh data setelah berhasil delete
-    await getUnitList()
-
-    // TODO: Show success message
-    console.log('Record deleted successfully')
-  } catch (error) {
-    console.error('Error deleting record:', error)
-    // TODO: Show error message
-  } finally {
-    // Reset record state
-    recId.value = 0
-    recAction.value = ''
-    recItem.value = null
+const getCurrentUnitDetail = async (id: number | string) => {
+  const result = await getUnitDetail(id)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    recItem.value = currentValue
+    isFormEntryDialogOpen.value = true
   }
 }
 
-// #endregion region
-
-// #region Form event handlers
-
-function onCancelForm(resetForm: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    resetForm()
-  }, 500)
-}
-
-async function onSubmitForm(values: any, resetForm: () => void) {
-  let isSuccess = false
-  try {
-    // TODO: Implement form submission logic
-    console.log('Form submitted:', values)
-
-    // Simulate API call
-    // const response = await xfetch('/api/v1/unit', {
-    //   method: 'POST',
-    //   body: JSON.stringify(values)
-    // })
-
-    // If successful, mark as success and close dialog
-    isFormEntryDialogOpen.value = false
-    isSuccess = true
-
-    // Refresh data after successful submission
-    await getUnitList()
-
-    // TODO: Show success message
-    console.log('Unit created successfully')
-  } catch (error: unknown) {
-    console.warn('Error submitting form:', error)
-    isSuccess = false
-    // Don't close dialog or reset form on error
-    // TODO: Show error message to user
-  } finally {
-    if (isSuccess) {
-      setTimeout(() => {
-        resetForm()
-      }, 500)
-    }
-  }
-}
-// #endregion
-
-// #region Watchers
-
-// Watch for row actions
-watch(recId, () => {
+// Watch for row actions when recId or recAction changes
+watch([recId, recAction], () => {
   switch (recAction.value) {
+    case ActionEvents.showDetail:
+      getCurrentUnitDetail(recId.value)
+      title.value = 'Detail Unit'
+      isReadonly.value = true
+      break
     case ActionEvents.showEdit:
-      // TODO: Handle edit action
-      // isFormEntryDialogOpen.value = true
+      getCurrentUnitDetail(recId.value)
+      title.value = 'Edit Unit'
+      isReadonly.value = false
       break
     case ActionEvents.showConfirmDelete:
-      // Trigger confirmation modal open
       isRecordConfirmationOpen.value = true
       break
   }
 })
 
-// Handle confirmation result
-function handleConfirmDelete(record: any, action: string) {
-  console.log('Confirmed action:', action, 'for record:', record)
-  handleDeleteRow(record)
-}
-
-function handleCancelConfirmation() {
-  // Reset record state when cancelled
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-// #endregion
+onMounted(async () => {
+  await getUnitList()
+})
 </script>
 
 <template>
-  <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class="mb-4 xl:mb-5"
+  />
   <AppUnitList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
-  <Dialog v-model:open="isFormEntryDialogOpen" title="Tambah Unit" size="lg" prevent-outside>
+  <Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Unit'" size="lg" prevent-outside>
     <AppUnitEntryForm
-      :unit="unitConf" :schema="schemaConf" :initial-values="{ name: '', code: '', parentId: '' }"
-      @submit="onSubmitForm" @cancel="onCancelForm"
-/>
+      :schema="UnitSchema"
+      :values="recItem"
+      :is-loading="isProcessing"
+      :is-readonly="isReadonly"
+      @submit="
+        (values: UnitFormData | Record<string, any>, resetForm: () => void) => {
+          if (recId > 0) {
+            handleActionEdit(recId, values, getUnitList, resetForm, toast)
+            return
+          }
+          handleActionSave(values, getUnitList, resetForm, toast)
+        }
+      "
+      @cancel="handleCancelForm"
+    />
   </Dialog>
 
   <!-- Record Confirmation Modal -->
   <RecordConfirmation
-    v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
-    @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation"
->
+    v-model:open="isRecordConfirmationOpen"
+    action="delete"
+    :record="recItem"
+    @confirm="() => handleActionRemove(recId, getUnitList, toast)"
+    @cancel=""
+  >
     <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>
+        <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>
-
-<style scoped>
-/* component style */
-</style>
diff --git a/app/components/content/uom/list.vue b/app/components/content/uom/list.vue
index bcb01444..6e6bda1b 100644
--- a/app/components/content/uom/list.vue
+++ b/app/components/content/uom/list.vue
@@ -2,8 +2,8 @@
 // Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
-import AppUomEntryForm from '~/components/app/uom/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+import AppUomEntryForm from '~/components/app/uom/entry-form.vue'
 
 // Helpers
 import { usePaginatedList } from '~/composables/usePaginatedList'
@@ -57,7 +57,9 @@ const headerPrep: HeaderPrep = {
     minLength: 3,
     debounceMs: 500,
     showValidationFeedback: true,
-    onInput: (_val: string) => {},
+    onInput: (value: string) => {
+      searchInput.value = value
+    },
     onClick: () => {},
     onClear: () => {},
   },
@@ -113,17 +115,18 @@ onMounted(async () => {
 
 <template>
   <div class="p-4">
-    <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class="mb-4 xl:mb-5"
+    />
     <div class="rounded-md border p-4">
       <AppUomList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
     </div>
 
-    <Dialog
-      v-model:open="isFormEntryDialogOpen"
-      :title="!!recItem ? title : 'Tambah Uom'"
-      size="lg"
-      prevent-outside
-    >
+    <Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Uom'" size="lg" prevent-outside>
       <AppUomEntryForm
         :schema="UomSchema"
         :values="recItem"
diff --git a/app/handlers/_handler.ts b/app/handlers/_handler.ts
index d05e6f39..4148c726 100644
--- a/app/handlers/_handler.ts
+++ b/app/handlers/_handler.ts
@@ -1,3 +1,109 @@
+import { ref } from 'vue'
+
+// Factory for CRUD handler state and actions
+export function createCrudHandler<T = any>(crud: {
+  post: (...args: any[]) => Promise<any>
+  patch: (...args: any[]) => Promise<any>
+  remove: (...args: any[]) => Promise<any>
+}) {
+  const recId = ref<number>(0)
+  const recAction = ref<string>('')
+  const recItem = ref<T | null>(null)
+  const isReadonly = ref(false)
+  const isProcessing = ref(false)
+  const isFormEntryDialogOpen = ref(false)
+  const isRecordConfirmationOpen = ref(false)
+
+  function onResetState() {
+    recId.value = 0
+    recAction.value = ''
+    recItem.value = null
+  }
+
+  async function handleActionSave(values: any, refresh: () => void, reset: () => void, toast: ToastFn) {
+    isProcessing.value = true
+    await handleAsyncAction<[any], any>({
+      action: crud.post,
+      args: [values],
+      toast,
+      successMessage: 'Data berhasil disimpan',
+      errorMessage: 'Gagal menyimpan data',
+      onSuccess: () => {
+        isFormEntryDialogOpen.value = false
+        if (refresh) refresh()
+      },
+      onFinally: (isSuccess: boolean) => {
+        if (isSuccess) setTimeout(reset, 500)
+        isProcessing.value = false
+      },
+    })
+  }
+
+  async function handleActionEdit(
+    id: number | string,
+    values: any,
+    refresh: () => void,
+    reset: () => void,
+    toast: ToastFn,
+  ) {
+    isProcessing.value = true
+    await handleAsyncAction<[number | string, any], any>({
+      action: crud.patch,
+      args: [id, values],
+      toast,
+      successMessage: 'Data berhasil diubah',
+      errorMessage: 'Gagal mengubah data',
+      onSuccess: () => {
+        isFormEntryDialogOpen.value = false
+        if (refresh) refresh()
+      },
+      onFinally: (isSuccess: boolean) => {
+        if (isSuccess) setTimeout(reset, 500)
+        isProcessing.value = false
+      },
+    })
+  }
+
+  async function handleActionRemove(id: number | string, refresh: () => void, toast: ToastFn) {
+    isProcessing.value = true
+    await handleAsyncAction<[number | string], any>({
+      action: crud.remove,
+      args: [id],
+      toast,
+      successMessage: 'Data berhasil dihapus',
+      errorMessage: 'Gagal menghapus data',
+      onSuccess: () => {
+        isRecordConfirmationOpen.value = false
+        if (refresh) refresh()
+      },
+      onFinally: () => {
+        isProcessing.value = false
+      },
+    })
+  }
+
+  function handleCancelForm(reset: () => void) {
+    isFormEntryDialogOpen.value = false
+    isReadonly.value = false
+    setTimeout(reset, 300)
+  }
+
+  return {
+    recId,
+    recAction,
+    recItem,
+    isReadonly,
+    isProcessing,
+    isFormEntryDialogOpen,
+    isRecordConfirmationOpen,
+    onResetState,
+    handleActionSave,
+    handleActionEdit,
+    handleActionRemove,
+    handleCancelForm,
+  }
+}
+
 // Reusable async handler for CRUD actions with toast and state management
 export type ToastFn = (params: { title: string; description: string; variant: 'default' | 'destructive' }) => void
 
diff --git a/app/handlers/device.handler.ts b/app/handlers/device.handler.ts
index e269f61b..14de6830 100644
--- a/app/handlers/device.handler.ts
+++ b/app/handlers/device.handler.ts
@@ -1,101 +1,21 @@
-import { ref } from 'vue'
-
-// Handlers
-import { type ToastFn, handleAsyncAction } from '~/handlers/_handler'
-
-// Services
+import { createCrudHandler } from '~/handlers/_handler'
 import { postDevice, patchDevice, removeDevice } from '~/services/device.service'
 
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-const isReadonly = ref(false)
-const isProcessing = ref(false)
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
-
-function onResetState() {
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-export async function handleActionSave(
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[any], any>({
-    action: postDevice,
-    args: [values],
-    toast,
-    successMessage: 'Data berhasil disimpan',
-    errorMessage: 'Gagal menyimpan data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false;
-      if (refresh) refresh();
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500);
-      isProcessing.value = false;
-    },
-  });
-}
-
-export async function handleActionEdit(
-  id: number | string,
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[number | string, any], any>({
-    action: patchDevice,
-    args: [id, values],
-    toast,
-    successMessage: 'Data berhasil diubah',
-    errorMessage: 'Gagal mengubah data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false;
-      if (refresh) refresh();
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500);
-      isProcessing.value = false;
-    },
-  });
-}
-
-export async function handleActionRemove(
-  id: number | string,
-  refresh: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[number | string], any>({
-    action: removeDevice,
-    args: [id],
-    toast,
-    successMessage: 'Data berhasil dihapus',
-    errorMessage: 'Gagal menghapus data',
-    onSuccess: () => {
-      if (refresh) refresh();
-    },
-    onFinally: () => {
-      onResetState();
-      isProcessing.value = false;
-    },
-  });
-}
-
-export function handleCancelForm(reset: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    reset()
-  }, 500)
-}
-
-export { recId, recAction, recItem, isReadonly, isProcessing, isFormEntryDialogOpen, isRecordConfirmationOpen }
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postDevice,
+  patch: patchDevice,
+  remove: removeDevice,
+})
diff --git a/app/handlers/division-position.handler.ts b/app/handlers/division-position.handler.ts
new file mode 100644
index 00000000..dcbfc7fd
--- /dev/null
+++ b/app/handlers/division-position.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postDivisionPosition, patchDivisionPosition, removeDivisionPosition } from '~/services/division-position.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postDivisionPosition,
+  patch: patchDivisionPosition,
+  remove: removeDivisionPosition,
+})
diff --git a/app/handlers/division.handler.ts b/app/handlers/division.handler.ts
new file mode 100644
index 00000000..e830260f
--- /dev/null
+++ b/app/handlers/division.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postDivision, patchDivision, removeDivision } from '~/services/division.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postDivision,
+  patch: patchDivision,
+  remove: removeDivision,
+})
diff --git a/app/handlers/installation.handler.ts b/app/handlers/installation.handler.ts
new file mode 100644
index 00000000..d3a1d06e
--- /dev/null
+++ b/app/handlers/installation.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postInstallation, patchInstallation, removeInstallation } from '~/services/installation.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postInstallation,
+  patch: patchInstallation,
+  remove: removeInstallation,
+})
diff --git a/app/handlers/material.handler.ts b/app/handlers/material.handler.ts
index d61e5f01..750f7967 100644
--- a/app/handlers/material.handler.ts
+++ b/app/handlers/material.handler.ts
@@ -1,92 +1,21 @@
-import { ref } from 'vue'
-
-// Handlers
-import { type ToastFn, handleAsyncAction } from '~/handlers/_handler'
-
-// Services
+import { createCrudHandler } from '~/handlers/_handler'
 import { postMaterial, patchMaterial, removeMaterial } from '~/services/material.service'
 
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-const isReadonly = ref(false)
-const isProcessing = ref(false)
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
-
-function onResetState() {
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-export async function handleActionSave(values: any, refresh: () => void, reset: () => void, toast: ToastFn) {
-  isProcessing.value = true
-  await handleAsyncAction<[any], any>({
-    action: postMaterial,
-    args: [values],
-    toast,
-    successMessage: 'Data berhasil disimpan',
-    errorMessage: 'Gagal menyimpan data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false
-      if (refresh) refresh()
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500)
-      isProcessing.value = false
-    },
-  })
-}
-
-export async function handleActionEdit(
-  id: number | string,
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn,
-) {
-  isProcessing.value = true
-  await handleAsyncAction<[number | string, any], any>({
-    action: patchMaterial,
-    args: [id, values],
-    toast,
-    successMessage: 'Data berhasil diubah',
-    errorMessage: 'Gagal mengubah data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false
-      if (refresh) refresh()
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500)
-      isProcessing.value = false
-    },
-  })
-}
-
-export async function handleActionRemove(id: number | string, refresh: () => void, toast: ToastFn) {
-  isProcessing.value = true
-  await handleAsyncAction<[number | string], any>({
-    action: removeMaterial,
-    args: [id],
-    toast,
-    successMessage: 'Data berhasil dihapus',
-    errorMessage: 'Gagal menghapus data',
-    onSuccess: () => {
-      if (refresh) refresh()
-    },
-    onFinally: () => {
-      onResetState()
-      isProcessing.value = false
-    },
-  })
-}
-
-export function handleCancelForm(reset: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    reset()
-  }, 500)
-}
-
-export { recId, recAction, recItem, isReadonly, isProcessing, isFormEntryDialogOpen, isRecordConfirmationOpen }
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postMaterial,
+  patch: patchMaterial,
+  remove: removeMaterial,
+})
diff --git a/app/handlers/medicine-group.handler.ts b/app/handlers/medicine-group.handler.ts
index f349355f..998ab285 100644
--- a/app/handlers/medicine-group.handler.ts
+++ b/app/handlers/medicine-group.handler.ts
@@ -1,101 +1,21 @@
-import { ref } from 'vue'
-
-// Handlers
-import { type ToastFn, handleAsyncAction } from '~/handlers/_handler'
-
-// Services
+import { createCrudHandler } from '~/handlers/_handler'
 import { postMedicineGroup, patchMedicineGroup, removeMedicineGroup } from '~/services/medicine-group.service'
 
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-const isReadonly = ref(false)
-const isProcessing = ref(false)
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
-
-function onResetState() {
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-export async function handleActionSave(
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[any], any>({
-    action: postMedicineGroup,
-    args: [values],
-    toast,
-    successMessage: 'Data berhasil disimpan',
-    errorMessage: 'Gagal menyimpan data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false;
-      if (refresh) refresh();
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500);
-      isProcessing.value = false;
-    },
-  });
-}
-
-export async function handleActionEdit(
-  id: number | string,
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[number | string, any], any>({
-    action: patchMedicineGroup,
-    args: [id, values],
-    toast,
-    successMessage: 'Data berhasil diubah',
-    errorMessage: 'Gagal mengubah data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false;
-      if (refresh) refresh();
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500);
-      isProcessing.value = false;
-    },
-  });
-}
-
-export async function handleActionRemove(
-  id: number | string,
-  refresh: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[number | string], any>({
-    action: removeMedicineGroup,
-    args: [id],
-    toast,
-    successMessage: 'Data berhasil dihapus',
-    errorMessage: 'Gagal menghapus data',
-    onSuccess: () => {
-      if (refresh) refresh();
-    },
-    onFinally: () => {
-      onResetState();
-      isProcessing.value = false;
-    },
-  });
-}
-
-export function handleCancelForm(reset: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    reset()
-  }, 500)
-}
-
-export { recId, recAction, recItem, isReadonly, isProcessing, isFormEntryDialogOpen, isRecordConfirmationOpen }
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postMedicineGroup,
+  patch: patchMedicineGroup,
+  remove: removeMedicineGroup,
+})
diff --git a/app/handlers/medicine-method.handler.ts b/app/handlers/medicine-method.handler.ts
index 2a681776..df4e0ff9 100644
--- a/app/handlers/medicine-method.handler.ts
+++ b/app/handlers/medicine-method.handler.ts
@@ -1,101 +1,21 @@
-import { ref } from 'vue'
-
-// Handlers
-import { type ToastFn, handleAsyncAction } from '~/handlers/_handler'
-
-// Services
+import { createCrudHandler } from '~/handlers/_handler'
 import { postMedicineMethod, patchMedicineMethod, removeMedicineMethod } from '~/services/medicine-method.service'
 
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-const isReadonly = ref(false)
-const isProcessing = ref(false)
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
-
-function onResetState() {
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-export async function handleActionSave(
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[any], any>({
-    action: postMedicineMethod,
-    args: [values],
-    toast,
-    successMessage: 'Data berhasil disimpan',
-    errorMessage: 'Gagal menyimpan data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false;
-      if (refresh) refresh();
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500);
-      isProcessing.value = false;
-    },
-  });
-}
-
-export async function handleActionEdit(
-  id: number | string,
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[number | string, any], any>({
-    action: patchMedicineMethod,
-    args: [id, values],
-    toast,
-    successMessage: 'Data berhasil diubah',
-    errorMessage: 'Gagal mengubah data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false;
-      if (refresh) refresh();
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500);
-      isProcessing.value = false;
-    },
-  });
-}
-
-export async function handleActionRemove(
-  id: number | string,
-  refresh: () => void,
-  toast: ToastFn
-) {
-  isProcessing.value = true;
-  await handleAsyncAction<[number | string], any>({
-    action: removeMedicineMethod,
-    args: [id],
-    toast,
-    successMessage: 'Data berhasil dihapus',
-    errorMessage: 'Gagal menghapus data',
-    onSuccess: () => {
-      if (refresh) refresh();
-    },
-    onFinally: () => {
-      onResetState();
-      isProcessing.value = false;
-    },
-  });
-}
-
-export function handleCancelForm(reset: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    reset()
-  }, 500)
-}
-
-export { recId, recAction, recItem, isReadonly, isProcessing, isFormEntryDialogOpen, isRecordConfirmationOpen }
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postMedicineMethod,
+  patch: patchMedicineMethod,
+  remove: removeMedicineMethod,
+})
diff --git a/app/handlers/medicine.handler.ts b/app/handlers/medicine.handler.ts
new file mode 100644
index 00000000..d550f11b
--- /dev/null
+++ b/app/handlers/medicine.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postMedicine, patchMedicine, removeMedicine } from '~/services/medicine.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postMedicine,
+  patch: patchMedicine,
+  remove: removeMedicine,
+})
diff --git a/app/handlers/specialist.handler.ts b/app/handlers/specialist.handler.ts
new file mode 100644
index 00000000..445f8c15
--- /dev/null
+++ b/app/handlers/specialist.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postSpecialist, patchSpecialist, removeSpecialist } from '~/services/specialist.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postSpecialist,
+  patch: patchSpecialist,
+  remove: removeSpecialist,
+})
diff --git a/app/handlers/subspecialist.handler.ts b/app/handlers/subspecialist.handler.ts
new file mode 100644
index 00000000..9fc7a67e
--- /dev/null
+++ b/app/handlers/subspecialist.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postSubspecialist, patchSubspecialist, removeSubspecialist } from '~/services/subspecialist.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postSubspecialist,
+  patch: patchSubspecialist,
+  remove: removeSubspecialist,
+})
diff --git a/app/handlers/unit.handler.ts b/app/handlers/unit.handler.ts
new file mode 100644
index 00000000..ff235bb4
--- /dev/null
+++ b/app/handlers/unit.handler.ts
@@ -0,0 +1,21 @@
+import { createCrudHandler } from '~/handlers/_handler'
+import { postUnit, patchUnit, removeUnit } from '~/services/unit.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postUnit,
+  patch: patchUnit,
+  remove: removeUnit,
+})
diff --git a/app/handlers/uom.handler.ts b/app/handlers/uom.handler.ts
index e24fbcfa..dd018400 100644
--- a/app/handlers/uom.handler.ts
+++ b/app/handlers/uom.handler.ts
@@ -1,92 +1,21 @@
-import { ref } from 'vue'
-
-// Handlers
-import { type ToastFn, handleAsyncAction } from '~/handlers/_handler'
-
-// Services
+import { createCrudHandler } from '~/handlers/_handler'
 import { postUom, patchUom, removeUom } from '~/services/uom.service'
 
-const recId = ref<number>(0)
-const recAction = ref<string>('')
-const recItem = ref<any>(null)
-const isReadonly = ref(false)
-const isProcessing = ref(false)
-const isFormEntryDialogOpen = ref(false)
-const isRecordConfirmationOpen = ref(false)
-
-function onResetState() {
-  recId.value = 0
-  recAction.value = ''
-  recItem.value = null
-}
-
-export async function handleActionSave(values: any, refresh: () => void, reset: () => void, toast: ToastFn) {
-  isProcessing.value = true
-  await handleAsyncAction<[any], any>({
-    action: postUom,
-    args: [values],
-    toast,
-    successMessage: 'Data berhasil disimpan',
-    errorMessage: 'Gagal menyimpan data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false
-      if (refresh) refresh()
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500)
-      isProcessing.value = false
-    },
-  })
-}
-
-export async function handleActionEdit(
-  id: number | string,
-  values: any,
-  refresh: () => void,
-  reset: () => void,
-  toast: ToastFn,
-) {
-  isProcessing.value = true
-  await handleAsyncAction<[number | string, any], any>({
-    action: patchUom,
-    args: [id, values],
-    toast,
-    successMessage: 'Data berhasil diubah',
-    errorMessage: 'Gagal mengubah data',
-    onSuccess: () => {
-      isFormEntryDialogOpen.value = false
-      if (refresh) refresh()
-    },
-    onFinally: (isSuccess: boolean) => {
-      if (isSuccess) setTimeout(reset, 500)
-      isProcessing.value = false
-    },
-  })
-}
-
-export async function handleActionRemove(id: number | string, refresh: () => void, toast: ToastFn) {
-  isProcessing.value = true
-  await handleAsyncAction<[number | string], any>({
-    action: removeUom,
-    args: [id],
-    toast,
-    successMessage: 'Data berhasil dihapus',
-    errorMessage: 'Gagal menghapus data',
-    onSuccess: () => {
-      if (refresh) refresh()
-    },
-    onFinally: () => {
-      onResetState()
-      isProcessing.value = false
-    },
-  })
-}
-
-export function handleCancelForm(reset: () => void) {
-  isFormEntryDialogOpen.value = false
-  setTimeout(() => {
-    reset()
-  }, 500)
-}
-
-export { recId, recAction, recItem, isReadonly, isProcessing, isFormEntryDialogOpen, isRecordConfirmationOpen }
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = createCrudHandler({
+  post: postUom,
+  patch: patchUom,
+  remove: removeUom,
+})
diff --git a/app/models/division.ts b/app/models/division.ts
new file mode 100644
index 00000000..e52e2cf6
--- /dev/null
+++ b/app/models/division.ts
@@ -0,0 +1,10 @@
+export interface Division {
+  code: string
+  name: string
+}
+
+export interface DivisionPosition {
+  code: string
+  name: string
+  division_id: number
+}
diff --git a/app/models/installation.ts b/app/models/installation.ts
new file mode 100644
index 00000000..c662714e
--- /dev/null
+++ b/app/models/installation.ts
@@ -0,0 +1,5 @@
+export interface Installation {
+  code: string
+  name: string
+  encounterClass_code: string
+}
diff --git a/app/models/medicine.ts b/app/models/medicine.ts
index 1d01991b..e49076fa 100644
--- a/app/models/medicine.ts
+++ b/app/models/medicine.ts
@@ -4,30 +4,21 @@ export interface MedicineBase {
 }
 
 export interface Medicine {
-  id: string
-  name: string
   code: string
+  name: string
   medicineGroup_code: string
   medicineMethod_code: string
   uom_code: string
-  type: string
-  dose: string
-  infra_id: string
-  stock: string
-  status: string
+  infra_id?: string | null
+  stock: number
 }
 
-export interface CreateDto {
-  name: string
-  code: string
-  medicineGroup_code: string
-  medicineMethod_code: string
-  uom_code: string
-  type: string
-  dose: string
-  infra_id: string
-  stock: string
-  status: string
+export interface CreateMedicineDto extends Medicine {
+
+}
+
+export interface UpdateMedicineDto extends CreateMedicineDto {
+  id: string | number
 }
 
 export interface GetListDto {
@@ -49,7 +40,7 @@ export interface GetDetailDto {
   id?: string
 }
 
-export interface UpdateDto extends CreateDto {
+export interface UpdateDto extends CreateMedicineDto {
   id?: number
 }
 
@@ -57,17 +48,14 @@ export interface DeleteDto {
   id?: string
 }
 
-export function genMedicine(): CreateDto {
+export function genMedicine(): CreateMedicineDto {
   return {
     name: 'name',
     code: 'code',
     medicineGroup_code: 'medicineGroup_code',
     medicineMethod_code: 'medicineMethod_code',
     uom_code: 'uom_code',
-    type: 'type',
-    dose: 'dose',
-    infra_id: 'infra_id',
-    stock: 'stock',
-    status: 'status',
+    infra_id: null,
+    stock: 0
   }
 }
diff --git a/app/models/specialist.ts b/app/models/specialist.ts
new file mode 100644
index 00000000..39b23390
--- /dev/null
+++ b/app/models/specialist.ts
@@ -0,0 +1,6 @@
+export interface Specialist {
+  id?: number
+  code: string
+  name: string
+  unit_id: number | string
+}
diff --git a/app/models/subspecialist.ts b/app/models/subspecialist.ts
new file mode 100644
index 00000000..32591ab3
--- /dev/null
+++ b/app/models/subspecialist.ts
@@ -0,0 +1,5 @@
+export interface Subspecialist {
+  code: string
+  name: string
+  specialist_id: number | string
+}
diff --git a/app/models/unit.ts b/app/models/unit.ts
new file mode 100644
index 00000000..27348354
--- /dev/null
+++ b/app/models/unit.ts
@@ -0,0 +1,6 @@
+export interface Unit {
+  id?: number
+  code: string
+  name: string
+  installation?: string | number
+}
diff --git a/app/pages/(features)/org-src/division/index.vue b/app/pages/(features)/org-src/division/index.vue
index e0a8a1fc..ed5f1c3b 100644
--- a/app/pages/(features)/org-src/division/index.vue
+++ b/app/pages/(features)/org-src/division/index.vue
@@ -7,7 +7,7 @@ definePageMeta({
   // middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
   title: 'Daftar Divisi',
-  contentFrame: 'cf-full-width',
+  contentFrame: 'cf-container-lg',
 })
 
 const route = useRoute()
diff --git a/app/pages/(features)/org-src/specialist/index.vue b/app/pages/(features)/org-src/specialist/index.vue
index e3e47d72..2f01b48b 100644
--- a/app/pages/(features)/org-src/specialist/index.vue
+++ b/app/pages/(features)/org-src/specialist/index.vue
@@ -6,8 +6,8 @@ import Error from '~/components/pub/base/error/error.vue'
 definePageMeta({
   // middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'List Specialist',
-  contentFrame: 'cf-full-width',
+  title: 'Daftar Specialist',
+  contentFrame: 'cf-container-lg',
 })
 
 const route = useRoute()
diff --git a/app/pages/(features)/org-src/subspecialist/index.vue b/app/pages/(features)/org-src/subspecialist/index.vue
index 7065ca77..9b29d034 100644
--- a/app/pages/(features)/org-src/subspecialist/index.vue
+++ b/app/pages/(features)/org-src/subspecialist/index.vue
@@ -6,8 +6,8 @@ import Error from '~/components/pub/base/error/error.vue'
 definePageMeta({
   // middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'List Specialist',
-  contentFrame: 'cf-full-width',
+  title: 'Daftar Subspecialist',
+  contentFrame: 'cf-container-lg',
 })
 
 const route = useRoute()
diff --git a/app/pages/(features)/org-src/unit/index.vue b/app/pages/(features)/org-src/unit/index.vue
index b4a96759..baa77d6b 100644
--- a/app/pages/(features)/org-src/unit/index.vue
+++ b/app/pages/(features)/org-src/unit/index.vue
@@ -6,8 +6,8 @@ import Error from '~/components/pub/base/error/error.vue'
 definePageMeta({
   // middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'List Unit',
-  contentFrame: 'cf-full-width',
+  title: 'Daftar Unit',
+  contentFrame: 'cf-container-lg',
 })
 
 const route = useRoute()
diff --git a/app/schemas/division.schema.ts b/app/schemas/division.schema.ts
new file mode 100644
index 00000000..1aecb3c6
--- /dev/null
+++ b/app/schemas/division.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+import type { Division, DivisionPosition } from '~/models/division'
+
+const DivisionSchema = 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 DivisionFormData = z.infer<typeof DivisionSchema> & (Division | DivisionPosition)
+
+export { DivisionSchema }
+export type { DivisionFormData }
diff --git a/app/schemas/medicine.schema.ts b/app/schemas/medicine.schema.ts
index 13f01d15..44113777 100644
--- a/app/schemas/medicine.schema.ts
+++ b/app/schemas/medicine.schema.ts
@@ -1,12 +1,13 @@
 import { z } from 'zod'
-import type { MedicineBase } from '~/models/medicine'
 
-const MedicineBaseSchema = 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')
+export const MedicineSchema = z.object({
+  code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimal 1 karakter'),
+  name: z.string({ required_error: 'Nama harus diisi' }).min(1, 'Nama minimal 1 karakter'),
+  medicineGroup_code: z.string({ required_error: 'Kelompok obat harus diisi' }).min(1, 'Kelompok obat harus diisi'),
+  medicineMethod_code: z.string({ required_error: 'Metode pemberian harus diisi' }).min(1, 'Metode pemberian harus diisi'),
+  uom_code: z.string({ required_error: 'Satuan harus diisi' }).min(1, 'Satuan harus diisi'),
+  infra_id: z.number().nullable().optional(),
+  stock: z.preprocess((val) => Number(val), z.number({ invalid_type_error: 'Stok harus berupa angka' }).min(1, 'Stok harus lebih besar dari 0')),
 })
 
-type MedicineBaseFormData = z.infer<typeof MedicineBaseSchema> & MedicineBase
-
-export { MedicineBaseSchema }
-export type { MedicineBaseFormData }
+export type MedicineFormData = z.infer<typeof MedicineSchema>
diff --git a/app/schemas/specialist.schema.ts b/app/schemas/specialist.schema.ts
new file mode 100644
index 00000000..10715d20
--- /dev/null
+++ b/app/schemas/specialist.schema.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod'
+import type { Specialist } from '~/models/specialist'
+
+const SpecialistSchema = 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'),
+  unit_id: z.number().positive('Unit harus diisi'),
+})
+
+type SpecialistFormData = z.infer<typeof SpecialistSchema> & Specialist
+
+export { SpecialistSchema }
+export type { SpecialistFormData }
diff --git a/app/schemas/subspecialist.schema.ts b/app/schemas/subspecialist.schema.ts
new file mode 100644
index 00000000..d485c95c
--- /dev/null
+++ b/app/schemas/subspecialist.schema.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod'
+import type { Subspecialist } from '~/models/subspecialist'
+
+const SubspecialistSchema = 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'),
+  specialist_id: z.number().positive('Spesialis harus diisi'),
+})
+
+type SubspecialistFormData = z.infer<typeof SubspecialistSchema> & Subspecialist
+
+export { SubspecialistSchema }
+export type { SubspecialistFormData }
diff --git a/app/schemas/unit.schema.ts b/app/schemas/unit.schema.ts
new file mode 100644
index 00000000..30a5a075
--- /dev/null
+++ b/app/schemas/unit.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+import type { Unit } from '~/models/unit'
+
+const UnitSchema = 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 UnitFormData = z.infer<typeof UnitSchema> & Unit
+
+export { UnitSchema }
+export type { UnitFormData }
diff --git a/app/services/division-position.service.ts b/app/services/division-position.service.ts
new file mode 100644
index 00000000..07cfbd15
--- /dev/null
+++ b/app/services/division-position.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/division-position'
+
+export async function getDivisionPositions(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(mainUrl, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching division-positions:', error)
+    throw new Error('Failed to fetch division-positions')
+  }
+}
+
+export async function getDivisionPositionDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching division-position detail:', error)
+    throw new Error('Failed to get division-position detail')
+  }
+}
+
+export async function postDivisionPosition(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting division-position:', error)
+    throw new Error('Failed to post division-position')
+  }
+}
+
+export async function patchDivisionPosition(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting division-position:', error)
+    throw new Error('Failed to put division-position')
+  }
+}
+
+export async function removeDivisionPosition(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    throw new Error('Failed to delete division-position')
+  }
+}
diff --git a/app/services/division.service.ts b/app/services/division.service.ts
new file mode 100644
index 00000000..38cd6118
--- /dev/null
+++ b/app/services/division.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/division'
+
+export async function getDivisions(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(mainUrl, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching divisions:', error)
+    throw new Error('Failed to fetch divisions')
+  }
+}
+
+export async function getDivisionDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching division detail:', error)
+    throw new Error('Failed to get division detail')
+  }
+}
+
+export async function postDivision(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting division:', error)
+    throw new Error('Failed to post division')
+  }
+}
+
+export async function patchDivision(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting division:', error)
+    throw new Error('Failed to put division')
+  }
+}
+
+export async function removeDivision(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    throw new Error('Failed to delete division')
+  }
+}
diff --git a/app/services/installation.service.ts b/app/services/installation.service.ts
new file mode 100644
index 00000000..8fd9e858
--- /dev/null
+++ b/app/services/installation.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/installation'
+
+export async function getInstallations(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(mainUrl, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching installations:', error)
+    throw new Error('Failed to fetch installations')
+  }
+}
+
+export async function getInstallationDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching installation detail:', error)
+    throw new Error('Failed to get installation detail')
+  }
+}
+
+export async function postInstallation(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting installation:', error)
+    throw new Error('Failed to post installation')
+  }
+}
+
+export async function patchInstallation(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting installation:', error)
+    throw new Error('Failed to put installation')
+  }
+}
+
+export async function removeInstallation(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    throw new Error('Failed to delete installation')
+  }
+}
diff --git a/app/services/medicine.service.ts b/app/services/medicine.service.ts
new file mode 100644
index 00000000..04860455
--- /dev/null
+++ b/app/services/medicine.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/medicine'
+
+export async function getMedicines(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(url, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching medicines:', error)
+    throw new Error('Failed to fetch medicines')
+  }
+}
+
+export async function getMedicineDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching medicine detail:', error)
+    throw new Error('Failed to get medicine detail')
+  }
+}
+
+export async function postMedicine(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting medicine:', error)
+    throw new Error('Failed to post medicine')
+  }
+}
+
+export async function patchMedicine(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error patching medicine:', error)
+    throw new Error('Failed to patch medicine')
+  }
+}
+
+export async function removeMedicine(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting medicine:', error)
+    throw new Error('Failed to delete medicine')
+  }
+}
diff --git a/app/services/specialist.service.ts b/app/services/specialist.service.ts
new file mode 100644
index 00000000..bd359918
--- /dev/null
+++ b/app/services/specialist.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/specialist'
+
+export async function getSpecialists(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(mainUrl, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching specialists:', error)
+    throw new Error('Failed to fetch specialists')
+  }
+}
+
+export async function getSpecialistDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching specialist detail:', error)
+    throw new Error('Failed to get specialist detail')
+  }
+}
+
+export async function postSpecialist(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting specialist:', error)
+    throw new Error('Failed to post specialist')
+  }
+}
+
+export async function patchSpecialist(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting specialist:', error)
+    throw new Error('Failed to put specialist')
+  }
+}
+
+export async function removeSpecialist(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    throw new Error('Failed to delete specialist')
+  }
+}
diff --git a/app/services/subspecialist.service.ts b/app/services/subspecialist.service.ts
new file mode 100644
index 00000000..c218b748
--- /dev/null
+++ b/app/services/subspecialist.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/subspecialist'
+
+export async function getSubspecialists(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(mainUrl, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching subspecialists:', error)
+    throw new Error('Failed to fetch subspecialists')
+  }
+}
+
+export async function getSubspecialistDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching subspecialist detail:', error)
+    throw new Error('Failed to get subspecialist detail')
+  }
+}
+
+export async function postSubspecialist(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting subspecialist:', error)
+    throw new Error('Failed to post subspecialist')
+  }
+}
+
+export async function patchSubspecialist(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting subspecialist:', error)
+    throw new Error('Failed to put subspecialist')
+  }
+}
+
+export async function removeSubspecialist(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    throw new Error('Failed to delete subspecialist')
+  }
+}
diff --git a/app/services/unit.service.ts b/app/services/unit.service.ts
new file mode 100644
index 00000000..82d565db
--- /dev/null
+++ b/app/services/unit.service.ts
@@ -0,0 +1,79 @@
+import { xfetch } from '~/composables/useXfetch'
+
+const mainUrl = '/api/v1/unit'
+
+export async function getUnits(params: any = null) {
+  try {
+    let url = mainUrl
+    if (params && typeof params === 'object' && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams()
+      for (const key in params) {
+        if (params[key] !== null && params[key] !== undefined && params[key] !== '') {
+          searchParams.append(key, params[key])
+        }
+      }
+      const queryString = searchParams.toString()
+      if (queryString) url += `?${queryString}`
+    }
+    const resp = await xfetch(mainUrl, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching units:', error)
+    throw new Error('Failed to fetch units')
+  }
+}
+
+export async function getUnitDetail(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'GET')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error fetching unit detail:', error)
+    throw new Error('Failed to get unit detail')
+  }
+}
+
+export async function postUnit(record: any) {
+  try {
+    const resp = await xfetch(mainUrl, 'POST', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error posting unit:', error)
+    throw new Error('Failed to post unit')
+  }
+}
+
+export async function patchUnit(id: number | string, record: any) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'PATCH', record)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error putting unit:', error)
+    throw new Error('Failed to put unit')
+  }
+}
+
+export async function removeUnit(id: number | string) {
+  try {
+    const resp = await xfetch(`${mainUrl}/${id}`, 'DELETE')
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error('Error deleting record:', error)
+    throw new Error('Failed to delete unit')
+  }
+}