diff --git a/app/components/content/chemotherapy/process.vue b/app/components/content/chemotherapy/process.vue
index 2a61c468..5cd0b452 100644
--- a/app/components/content/chemotherapy/process.vue
+++ b/app/components/content/chemotherapy/process.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import EncounterHome from '~/components/content/encounter/home.vue'
+import Process from '~/components/content/encounter/process.vue'
 </script>
 
 <template>
-  <EncounterHome display="menu" class-code="ambulatory" sub-class-code="chemo" />
+  <Process display="menu" class-code="ambulatory" sub-class-code="chemo" />
 </template>
diff --git a/app/components/content/control-letter/list.vue b/app/components/content/control-letter/list.vue
index 87a3d33e..9be22012 100644
--- a/app/components/content/control-letter/list.vue
+++ b/app/components/content/control-letter/list.vue
@@ -11,8 +11,9 @@ import { getList, remove } from '~/services/control-letter.service'
 import { toast } from '~/components/pub/ui/toast'
 import type { Encounter } from '~/models/encounter'
 import WarningAlert from '~/components/pub/my-ui/alert/warning-alert.vue'
-import type { PagePermission } from '~/models/role'
+// import type { PagePermission } from '~/models/role'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import { permissions } from '~/const/page-permission/chemoteraphy'
 import { unauthorizedToast } from '~/lib/utils'
 import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
 import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
@@ -20,7 +21,7 @@ import HistoryDialog from '~/components/app/control-letter/history-dialog.vue'
 // #endregion
 
 // #region Permission
-const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+const roleAccess = permissions['/rehab/encounter'] || {}
 const { getPagePermissions } = useRBAC()
 const pagePermission = getPagePermissions(roleAccess)
 
