diff --git a/app/components/app/doctor/entry-form.vue b/app/components/app/doctor/entry-form.vue
index 52f079ac..bb638f94 100644
--- a/app/components/app/doctor/entry-form.vue
+++ b/app/components/app/doctor/entry-form.vue
@@ -3,6 +3,18 @@ import Block from '~/components/pub/form/block.vue'
 import FieldGroup from '~/components/pub/form/field-group.vue'
 import Field from '~/components/pub/form/field.vue'
 import Label from '~/components/pub/form/label.vue'
+
+const props = defineProps<{ modelValue: any }>()
+const emit = defineEmits(['update:modelValue', 'event'])
+
+const data = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+})
+
+function onClick(type: string) {
+  emit('event', type)
+}
 </script>
 
 <template>
@@ -18,7 +30,7 @@ import Label from '~/components/pub/form/label.vue'
           <FieldGroup :column="1">
             <Label>Nama dan Gelar</Label>
             <Field>
-              <Input type="text" name="name" default-value="dr." />
+              <Input v-model="data.name" type="text" name="name" default-value="dr." />
             </Field>
             <Field>
               <Input type="text" name="name" />
@@ -61,7 +73,6 @@ import Label from '~/components/pub/form/label.vue'
             <Label>Fee Rajal</Label>
             <Field>
               <Input type="number" name="outPatient_rate" />
-
             </Field>
           </FieldGroup>
           <FieldGroup :column="2">
@@ -76,8 +87,8 @@ import Label from '~/components/pub/form/label.vue'
             <Label>Status</Label>
             <Field>
               <Input type="select" name="status">
-              <option value="active">Aktif</option>
-              <option value="inactive">Tidak Aktif</option>
+                <option value="active">Aktif</option>
+                <option value="inactive">Tidak Aktif</option>
               </Input>
             </Field>
           </FieldGroup>
@@ -94,13 +105,12 @@ import Label from '~/components/pub/form/label.vue'
             <Field>
               <Input type="password" name="password" />
             </Field>
-
           </FieldGroup>
         </Block>
       </div>
     </div>
     <div class="my-2 flex justify-end py-2">
-      <PubNavFooterCsd />
+      <PubNavFooterCsd @click="onClick" />
     </div>
   </form>
 </template>
diff --git a/app/components/flow/doctor/add.vue b/app/components/flow/doctor/add.vue
index 0a990f90..98632f5c 100644
--- a/app/components/flow/doctor/add.vue
+++ b/app/components/flow/doctor/add.vue
@@ -1,6 +1,20 @@
 <script setup lang="ts">
+function onEvent(type: string) {
+  if (type === 'cancel') {
+    navigateTo('/doctor')
+  } else if (type === 'draft') {
+    // do something
+  } else if (type === 'submit') {
+    // do something
+  }
+}
+const data = ref({
+  name: '',
+  specialization: '',
+  hospital: '',
+})
 </script>
 
 <template>
-  <AppDoctorEntryForm />
+  <AppDoctorEntryForm v-model="data" @event="onEvent" />
 </template>
diff --git a/app/components/pub/nav/footer/csd.vue b/app/components/pub/nav/footer/csd.vue
index 78874932..497081e3 100644
--- a/app/components/pub/nav/footer/csd.vue
+++ b/app/components/pub/nav/footer/csd.vue
@@ -12,15 +12,15 @@ function onClick(type: ClickType) {
 
 <template>
   <div class="m-2 flex gap-2 px-2">
-    <Button class="bg-gray-400" @click="onClick('cancel')">
+    <Button class="bg-gray-400" type="button" @click="onClick('cancel')">
       <Icon name="i-lucide-arrow-left" class="me-2 align-middle" />
       Kembali
     </Button>
-    <Button class="bg-orange-500" variant="outline" @click="onClick('draft')">
+    <Button class="bg-orange-500" variant="outline" type="button" @click="onClick('draft')">
       <Icon name="i-lucide-file" class="me-2" />
       Draf
     </Button>
-    <Button class="bg-primary" @click="onClick('submit')">
+    <Button class="bg-primary" type="button" @click="onClick('submit')">
       <Icon name="i-lucide-check" class="me-2 align-middle" />
       Selesai
     </Button>
diff --git a/app/pages/(features)/rehab/examination-queue/index.vue b/app/pages/(features)/rehab/examination-queue/index.vue
new file mode 100644
index 00000000..8616dd19
--- /dev/null
+++ b/app/pages/(features)/rehab/examination-queue/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>Examination Queue</div>
+</template>
diff --git a/app/pages/(features)/rehab/examination/index.vue b/app/pages/(features)/rehab/examination/index.vue
new file mode 100644
index 00000000..806b2650
--- /dev/null
+++ b/app/pages/(features)/rehab/examination/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>Examination</div>
+</template>
diff --git a/app/pages/(features)/rehab/registration-queue/index.vue b/app/pages/(features)/rehab/registration-queue/index.vue
new file mode 100644
index 00000000..053b5233
--- /dev/null
+++ b/app/pages/(features)/rehab/registration-queue/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>Registration Queue</div>
+</template>
diff --git a/app/pages/(features)/rehab/registration/index.vue b/app/pages/(features)/rehab/registration/index.vue
new file mode 100644
index 00000000..90430b84
--- /dev/null
+++ b/app/pages/(features)/rehab/registration/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>Registration</div>
+</template>
diff --git a/public/side-menu-items/sys.json b/public/side-menu-items/sys.json
index 5e81d044..18bbd3dc 100644
--- a/public/side-menu-items/sys.json
+++ b/public/side-menu-items/sys.json
@@ -43,7 +43,19 @@
   {
     "title": "Rehabilitasi Medik",
     "icon": "i-lucide-heart",
-    "link": "/rehabilitasi"
+    "link": "/rehabilitasi",
+    "children": [
+      {
+        "title": "Daftar Kunjungan Rawat Jalan",
+        "icon": "i-lucide-stethoscope",
+        "link": "/rehab/registration-queue"
+      },
+      {
+        "title": "Daftar Kunjungan Rawat Inap",
+        "icon": "i-lucide-building-2",
+        "link": "/rehab/examination"
+      }
+    ]
   },
   {
     "title": "Rawat Inap",