diff --git a/app/components/content/encounter/entry.vue b/app/components/content/encounter/entry.vue
index 6fab59e8..a4ffc0d8 100644
--- a/app/components/content/encounter/entry.vue
+++ b/app/components/content/encounter/entry.vue
@@ -16,7 +16,7 @@ import { useIntegrationSepEntry } from '~/handlers/integration-sep-entry.handler
 const props = defineProps<{
   id: number
   classCode?: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
-  subClassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
+  subclassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
   formType: string
 }>()
 
@@ -77,9 +77,7 @@ function handleSaveClick() {
 }
 
 function handleFetch(value?: any) {
-  if (value?.subSpecialistId) {
-    handleFetchDoctors(value.subSpecialistId)
-  }
+  // handleFetchDoctors(props.subclassCode)
 }
 
 async function handleEvent(menu: string, value?: any) {
@@ -97,7 +95,7 @@ async function handleEvent(menu: string, value?: any) {
       isService: 'false',
       encounterId: props.id || null,
       sourcePath: route.path,
-      resource: `${props.classCode}-${props.subClassCode}`,
+      resource: `${props.classCode}-${props.subclassCode}`,
       ...value,
     })
   } else if (menu === 'sep-number-changed') {
@@ -213,7 +211,7 @@ onMounted(async () => {
     :is-action="true"
     :histories="histories"
   />
-  
+
   <!-- Footer Actions -->
   <div class="mt-6 flex justify-end gap-2 border-t border-t-slate-300 pt-4">
     <Button
diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index 341ac42f..c3f6cba9 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -27,7 +27,7 @@ import FilterForm from '~/components/app/encounter/filter-form.vue'
 // Props
 const props = defineProps<{
   classCode?: 'ambulatory' | 'emergency' | 'inpatient'
-  subClassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
+  subclassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
   canCreate?: boolean
   canUpdate?: boolean
   canDelete?: boolean
@@ -144,8 +144,8 @@ async function getPatientList() {
     if (props.classCode) {
       params['class-code'] = props.classCode
     }
-    if (props.subClassCode) {
-      params['sub-class-code'] = props.subClassCode
+    if (props.subclassCode) {
+      params['subclass-code'] = props.subclassCode
     }
     const result = await getEncounterList(params)
     if (result.success) {
diff --git a/app/const/common/role.ts b/app/const/common/role.ts
index a0d4565a..ea79b509 100644
--- a/app/const/common/role.ts
+++ b/app/const/common/role.ts
@@ -2,35 +2,47 @@ export const systemCode = 'system'
 
 export const rehabInstCode = 'rehab'
 export const rehabUnitCode = 'rehab'
+export const chemoUnitCode = 'chemo'
 
-export const headPosCode = 'head' // head position
-export const respPosCode = 'resp' // responsible position, verificator
+// Object keys are faster than array
+export const infraPositions: Record<string, boolean> = {
+  'head': true,
+  'resp': true,
+  'doc': true,
+  'nur':true
+}
+export type InfraPositionCode = keyof typeof infraPositions
 
-export type UnitLevel =
-  'inst' | // installation
-  'unit' | // unit / poly
-  'spec' | // specialist
-  'subspec' // subspecialist
+export const servicePositioons: Record<string, boolean> = {
+  'none': true,
+  'reg': true,
+  'scr': true,
+  'med': true,
+}
+export type ServicePositionCode = keyof typeof servicePositioons
 
-export const medicalRoles = [
-  'emp|doc', // doctor
-  'emp|nur', // nurse
-  'emp|miw', // midwife
-  'emp|thr', // therapist
-  'emp|nut', // nutritionist
-  'emp|pha', // pharmacy
-  'emp|lab'  // laborant
-]
+export const medicalRoles: Record<string, boolean> = {
+  'emp|doc': true, // doctor
+  'emp|nur': true, // nurse
+  'emp|miw': true, // midwife
+  'emp|thr': true, // therapist
+  'emp|nut': true, // nutritionist
+  'emp|pha': true, // pharmacy
+  'emp|lab': true  // laborant
+}
+export type MedicalRoleCode = keyof typeof medicalRoles
 
-export const serviceRoles = [
-  'emp|reg',
+export const serviceRoles: Record<string, boolean> = {
+  'emp|reg': true,
+  'emp|scr': true,
   ...medicalRoles,
-]
-
-export function genSpecHeadCode(unit_level: UnitLevel, unit_code: string): string {
-  return `${unit_level}|${unit_code}|${headPosCode}`
 }
+export type ServiceRoleCode = keyof typeof serviceRoles
 
-export function genUnitRespCode(unit_level: UnitLevel, unit_code: string): string {
-  return `${unit_level}|${unit_code}|${respPosCode}`
+export const unitLevels: Record<string, boolean> = {
+  'inst': true, // installation
+  'unit': true, // unit / poly
+  'spec': true, // specialist
+  'subspec': true, // subspecialist
 }
+export type UnitLevel = keyof typeof unitLevels
diff --git a/app/handlers/encounter-entry.handler.ts b/app/handlers/encounter-entry.handler.ts
index 168b1f56..fefe1e56 100644
--- a/app/handlers/encounter-entry.handler.ts
+++ b/app/handlers/encounter-entry.handler.ts
@@ -44,7 +44,7 @@ import {
 export function useEncounterEntry(props: {
   id: number
   classCode?: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
-  subClassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
+  subclassCode?: 'reg' | 'rehab' | 'chemo' | 'emg' | 'eon' | 'op' | 'icu' | 'hcu' | 'vk'
 }) {
   const route = useRoute()
   const userStore = useUserStore()
@@ -294,24 +294,42 @@ export function useEncounterEntry(props: {
     }
   }
 
-  async function handleFetchDoctors(subSpecialistId: string | null = null) {
+  async function handleFetchDoctors(unit?: string, specialist_code?: string, subSpecialist_code?: string) {
     try {
-      const filterParams: any = { 'page-size': 100, includes: 'employee-Person,unit,specialist,subspecialist' }
-
-      if (!subSpecialistId) {
-        doctorsList.value = await getDoctorValueLabelList(filterParams, true)
-        return
+      const filterParams: Record<string, any> = {
+        'page-size': 100,
+        includes: 'employee-Person,unit,specialist,subspecialist'
       }
 
-      const isSub = getIsSubspecialist(subSpecialistId, specialistsTree.value)
-
-      if (isSub) {
-        filterParams['subspecialist-id'] = subSpecialistId
-      } else {
-        filterParams['specialist-id'] = subSpecialistId
+      // rehab is special
+      if (unit) {
+        if (unit == 'rehab') {
+          filterParams['unit-code'] = 'rehab'
+        } else {
+          filterParams['unit-code'] = 'rehab'
+          filterParams['unit-code-opt'] = 'ne'
+        }
       }
-
+      if (specialist_code) {
+        if (specialist_code == 'rehab') {
+          filterParams['specialist-code'] = 'rehab'
+        } else {
+          filterParams['specialist-code'] = 'rehab'
+          filterParams['specialist-code-opt'] = 'ne'
+        }
+      }
+      if (subSpecialist_code) filterParams['subspecialist-code'] = subSpecialist_code
       doctorsList.value = await getDoctorValueLabelList(filterParams, true)
+
+      // const isSub = getIsSubspecialist(subSpecialistId, specialistsTree.value)
+
+      // if (isSub) {
+      //   filterParams['subspecialist-id'] = subSpecialistId
+      // } else {
+      //   filterParams['specialist-id'] = subSpecialistId
+      // }
+
+      // doctorsList.value = await getDoctorValueLabelList(filterParams, true)
     } catch (error) {
       console.error('Error fetching doctors:', error)
       doctorsList.value = []
@@ -332,7 +350,7 @@ export function useEncounterEntry(props: {
       value: item.toString(),
       label: participantGroups[item],
     })) as any
-    await handleFetchDoctors()
+    await handleFetchDoctors(props.subclassCode)
     await handleFetchSpecialists()
     if (route.query) {
       formObjects.value = { ...formObjects.value }
@@ -537,7 +555,7 @@ export function useEncounterEntry(props: {
         patient_id: patientId,
         appointment_doctor_code: formValues.doctor_code || null,
         class_code: props.classCode || '',
-        subClass_code: props.subClassCode || '',
+        subClass_code: props.subclassCode || '',
         infra_id: formValues.infra_id ?? null,
         unit_code: userStore?.user?.unit_code ?? null,
         refSource_name: formValues.refSource_name ?? 'RSSA',
diff --git a/app/lib/roles.ts b/app/lib/roles.ts
index 8e6561e3..36fc02ef 100644
--- a/app/lib/roles.ts
+++ b/app/lib/roles.ts
@@ -1,16 +1,26 @@
-import { medicalRoles, respPosCode } from '~/const/common/role'
+import type { UnitLevel, ServicePositionCode } from '~/const/common/role'
+import { medicalRoles, infraPositions } from '~/const/common/role'
 
-export function getServicePosition(role?: string): string {
+export function getServicePosition(role?: string): ServicePositionCode {
   if(!role) {
     return 'none'
   }
-  if (medicalRoles.includes(role)) {
-    return 'medical'
+  if (role in medicalRoles) {
+    return 'med'
   } else if (role === 'emp|reg') {
-    return 'registration'
+    return 'reg'
   } else if (role.includes('|resp')) {
       return 'verificator'
   } else {
     return 'none'
   }
 }
+
+export function genSpecHeadCode(unit_level: UnitLevel, unit_code: string): string {
+  return `${unit_level}|${unit_code}|${infraPositions.head}`
+}
+
+export function genUnitRespCode(unit_level: UnitLevel, unit_code: string): string {
+  return `${unit_level}|${unit_code}|${infraPositions.resp}`
+}
+
diff --git a/app/pages/(features)/ambulatory/encounter/add.vue b/app/pages/(features)/ambulatory/encounter/add.vue
index 89b9e6fb..ec776f2d 100644
--- a/app/pages/(features)/ambulatory/encounter/add.vue
+++ b/app/pages/(features)/ambulatory/encounter/add.vue
@@ -5,6 +5,7 @@ import { permissions } from '~/const/page-permission/ambulatory'
 
 // Helpers
 import { usePageChecker } from "~/lib/page-checker"
+import { getServicePosition } from '~/lib/roles'
 
 // Pubs
 import Error from '~/components/pub/my-ui/error/error.vue'
@@ -28,6 +29,19 @@ useHead({
 // Preps role checking
 const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/add'] || {}
 const hasAccess = getPageAccess(roleAccess, 'create')
+
+// TODO: Make a function for this
+const { user } = useUserStore()
+const servicePosition =  user.user_contractPosition_code == 'emp' ? getServicePosition('emp|'+user.employee_position_code) : null
+const subClassCode = servicePosition == 'med' ?
+  // medic
+  (user.unit_code == 'rehab' ? 'rehab' : 'reg') :
+  // non medic
+  (
+    user.employee_position_code == 'reg' ?
+      (user.installation_code == 'rehab' ? 'rehab' : 'reg') :
+      undefined
+  )
 </script>
 
 <template>
@@ -35,7 +49,7 @@ const hasAccess = getPageAccess(roleAccess, 'create')
     <Content
       :id="0"
       class-code="ambulatory"
-      sub-class-code="reg"
+      :subclass-code="subClassCode"
       form-type="add"
     />
   </div>
diff --git a/app/pages/(features)/ambulatory/encounter/index.vue b/app/pages/(features)/ambulatory/encounter/index.vue
index 6f7df89c..83df1936 100644
--- a/app/pages/(features)/ambulatory/encounter/index.vue
+++ b/app/pages/(features)/ambulatory/encounter/index.vue
@@ -11,6 +11,7 @@ import Error from '~/components/pub/my-ui/error/error.vue'
 
 // Apps
 import Content from '~/components/content/encounter/list.vue'
+import { getServicePosition } from '~/lib/roles'
 
 const { getRouteTitle, getPageAccess } = usePageChecker()
 
@@ -37,15 +38,28 @@ const canRemove = getPageAccess(roleAccess, 'delete')
 
 // User info
 const { user } = useUserStore()
-const subClassCode = user.unit_code == 'rehab' ? 'rehab' : 'reg'
+// TODO: Make a function for this
+const servicePosition =  user.user_contractPosition_code == 'emp' ? getServicePosition('emp|'+user.employee_position_code) : null
+const subClassCode = servicePosition == 'med' ?
+  // medic
+  (user.unit_code == 'rehab' ? 'rehab' : 'reg') :
+  // non medic
+  (
+    user.employee_position_code == 'reg' ?
+      (user.installation_code == 'rehab' ? 'rehab' : 'reg') :
+      undefined
+  )
 </script>
 
 <template>
   <div>
+    {{ user.employee_position_code }}---<br />
+    {{ servicePosition }}---<br />
+    {{ subClassCode }}---
     <div v-if="hasAccess">
       <Content
         class-code="ambulatory"
-        :sub-class-code="subClassCode"
+        :subclass-code="subClassCode"
         :can-create="canCreate"
         :can-delete="canRemove"
       />
diff --git a/app/pages/(features)/chemotherapy/list.vue b/app/pages/(features)/chemotherapy/early-encounter/index.vue
similarity index 55%
rename from app/pages/(features)/chemotherapy/list.vue
rename to app/pages/(features)/chemotherapy/early-encounter/index.vue
index 34093b2d..a70d7562 100644
--- a/app/pages/(features)/chemotherapy/list.vue
+++ b/app/pages/(features)/chemotherapy/early-encounter/index.vue
@@ -1,23 +1,19 @@
 <script setup lang="ts">
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/chemoteraphy'
+import { permissions } from '~/const/page-permission/ambulatory'
 import Error from '~/components/pub/my-ui/error/error.vue'
 
+import Content from '~/components/content/encounter/list.vue'
+
 definePageMeta({
   middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Daftar Kempterapi',
+  roles: ['room|resp'],
+  title: 'Daftar Kunjungan',
   contentFrame: 'cf-full-width',
 })
 
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: Record<string, Permission[]> = permissions['/chemotherapy'] || {}
-
+// Preps role checking
+const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
 const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
@@ -28,13 +24,27 @@ if (!hasAccess) {
 
 // Define permission-based computed properties
 const canRead = hasReadAccess(roleAccess)
+console.log('canRead', canRead)
+
+// Page needs
+const route = useRoute()
+useHead({
+  title: () => route.meta.title as string,
+})
 </script>
 
 <template>
   <div>
     <div v-if="canRead">
-      <ContentChemotherapyList />
+      <Content
+        class-code="ambulatory"
+        sub-class-code="chemo"
+        type="encounter"
+      />
     </div>
-    <Error v-else :status-code="403" />
+    <Error
+      v-else
+      :status-code="403"
+    />
   </div>
 </template>
diff --git a/app/pages/(features)/common/uom/index.vue b/app/pages/(features)/common-cr/uom/index.vue
similarity index 100%
rename from app/pages/(features)/common/uom/index.vue
rename to app/pages/(features)/common-cr/uom/index.vue
diff --git a/app/pages/(features)/rehab/encounter/[id]/education-assessment/add.vue b/app/pages/(features)/rehab/encounter/[id]/education-assessment/add.vue
deleted file mode 100644
index 98eee259..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/education-assessment/add.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Assessment Education',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-// const hasAccess = checkRole(roleAccess)
-const hasAccess = true
-if (!hasAccess) {
-  navigateTo('/403')
-}
-
-// Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentAssessmentEducationAdd />
-    </div>
-    <Error
-      v-else
-      :status-code="403"
-    />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
deleted file mode 100644
index 91076c03..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentKfrEntry mode="edit" />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue b/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
deleted file mode 100644
index e8d1c895..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentKfrEntry />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
deleted file mode 100644
index e1059769..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/edit.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Update PRB',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentPrbEntry />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/index.vue
deleted file mode 100644
index 1d66b563..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/prb/[prb_id]/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Detail PRB',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentPrbDetail :patient-id="Number(route.params.id)" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/prb/add.vue b/app/pages/(features)/rehab/encounter/[id]/prb/add.vue
deleted file mode 100644
index b168fcb5..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/prb/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah PRB',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, getPagePermissions } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const pagePermission = getPagePermissions(roleAccess)
-const callbackUrl = route.query['return-path'] as string | undefined
-</script>
-
-<template>
-  <div>
-    <div v-if="pagePermission.canRead">
-      <ContentPrbEntry :callback-url="callbackUrl" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/process.vue b/app/pages/(features)/rehab/encounter/[id]/process.vue
deleted file mode 100644
index 49a5dd6d..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/process.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-import EncounterProcess from '~/components/content/encounter/process.vue'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Kunjungan',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess, getPagePermissions } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const pagePermission = getPagePermissions(roleAccess)
-</script>
-
-<template>
-  <div v-if="pagePermission.canRead">
-    <EncounterProcess class-code="ambulatory" sub-class-code="rehab" />
-  </div>
-  <Error v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
deleted file mode 100644
index a90f1d10..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Update Surat Kontrol',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentSurgeryReportEntry />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
deleted file mode 100644
index df4cfdef..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Detail Surat Kontrol',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/patient']
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentSurgeryReportDetail :patient-id="Number(route.params.id)" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue b/app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
deleted file mode 100644
index 58faedef..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Surat Kontrol',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, getPagePermissions } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const pagePermission = getPagePermissions(roleAccess)
-const callbackUrl = route.query['return-path'] as string | undefined
-</script>
-
-<template>
-  <div>
-    <div v-if="pagePermission.canRead">
-      <ContentSurgeryReportEntry :callback-url="callbackUrl" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
deleted file mode 100644
index 9593e171..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentTherapyProtocolEdit />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
deleted file mode 100644
index cf35e5ec..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentTherapyProtocolAdd />
-  </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
deleted file mode 100644
index a2f68104..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/vaccine-data/[vaccine_data_id]/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Detail Data Vaksin',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS[`/rehab/encounter`]
-
-const { checkRole, hasReadAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-// const canRead = hasReadAccess(roleAccess)
-const canRead = true
-</script>
-
-<template>
-  <div>
-    <div v-if="canRead">
-      <ContentVaccineDataDetail :patient-id="Number(route.params.id)" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/vaccine-data/add.vue b/app/pages/(features)/rehab/encounter/[id]/vaccine-data/add.vue
deleted file mode 100644
index df4c33b9..00000000
--- a/app/pages/(features)/rehab/encounter/[id]/vaccine-data/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Data Vaksin',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => route.meta.title as string,
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, getPagePermissions } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   navigateTo('/403')
-// }
-
-// Define permission-based computed properties
-const pagePermission = getPagePermissions(roleAccess)
-const callbackUrl = route.query['return-path'] as string | undefined
-</script>
-
-<template>
-  <div>
-    <div v-if="pagePermission.canRead">
-      <ContentVaccineDataEntry :callback-url="callbackUrl" />
-    </div>
-    <Error v-else :status-code="403" />
-  </div>
-</template>
diff --git a/app/pages/(features)/resume/add.vue b/app/pages/(features)/resume/add.vue
deleted file mode 100644
index 7cc707f9..00000000
--- a/app/pages/(features)/resume/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Resume',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentResumeAdd />
-  </div>
-  <Error v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/therapy-protocol/[id]/detail.vue b/app/pages/(features)/therapy-protocol/[id]/detail.vue
deleted file mode 100644
index 5fc1b9a6..00000000
--- a/app/pages/(features)/therapy-protocol/[id]/detail.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Detail Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentTherapyProtocolDetail/>
-  </div>
-  <Error v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/therapy-protocol/[id]/edit.vue b/app/pages/(features)/therapy-protocol/[id]/edit.vue
deleted file mode 100644
index c0629508..00000000
--- a/app/pages/(features)/therapy-protocol/[id]/edit.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Edit Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentTherapyProtocolEdit />
-  </div>
-  <Error v-else :status-code="403" />
-</template>
diff --git a/app/pages/(features)/therapy-protocol/add.vue b/app/pages/(features)/therapy-protocol/add.vue
deleted file mode 100644
index a489abc5..00000000
--- a/app/pages/(features)/therapy-protocol/add.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { PagePermission } from '~/models/role'
-import Error from '~/components/pub/my-ui/error/error.vue'
-import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
-definePageMeta({
-  middleware: ['rbac'],
-  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
-  title: 'Tambah Protokol Terapi',
-  contentFrame: 'cf-full-width',
-})
-
-const route = useRoute()
-
-useHead({
-  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
-})
-
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
-
-const { checkRole, hasCreateAccess } = useRBAC()
-
-// Check if user has access to this page
-const hasAccess = checkRole(roleAccess)
-// if (!hasAccess) {
-//   throw createError({
-//     statusCode: 403,
-//     statusMessage: 'Access denied',
-//   })
-// }
-
-// Define permission-based computed properties
-const canCreate = true // hasCreateAccess(roleAccess)
-</script>
-
-<template>
-  <div v-if="canCreate">
-    <ContentTherapyProtocolAdd />
-  </div>
-  <Error v-else :status-code="403" />
-</template>