@@ -142,7 +143,7 @@ watch([recId, recAction, timestamp], () => {
       break
 
     case ActionEvents.showEdit:
-      if(pagePermission.canUpdate){ 
+      if(pagePermission.canUpdate){
         navigateTo({
           name: 'rehab-encounter-id-control-letter-control_letter_id-edit',
           params: { id: encounterId, "control_letter_id": recId.value },
@@ -185,7 +186,7 @@ watch([recId, recAction, timestamp], () => {
         @click="isHistoryDialogOpen = true">
         <Icon name="i-lucide-history" class="h-4 w-4" /> Riwayat Program Nasional</Button>
     </div>
-    
+
     <AppControlLetterList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
     <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
@@ -211,7 +212,7 @@ watch([recId, recAction, timestamp], () => {
         </div>
       </template>
     </RecordConfirmation>
-    
+
       <HistoryDialog
         v-model:is-modal-open="isHistoryDialogOpen"
         :data="historyData.data.value"
diff --git a/app/models/role.ts b/app/models/role.ts
index 4829a02d..7f96035a 100644
--- a/app/models/role.ts
+++ b/app/models/role.ts
@@ -1,5 +1,3 @@
-import type { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
 export interface User {
   id: string
   name: string
diff --git a/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue b/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue
index 534f49b3..ad5dfe37 100644
--- a/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue
+++ b/app/pages/(features)/chemotherapy/encounter/[id]/detail.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/outpatient'
+import { permissions } from '~/const/page-permission/ambulatory'
 import Error from '~/components/pub/my-ui/error/error.vue'
 import Content from '~/components/content/encounter/detail.vue'
 
@@ -12,7 +12,7 @@ definePageMeta({
 })
 
 // Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/outpatient/encounter'] || {}
+const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter'] || {}
 const { checkRole, hasReadAccess } = useRBAC()
 
 // Check if user has access to this page
diff --git a/app/pages/(features)/chemotherapy/encounter/[id]/process.vue b/app/pages/(features)/chemotherapy/encounter/[id]/process.vue
index 030440e2..9884974a 100644
--- a/app/pages/(features)/chemotherapy/encounter/[id]/process.vue
+++ b/app/pages/(features)/chemotherapy/encounter/[id]/process.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/outpatient'
+import { permissions } from '~/const/page-permission/chemoteraphy'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import Content from '~/components/content/encounter/process-next.vue'
+import Content from '~/components/content/encounter/process.vue'
 
 definePageMeta({
   middleware: ['rbac'],
diff --git a/app/pages/(features)/chemotherapy/encounter/add.vue b/app/pages/(features)/chemotherapy/encounter/add.vue
index 438f0773..a7ceb7e9 100644
--- a/app/pages/(features)/chemotherapy/encounter/add.vue
+++ b/app/pages/(features)/chemotherapy/encounter/add.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/outpatient'
+import { permissions } from '~/const/page-permission/ambulatory'
 import Error from '~/components/pub/my-ui/error/error.vue'
 
 import Content from '~/components/content/encounter/entry.vue'
diff --git a/app/pages/(features)/chemotherapy/encounter/index.vue b/app/pages/(features)/chemotherapy/encounter/index.vue
index 4a8c9360..293b3adf 100644
--- a/app/pages/(features)/chemotherapy/encounter/index.vue
+++ b/app/pages/(features)/chemotherapy/encounter/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/outpatient'
+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'
diff --git a/app/pages/(features)/emergency/encounter/[id]/process.vue b/app/pages/(features)/emergency/encounter/[id]/process.vue
index 7143d512..31065c11 100644
--- a/app/pages/(features)/emergency/encounter/[id]/process.vue
+++ b/app/pages/(features)/emergency/encounter/[id]/process.vue
@@ -2,7 +2,7 @@
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/emergency'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import Content from '~/components/content/encounter/process-next.vue'
+import Content from '~/components/content/encounter/process.vue'
 
 definePageMeta({
   middleware: ['rbac'],
@@ -36,4 +36,4 @@ useHead({
     <Content class-code="emergency" sub-class-code="emg" />
   </div>
   <Error v-else :status-code="403" />
-</template>
\ No newline at end of file
+</template>
diff --git a/app/pages/(features)/inpatient/encounter/[id]/process.vue b/app/pages/(features)/inpatient/encounter/[id]/process.vue
index 0a3fbe72..7a59f42b 100644
--- a/app/pages/(features)/inpatient/encounter/[id]/process.vue
+++ b/app/pages/(features)/inpatient/encounter/[id]/process.vue
@@ -2,7 +2,7 @@
 import type { Permission } from '~/models/role'
 import { permissions } from '~/const/page-permission/inpatient'
 import Error from '~/components/pub/my-ui/error/error.vue'
-import Content from '~/components/content/encounter/process-next.vue'
+import Content from '~/components/content/encounter/process.vue'
 
 definePageMeta({
   middleware: ['rbac'],
diff --git a/app/pages/(features)/outpatient/encounter/[id]/detail.vue b/app/pages/(features)/outpatient/encounter/[id]/detail.vue
index 534f49b3..39bc5e13 100644
--- a/app/pages/(features)/outpatient/encounter/[id]/detail.vue
+++ b/app/pages/(features)/outpatient/encounter/[id]/detail.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Permission } from '~/models/role'
-import { permissions } from '~/const/page-permission/outpatient'
+import { permissions } from '~/const/page-permission/ambulatory'
 import Error from '~/components/pub/my-ui/error/error.vue'
 import Content from '~/components/content/encounter/detail.vue'
 
diff --git a/app/pages/(features)/rehab/encounter/[id]/process.vue b/app/pages/(features)/rehab/encounter/[id]/process.vue
index 9708adfd..68cc7c02 100644
--- a/app/pages/(features)/rehab/encounter/[id]/process.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/process.vue
@@ -2,7 +2,7 @@
 import type { PagePermission } from '~/models/role'
 import Error from '~/components/pub/my-ui/error/error.vue'
 import { PAGE_PERMISSIONS } from '~/lib/page-permission'
-import EncounterProcess from '~/components/content/encounter/process-next.vue'
+import EncounterProcess from '~/components/content/encounter/process.vue'
 
 definePageMeta({
   middleware: ['rbac'],