From 399c3cbaee160cddfe7750de378c71ea6455a42c Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Thu, 20 Nov 2025 11:19:03 +0700
Subject: [PATCH 01/13] Squashed commit of the following:

commit 72ce2260c50597f782f07d29db3985607ecc2f34
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 17 15:19:36 2025 +0700

    Feat: add doc preview in Therpay protocol List

commit 7032cd2409a660d40899ffd421137e4158cfde4a
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Wed Nov 12 15:34:30 2025 +0700

    Fix: prepare API integration protokol terapi verification

commit dbf6f78d00afc818baf2b34d128ee2153814cc88
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Wed Nov 12 14:09:28 2025 +0700

    Feat: add basic CRUD therapy protocol

commit 46a44e90fe4d4097b5460d2d4e5689b2a5389467
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 11 15:57:54 2025 +0700

    Fix: Prepare protokol terapi API Integration

commit 4674090566727cebd947e50e2c06c44e8c7afa7e
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 10 15:33:22 2025 +0700

    Fix: hotfix style add protokol terapi

commit 919c91abd8ef8b4cd193012eed7f5e8cf635cda2
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 10 15:17:14 2025 +0700

    Fix: Typo drpodown-action-p in protokol-terapi

commit e21d30eacf1a08118e289d4bb64889e708d5023a
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 10 15:14:33 2025 +0700

    Fix: add diagnose & procedure dialog picker in add protokol terapi

commit 9a3d73b72b0dceea778d83e7630c5ead110a6a4c
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 4 10:21:24 2025 +0700

    Fix: Add Schema therapy protocol rehab medik

commit 4d8d2d633bbbd78038b1cc607558c1ceb31c5986
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 4 09:30:55 2025 +0700

    Fix: refactor Actions Btn ba-dr-su

commit 5f290a6e4bd1559c0e5864a508c5ab650cfae6e8
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 3 17:08:20 2025 +0700

    Feat: UI protokol terapi in Rehab medik

commit 63010f69ff30532bb8ac91443112f31d4942b221
Author: Khafid Prayoga <khafidp@pm.me>
Date:   Tue Oct 21 09:54:13 2025 +0700

    wip: list protokol terapi

commit 44eedc298680a5255fee0ee8feee3e24beda93dd
Author: Khafid Prayoga <khafidp@pm.me>
Date:   Mon Oct 20 12:54:01 2025 +0700

    feat(therapy-protocol): init form entry

    feat(therapy-protocol): init page routes

    wip: init entry form

    wip: form entry protokol terapi

    todo: table procedure, and diagnose  picker

    wip: schema form new entry

    todo: picker/modal yang relateds ke form entry
---
 app/assets/svg/wavey-fingerprint.svg          |   1 +
 app/components/app/diagnose-src/list.vue      |   9 +-
 app/components/app/procedure-src/list.vue     |   9 +-
 .../_common/banner-patient-in-therapy.vue     |  19 ++
 .../_common/btn-confirmation-detail.vue       |  28 ++
 .../_common/radio-illness-bcs-work.vue        |  92 ++++++
 .../_common/radio-relationship.vue            |  92 ++++++
 .../_common/select-arrangement.vue            |  72 +++++
 .../_common/select-date-range.vue             |  52 ++++
 .../therapy-protocol/_common/select-date.vue  | 121 ++++++++
 .../_common/select-death-cause.vue            |  71 +++++
 .../_common/select-faskes.vue                 |  70 +++++
 .../_common/select-primary-diagnosis.vue      |  70 +++++
 .../_common/select-secondary-diagnosis.vue    |  71 +++++
 .../therapy-protocol/_common/text-captcha.vue | 175 ++++++++++++
 .../therapy-protocol/_common/verify-badge.vue |  30 ++
 .../app/therapy-protocol/add-list.cfg.ts      |  51 ++++
 .../app/therapy-protocol/detail-list.cfg.ts   |  28 ++
 .../app/therapy-protocol/detail.vue           | 145 ++++++++++
 app/components/app/therapy-protocol/edit.vue  | 217 +++++++++++++++
 .../app/therapy-protocol/entry-form.vue       | 137 +++++++++
 app/components/app/therapy-protocol/entry.vue | 204 ++++++++++++++
 .../therapy-protocol/field/base-textarea.vue  |  40 +++
 .../app/therapy-protocol/field/index.ts       |   4 +
 .../field/radio-relations.vue                 |  77 +++++
 .../field/radio-work-disease.vue              |  77 +++++
 .../field/select-examination-date.vue         |  52 ++++
 .../app/therapy-protocol/history-dialog.vue   |  43 +++
 .../app/therapy-protocol/history-list.cfg.ts  |  45 +++
 .../app/therapy-protocol/list.cfg.ts          |  53 ++++
 app/components/app/therapy-protocol/list.vue  |  31 +++
 .../dropdown-action-p.vue                     |  64 +++++
 .../procedure-list-cfg.ts                     |  33 +++
 .../arrangement-procedure/procedure-list.vue  | 120 ++++++++
 .../procedure-picker.vue                      |  62 +++++
 .../diagnosis-list-cfg.ts                     |  33 +++
 .../functional-diagnosis/diagnosis-list.vue   | 108 ++++++++
 .../functional-diagnosis/diagnosis-picker.vue |  62 +++++
 .../dropdown-action-p.vue                     |  64 +++++
 .../medical-diagnosis/diagnosis-list-cfg.ts   |  33 +++
 .../medical-diagnosis/diagnosis-list.vue      | 107 +++++++
 .../medical-diagnosis/diagnosis-picker.vue    |  63 +++++
 .../medical-diagnosis/dropdown-action-p.vue   |  64 +++++
 .../app/therapy-protocol/verify-dialog.vue    | 108 ++++++++
 app/components/content/encounter/process.vue  |   9 +-
 .../content/therapy-protocol/add.vue          | 152 ++++++++++
 .../content/therapy-protocol/detail.vue       | 115 ++++++++
 .../content/therapy-protocol/edit.vue         | 123 ++++++++
 .../content/therapy-protocol/history-list.vue | 178 ++++++++++++
 .../content/therapy-protocol/list.vue         | 262 ++++++++++++++++++
 .../pub/my-ui/data/dropdown-action-dp.vue     |  77 +++++
 .../pub/my-ui/data/dropdown-action-duvp.vue   | 106 +++++++
 .../pub/my-ui/data/dropdown-action-p.vue      |  64 +++++
 app/components/pub/my-ui/data/types.ts        |   2 +
 .../pub/my-ui/form/text-area-input.vue        |  86 ++++++
 app/components/pub/my-ui/modal/dialog.vue     |  13 +-
 .../pub/my-ui/modal/doc-preview-dialog.vue    |  29 ++
 .../pub/my-ui/nav-footer/ba-dr-su.vue         |   8 +-
 app/handlers/therapy-protocol.handler.ts      |  24 ++
 .../[therapy_protocol_id]/edit.vue            |  44 +++
 .../encounter/[id]/therapy-protocol/add.vue   |  44 +++
 .../therapy-protocol/[id]/detail.vue          |  41 +++
 .../(features)/therapy-protocol/[id]/edit.vue |  41 +++
 app/pages/(features)/therapy-protocol/add.vue |  41 +++
 app/schemas/therapy-protocol.schema.ts        | 159 +++++++++++
 app/schemas/verification.schema.ts            |  19 ++
 app/services/therapy-protocol.service.ts      |  27 ++
 67 files changed, 4747 insertions(+), 24 deletions(-)
 create mode 100644 app/assets/svg/wavey-fingerprint.svg
 create mode 100644 app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
 create mode 100644 app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
 create mode 100644 app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
 create mode 100644 app/components/app/therapy-protocol/_common/radio-relationship.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-arrangement.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-date-range.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-date.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-death-cause.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-faskes.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
 create mode 100644 app/components/app/therapy-protocol/_common/text-captcha.vue
 create mode 100644 app/components/app/therapy-protocol/_common/verify-badge.vue
 create mode 100644 app/components/app/therapy-protocol/add-list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/detail-list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/detail.vue
 create mode 100644 app/components/app/therapy-protocol/edit.vue
 create mode 100644 app/components/app/therapy-protocol/entry-form.vue
 create mode 100644 app/components/app/therapy-protocol/entry.vue
 create mode 100644 app/components/app/therapy-protocol/field/base-textarea.vue
 create mode 100644 app/components/app/therapy-protocol/field/index.ts
 create mode 100644 app/components/app/therapy-protocol/field/radio-relations.vue
 create mode 100644 app/components/app/therapy-protocol/field/radio-work-disease.vue
 create mode 100644 app/components/app/therapy-protocol/field/select-examination-date.vue
 create mode 100644 app/components/app/therapy-protocol/history-dialog.vue
 create mode 100644 app/components/app/therapy-protocol/history-list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
 create mode 100644 app/components/app/therapy-protocol/verify-dialog.vue
 create mode 100644 app/components/content/therapy-protocol/add.vue
 create mode 100644 app/components/content/therapy-protocol/detail.vue
 create mode 100644 app/components/content/therapy-protocol/edit.vue
 create mode 100644 app/components/content/therapy-protocol/history-list.vue
 create mode 100644 app/components/content/therapy-protocol/list.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-dp.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-duvp.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-p.vue
 create mode 100644 app/components/pub/my-ui/form/text-area-input.vue
 create mode 100644 app/components/pub/my-ui/modal/doc-preview-dialog.vue
 create mode 100644 app/handlers/therapy-protocol.handler.ts
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
 create mode 100644 app/pages/(features)/therapy-protocol/[id]/detail.vue
 create mode 100644 app/pages/(features)/therapy-protocol/[id]/edit.vue
 create mode 100644 app/pages/(features)/therapy-protocol/add.vue
 create mode 100644 app/schemas/therapy-protocol.schema.ts
 create mode 100644 app/schemas/verification.schema.ts
 create mode 100644 app/services/therapy-protocol.service.ts

diff --git a/app/assets/svg/wavey-fingerprint.svg b/app/assets/svg/wavey-fingerprint.svg
new file mode 100644
index 00000000..b281297f
--- /dev/null
+++ b/app/assets/svg/wavey-fingerprint.svg
@@ -0,0 +1 @@
+<svg xmlns='http://www.w3.org/2000/svg'  width='250' height='30' viewBox='0 0 1000 120'><rect fill='#000000' width='1000' height='120'/><g  fill='none' stroke='#222' stroke-width='10' stroke-opacity='1'><path d='M-500 75c0 0 125-30 250-30S0 75 0 75s125 30 250 30s250-30 250-30s125-30 250-30s250 30 250 30s125 30 250 30s250-30 250-30'/><path d='M-500 45c0 0 125-30 250-30S0 45 0 45s125 30 250 30s250-30 250-30s125-30 250-30s250 30 250 30s125 30 250 30s250-30 250-30'/><path d='M-500 105c0 0 125-30 250-30S0 105 0 105s125 30 250 30s250-30 250-30s125-30 250-30s250 30 250 30s125 30 250 30s250-30 250-30'/><path d='M-500 15c0 0 125-30 250-30S0 15 0 15s125 30 250 30s250-30 250-30s125-30 250-30s250 30 250 30s125 30 250 30s250-30 250-30'/><path d='M-500-15c0 0 125-30 250-30S0-15 0-15s125 30 250 30s250-30 250-30s125-30 250-30s250 30 250 30s125 30 250 30s250-30 250-30'/><path d='M-500 135c0 0 125-30 250-30S0 135 0 135s125 30 250 30s250-30 250-30s125-30 250-30s250 30 250 30s125 30 250 30s250-30 250-30'/></g></svg>
\ No newline at end of file
diff --git a/app/components/app/diagnose-src/list.vue b/app/components/app/diagnose-src/list.vue
index 1be60a60..9b603f6b 100644
--- a/app/components/app/diagnose-src/list.vue
+++ b/app/components/app/diagnose-src/list.vue
@@ -4,6 +4,7 @@ import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vu
 
 // Types
 import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import type { Config, } from '~/components/pub/my-ui/data-table'
 
 // Configs
 import { config } from './list-cfg'
@@ -11,9 +12,11 @@ import { config } from './list-cfg'
 interface Props {
   data: any[]
   paginationMeta: PaginationMeta
+  tableConfig?: Config
 }
-
-defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  tableConfig: () => config,
+})
 
 const emit = defineEmits<{
   pageChange: [page: number]
@@ -27,7 +30,7 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubMyUiDataTable
-      v-bind="config"
+      v-bind="props.tableConfig"
       :rows="data"
       :skeleton-size="paginationMeta?.pageSize"
     />
diff --git a/app/components/app/procedure-src/list.vue b/app/components/app/procedure-src/list.vue
index 1be60a60..d976b660 100644
--- a/app/components/app/procedure-src/list.vue
+++ b/app/components/app/procedure-src/list.vue
@@ -7,13 +7,16 @@ import type { PaginationMeta } from '~/components/pub/my-ui/pagination/paginatio
 
 // Configs
 import { config } from './list-cfg'
+import type { Config } from '~/components/pub/my-ui/data-table'
 
 interface Props {
   data: any[]
   paginationMeta: PaginationMeta
+  tableConfig?: Config
 }
-
-defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  tableConfig: () => config,
+})
 
 const emit = defineEmits<{
   pageChange: [page: number]
@@ -27,7 +30,7 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubMyUiDataTable
-      v-bind="config"
+      v-bind="props.tableConfig"
       :rows="data"
       :skeleton-size="paginationMeta?.pageSize"
     />
diff --git a/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue b/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
new file mode 100644
index 00000000..46ea79d9
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { cn } from '~/lib/utils';
+
+const props = withDefaults(defineProps<{
+  therapyEndDate?: string
+  class?: string
+}>(), {
+  therapyEndDate: new Date().toISOString(),
+})
+</script>
+
+<template>
+    <div :class="cn('flex items-center gap-2 p-3 rounded-md text-orange-500 border border-orange-400 bg-orange-50',
+        props.class
+    )">
+        <Icon name="i-lucide-triangle-alert" class="h-4 w-4 align-middle transition-colors" />
+        <p class="font-medium">Pasien ini sedang menjalankan program terapi sampai {{ new Date(props.therapyEndDate).toDateString() }}</p>
+    </div>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue b/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
new file mode 100644
index 00000000..e09432d5
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+import Button from '~/components/pub/ui/button/Button.vue';
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const recDate = inject<Ref<any>>('rec_date')!
+
+function confirm() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  recDate.value = new Date().getTime()
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="confirm">
+        <Icon name="i-lucide-circle-check" class="h-4 w-4 align-middle transition-colors" />
+        Konfirmasi
+    </Button>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue b/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
new file mode 100644
index 00000000..86953443
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'Ya', value: 'YA' },
+  { label: 'Tidak', value: 'TIDAK' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/radio-relationship.vue b/app/components/app/therapy-protocol/_common/radio-relationship.vue
new file mode 100644
index 00000000..07aad8b8
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/radio-relationship.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'Suami/Istri', value: 'partner' },
+  { label: 'Anak', value: 'child' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-arrangement.vue b/app/components/app/therapy-protocol/_common/select-arrangement.vue
new file mode 100644
index 00000000..9a945d44
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-arrangement.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const arrangementTypeOpts = [
+  { label: 'KRS', value: "krs" },
+  { label: 'MRS', value: "mrs" },
+  { label: 'Pindah IGD', value: "pindahIgd" },
+  { label: 'Rujuk', value: "rujuk" },
+  { label: 'Rujuk Balik', value: "rujukBalik" },
+  { label: 'Meninggal', value: "meninggal" },
+  { label: 'Lain Lain', value: "other" },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="label"
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+        <FormField :name="fieldName" v-slot="{ componentField, value }">
+          <FormItem>
+            <FormControl>
+              <Select 
+                v-bind="componentField" 
+                :model-value="value"
+                :items="arrangementTypeOpts"
+                :defaultValue='arrangementTypeOpts[0]?.value' 
+              />
+            </FormControl>            
+            <FormMessage />
+          </FormItem>
+        </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-date-range.vue b/app/components/app/therapy-protocol/_common/select-date-range.vue
new file mode 100644
index 00000000..c9048fcf
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-date-range.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import { CalendarDate, DateFormatter, getLocalTimeZone, type DateValue } from '@internationalized/date'
+
+const props = defineProps<{
+  dateValueStart?: DateValue | undefined
+  dateValueEnd?: DateValue | undefined
+}>()
+
+const {
+  dateValueStart = new CalendarDate(2022, 1, 20),
+  dateValueEnd = new CalendarDate(2022, 1, 20).add({ days: 20 }),
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+</script>
+
+<template>
+  <Popover>
+        <PopoverTrigger as-child>
+          <Button variant="outline" :class="cn('w-[280px] justify-start text-left font-normal',
+            (!dateValueStart && !dateValueEnd) && 'text-muted-foreground')">
+            <CalendarIcon class="mr-2 h-4 w-4" />
+            <template v-if="dateValueStart">
+              <template v-if="dateValueEnd">
+                {{ df.format(dateValueStart.toDate(getLocalTimeZone())) }} -
+                {{ df.format(dateValueEnd.toDate(getLocalTimeZone())) }}
+              </template>
+  
+              <template v-else>
+                {{ df.format(dateValueStart.toDate(getLocalTimeZone())) }}
+              </template>
+            </template>
+            <template v-else> Pick a date </template>
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent class="w-auto p-0">
+          <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+            @update:start-value="(startDate) => (dateValueStart = startDate)" />
+        </PopoverContent>
+      </Popover>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-date.vue b/app/components/app/therapy-protocol/_common/select-date.vue
new file mode 100644
index 00000000..74245e7e
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-date.vue
@@ -0,0 +1,121 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+  isDisabled?: boolean
+  isWithTime?: boolean
+}>()
+
+const {
+  fieldName = 'birthDate',
+  label = 'Tanggal Lahir',
+  placeholder = 'Pilih tanggal lahir',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+  isWithTime = false,
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+// Function to calculate age with years, months, and days
+function calculateAge(birthDate: string | Date | undefined): string {
+  if (!birthDate) {
+    return 'Masukkan tanggal lahir'
+  }
+
+  try {
+    let dateObj: Date
+
+    if (typeof birthDate === 'string') {
+      dateObj = parseISO(birthDate)
+    } else {
+      dateObj = birthDate
+    }
+
+    const today = new Date()
+
+    // Calculate years, months, and days
+    const totalYears = differenceInYears(today, dateObj)
+
+    // Calculate remaining months after years
+    const yearsPassed = new Date(dateObj)
+    yearsPassed.setFullYear(yearsPassed.getFullYear() + totalYears)
+    const remainingMonths = differenceInMonths(today, yearsPassed)
+
+    // Calculate remaining days after years and months
+    const monthsPassed = new Date(yearsPassed)
+    monthsPassed.setMonth(monthsPassed.getMonth() + remainingMonths)
+    const remainingDays = differenceInDays(today, monthsPassed)
+
+    // Format the result
+    const parts = []
+    if (totalYears > 0) parts.push(`${totalYears} Tahun`)
+    if (remainingMonths > 0) parts.push(`${remainingMonths} Bulan`)
+    if (remainingDays > 0) parts.push(`${remainingDays} Hari`)
+
+    return parts.length > 0 ? parts.join(' ') : '0 Hari'
+  } catch {
+    return 'Masukkan tanggal lahir'
+  }
+}
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired && !isDisabled"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              :type="isWithTime ? 'datetime-local' : 'date'"
+              min="1900-01-01"
+              :max="new Date().toISOString().split('T')[0]"
+              v-bind="componentField"
+              :placeholder="placeholder"
+              :disabled="isDisabled"
+              @update:model-value="
+                (value: string | number) => {
+                  const dateStr = typeof value === 'number' ? String(value) : value
+                  patientAge = calculateAge(dateStr)
+                }
+              "
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-death-cause.vue b/app/components/app/therapy-protocol/_common/select-death-cause.vue
new file mode 100644
index 00000000..a155b139
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-death-cause.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="label"
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-faskes.vue b/app/components/app/therapy-protocol/_common/select-faskes.vue
new file mode 100644
index 00000000..0852195b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-faskes.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue b/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
new file mode 100644
index 00000000..0852195b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue b/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
new file mode 100644
index 00000000..a155b139
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="label"
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/text-captcha.vue b/app/components/app/therapy-protocol/_common/text-captcha.vue
new file mode 100644
index 00000000..de9d7f4b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/text-captcha.vue
@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { ref, computed, watch, defineEmits, defineProps, onMounted, nextTick, defineExpose } from 'vue'
+import Input from '~/components/pub/ui/input/Input.vue';
+import Button from '~/components/pub/ui/button/Button.vue';
+import waveyFingerprint from '~/assets/svg/wavey-fingerprint.svg'
+
+/**
+ * TextCaptcha props:
+ * - length: number of characters in the core captcha
+ * - caseSensitive: whether validation is case sensitive
+ * - useSpacing: show spaced-out characters (visual obfuscation only)
+ * - noiseChars: include random noise characters visually (not required to type)
+ */
+const props = defineProps({
+  length: { type: Number, default: 6 },
+  caseSensitive: { type: Boolean, default: false },
+  useSpacing: { type: Boolean, default: true },
+  noiseChars: { type: Boolean, default: false }, // adds random noise characters to display
+  refreshCooldownMs: { type: Number, default: 500 }, // guard repeated refresh
+})
+
+const emit = defineEmits<{
+  (e: 'update:valid', valid: boolean): void
+  (e: 'validated', valid: boolean): void
+  (e: 'change', value: string): void
+}>()
+
+// Internal state
+const raw = ref('')            // the canonical captcha value (what user must match, ignoring visual noise)
+const display = ref('')        // randomized visual representation (may include spacing/noise)
+const input = ref('')          // user typed value
+const lastRefresh = ref(0)
+const valid = inject('isCaptchaValid') as Ref<boolean>
+const errorMessage = ref('')
+
+/** Characters excluding ambiguous ones: 0/O, 1/l/I etc. */
+const CHARS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+
+function randomChar() {
+  return CHARS.charAt(Math.floor(Math.random() * CHARS.length))
+}
+
+/** Generate the canonical captcha string */
+function genRaw(len = props.length) {
+  let s = ''
+  for (let i = 0; i < len; i++) s += randomChar()
+  return s
+}
+
+/** Create a visually obfuscated display string (spacing, noise, random case) */
+function genDisplay(base: string) {
+  const arr: string[] = []
+  for (const ch of base) {
+    // toggle case randomly (only for letters)
+    const c = /[A-Za-z]/.test(ch) && Math.random() > 0.5 ? (Math.random() > 0.5 ? ch.toLowerCase() : ch.toUpperCase()) : ch
+    arr.push(c)
+    if (props.useSpacing && Math.random() > 0.3) arr.push(' ') // random space
+  }
+  return arr.join('')
+}
+
+/** Refresh captcha */
+function refresh() {
+  const now = Date.now()
+  if (now - lastRefresh.value < props.refreshCooldownMs) return
+  lastRefresh.value = now
+
+  raw.value = genRaw(props.length)
+  display.value = genDisplay(raw.value)
+  input.value = ''
+  valid.value = false
+  errorMessage.value = ''
+  // emit change so parent knows new value (but we don't send the raw canonical in production)
+  emit('change', display.value)
+}
+
+/** Normalize input and canonical for comparison */
+function normalizeForCompare(s: string) {
+  const normalized = s.replace(/\s+/g, '') // strip spaces
+  return props.caseSensitive ? normalized : normalized.toLowerCase()
+}
+
+/** Validate the current input */
+function validate() {
+  const left = normalizeForCompare(input.value)
+  const right = normalizeForCompare(raw.value)
+  if (!input.value) {
+    valid.value = false
+    errorMessage.value = 'Please enter the captcha text.'
+  } else if (left === right) {
+    valid.value = true
+    errorMessage.value = ''
+  } else {
+    valid.value = false
+    errorMessage.value = 'Captcha does not match.'
+  }
+  emit('update:valid', valid.value)
+  emit('validated', valid.value)
+  return valid.value
+}
+
+// expose a refresh method to parent via ref
+defineExpose({ refresh, validate, isValid: computed(() => valid.value) })
+
+// generate on mount
+onMounted(() => refresh())
+
+// // re-validate whenever input changes (lightweight)
+// watch(input, () => {
+//   // we don't auto-pass until the user explicitly validate (but we can optionally live-validate)
+//   // Here we perform live feedback but still emit validated only when called
+//   const left = normalizeForCompare(input.value)
+//   const right = normalizeForCompare(raw.value)
+//   valid.value = !!input.value && left === right
+//   // emit a live update so the parent can disable submit accordingly
+//   emit('update:valid', valid.value)
+// })
+</script>
+
+<template>
+  <div class="space-y-2 w-full max-w-sm">
+    <div class="flex items-center justify-between gap-3">
+      <!-- Captcha visual box -->
+      <div
+        role="img"
+        aria-label="Text captcha, type the characters shown"
+        tabindex="0"
+        class="select-none p-3 rounded-md border border-gray-200 text-white text-xl font-mono tracking-wider text-center w-full"
+      >
+        <span class="inline-block" v-html="display"></span>
+      </div>
+
+      <!-- Refresh -->
+      <div class="flex-shrink-0">
+        <Button variant="ghost" type="button" @click="refresh" title="Refresh captcha">
+          <Icon name="i-lucide-refresh-cw" />
+        </Button>
+      </div>
+    </div>
+
+    <!-- Input -->
+    <div class="flex gap-3 items-start">
+        <div class="flex-grow">
+            <Input
+                v-model="input"
+                :aria-invalid="valid ? 'false' : 'true'"
+                inputmode="text"
+                placeholder="Type the captcha text"
+                @keyup.enter="validate"
+            />
+            <p v-if="errorMessage" class="text-xs text-red-500 mt-1">{{ errorMessage }}</p>
+            <p v-else-if="valid" class="text-xs text-green-500 mt-1">Correct</p>
+            <p v-else class="text-xs text-gray-500 mt-1">Not case-sensitive</p>
+        </div>
+        <Button variant="outline" type="button" @click="validate" title="Validate"
+            class="border-orange-400">
+            <Icon name="i-lucide-check" class="text-orange-400" />
+        </Button>
+    </div>
+
+  </div>
+</template>
+
+<style scoped>
+/* small nicety: make noise/spaced display look irregular */
+div[role="img"] {
+  background: url('~/assets/svg/wavey-fingerprint.svg') repeat center;
+}
+
+div[role="img"] span {
+  letter-spacing: 0.12em;
+  font-weight: 600;
+  user-select: none;
+}
+</style>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/_common/verify-badge.vue b/app/components/app/therapy-protocol/_common/verify-badge.vue
new file mode 100644
index 00000000..30cd4c54
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/verify-badge.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { Badge } from '~/components/pub/ui/badge'
+
+const activeStatusCodes: Record<string, string> = {
+  verified: 'Verifikasi',
+  unverified: 'Belum Verifikasi',
+}
+
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+
+const statusText = computed(() => {
+  const code: keyof typeof activeStatusCodes = props.rec.status_code === 1 ? `verified` : `unverified`
+  return activeStatusCodes[code]
+})
+
+const badgeVariant = computed(() => {
+  return props.rec.status_code === 1 ? 'default' : 'outline'
+})
+</script>
+
+<template>
+  <div class="flex justify-center">
+    <Badge :variant="badgeVariant" class="rounded-2xl text-[0.6rem]" >
+      {{ statusText }}
+    </Badge>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/add-list.cfg.ts b/app/components/app/therapy-protocol/add-list.cfg.ts
new file mode 100644
index 00000000..856ae82b
--- /dev/null
+++ b/app/components/app/therapy-protocol/add-list.cfg.ts
@@ -0,0 +1,51 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+
+export const medicalDiagnosisConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Diagnosa' },
+      { label: 'ICD-X' },
+    ],
+  ],
+
+  keys: ['number', 'diagnosis', 'icd_x'],
+
+  parses: {  },
+}
+
+export const functionalDiagnosisConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Diagnosa' },
+      { label: 'ICD-X' },
+    ],
+  ],
+
+  keys: ['number', 'diagnosis', 'icd_x'],
+
+  parses: {  },
+}
+
+
+
+export const proceduralConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Prosedur' },
+      { label: 'ICD-IX' },
+    ],
+  ],
+
+  keys: ['number', 'procedure', 'icd_x'],
+
+  parses: {  },
+}
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/detail-list.cfg.ts b/app/components/app/therapy-protocol/detail-list.cfg.ts
new file mode 100644
index 00000000..e50113d7
--- /dev/null
+++ b/app/components/app/therapy-protocol/detail-list.cfg.ts
@@ -0,0 +1,28 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+const action = defineAsyncComponent(() => import('./_common/btn-confirmation-detail.vue'))
+
+export const detailTherapyProtocolListConfig: Config = {
+  cols: [{}, {}, {}, {width: 100},],
+
+  headers: [
+    [
+      { label: 'Program Kegiatan' },
+      { label: 'Paraf Terapis' },
+      { label: 'Paraf Dokter' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['program', 'therapistSign', 'doctorSign', 'action'],
+
+  parses: {  },
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+}
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/detail.vue b/app/components/app/therapy-protocol/detail.vue
new file mode 100644
index 00000000..e57ff3b1
--- /dev/null
+++ b/app/components/app/therapy-protocol/detail.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import SelectSecondaryDiagnosis from './_common/select-secondary-diagnosis.vue'
+import SelectPrimaryDiagnosis from './_common/select-primary-diagnosis.vue'
+import SelectArrangement from './_common/select-arrangement.vue'
+import type { ResumeArrangementType } from '~/schemas/resume.schema'
+import SelectFaskes from './_common/select-faskes.vue'
+import SelectDeathCause from './_common/select-death-cause.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, medicalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Badge from '~/components/pub/ui/badge/Badge.vue'
+import { detailTherapyProtocolListConfig } from './detail-list.cfg'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+
+const props = defineProps<{
+
+}>()
+
+const router = useRouter()
+const formRef = ref()
+const isConfirmationOpen = ref(false)
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+
+function goBack() {
+  router.go(-1)
+}
+async function handleConfirmAdd() {
+  // handleActionClick('submit')
+  console.log(`tersubmit wak`)
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {   
+    goBack()
+  }
+}
+
+const dummymedicalDiagnosis = [
+  { id: `asdfouno182y49128y3`, program: 'Latihan penguatan otot', icd_x: 'E11' },
+  { id: `asdfouno182y49128g8`, program: 'Mobilisasi otot', icd_x: 'I10' },
+]
+</script>
+
+<template>
+  <div class="flex items-center">         
+    <Button type="button" variant="outline" class="ml-auto text-gray-500 border border-orange-400 bg-orange-50" @click="handleActionClick('back')">
+      <Icon name="i-lucide-arrow-left" class="h-4 w-4 align-middle transition-colors" />
+      Kembali
+    </Button>
+  </div>
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 1</h1>
+    <DetailRow label="Tanggal Pemeriksaan">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Diagnosa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Permintaan Terapi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Frekuensi Terapi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Waktu Mencapai Target">{{ `aaaaaa bulan` }}</DetailRow>
+  </section>
+  <Separator class="my-5" />
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 2</h1>
+    <DetailRow label="Hubungan dengan Tertanggung">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Anamnesa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Pemeriksaan Fisik dan Uji Fungsi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Diagnosa Medis (ICD-X)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Diagnosa Fungsional (ICD-X)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Prosedur Tata Laksana (ICD-IX CM)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Pemeriksaan Penunjang">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Evaluasi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Anjuran">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Suspek Penyakit Akibat Kerja">{{ `aaaaaa` }}</DetailRow>
+  </section>
+  <Separator class="my-5" />
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 3</h1>
+    <DetailRow label="Diagnosa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Permintaan Terapi">{{ `aaaaaa` }}</DetailRow>
+
+    <div class="mt-3">
+      <PubMyUiDataTable 
+        v-bind="detailTherapyProtocolListConfig"
+        :rows="dummymedicalDiagnosis" />
+    </div>  
+
+  </section>
+</template>
diff --git a/app/components/app/therapy-protocol/edit.vue b/app/components/app/therapy-protocol/edit.vue
new file mode 100644
index 00000000..e871fc90
--- /dev/null
+++ b/app/components/app/therapy-protocol/edit.vue
@@ -0,0 +1,217 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import SelectSecondaryDiagnosis from './_common/select-secondary-diagnosis.vue'
+import SelectPrimaryDiagnosis from './_common/select-primary-diagnosis.vue'
+import SelectArrangement from './_common/select-arrangement.vue'
+import type { ResumeArrangementType } from '~/schemas/resume.schema'
+import SelectFaskes from './_common/select-faskes.vue'
+import SelectDeathCause from './_common/select-death-cause.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, medicalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  resumeArrangementType: ResumeArrangementType
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+
+const dummymedicalDiagnosis = [
+  { number: 1, diagnosis: 'Diabetes Mellitus', icd_x: 'E11' },
+  { number: 2, diagnosis: 'Hipertensi',  icd_x: 'I10' },
+  { number: 3, diagnosis: 'Asma Bronkial', icd_x: 'J45' },
+]
+</script>
+
+<template>
+  <Form ref="formRef" v-slot="{ values }" as="" keep-values :validation-schema="formSchema" :validate-on-mount="false"
+    validation-mode="onSubmit" :initial-values="initialValues ? initialValues : {}">
+    <h1 class="mb-1 text-base font-medium">Terapi ke 1</h1>
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base">Form 1</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="checkDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="diagnosis"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="therapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      <DE.Block class="flex items-end h-fit" :col-count="3" :cell-flex="false">        
+        <div>
+          <h1 class="mb-1 font-medium">Frekuensi Terapi</h1>
+          <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+            <p class="">{{ `2` }}</p>
+            <p class="text-muted-foreground">x / Minggu</p>
+          </div>
+        </div>
+        <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+          <p>
+            <span class="text-muted-foreground">Selama</span>
+              {{ `1` }}
+            <span class="text-muted-foreground">Bulan</span>
+          </p>
+        </div>
+        <InputBase
+          field-name="targetPeriodInMonths"
+          label="Waktu mencapai target (Bulan)"
+          placeholder="Masukkan angka"
+          :errors="errors"
+          numeric-only
+        />
+      </DE.Block>
+      <TextAreaInput 
+        field-name="therapyTarget"
+        label="Target Terapi"
+        placeholder="Target Terapi"
+        :errors="errors" />
+    </DE.Block>
+    <Separator class="my-4" />
+
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base font-medium">Form 2</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">        
+        <RadioRelationship
+          field-name="relationshipToPatient"
+          label="Hubungan dengan tertanggung"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+      <TextAreaInput 
+        field-name="anamnesa"
+        label="Anamnesa"
+        placeholder="Anamnesa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="physicalExamination"
+        label="Pemeriksaan Fisik & Uji Fungsi"
+        placeholder="Pemeriksaan Fisik & Uji Fungsi"
+        :errors="errors" />
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Diagnosis Medis (ICD-X)</h1>
+        <PubMyUiDataTable
+          v-bind="medicalDiagnosisConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Diagnosis Fungsional (ICD-X)</h1>
+        <PubMyUiDataTable
+          v-bind="functionalDiagnosisConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Prosedur Tata Laksana (ICD-IX CM)</h1>
+        <PubMyUiDataTable
+          v-bind="proceduralConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+
+      <TextAreaInput 
+        field-name="supportingExamination"
+        label="Pemeriksaan Penunjang"
+        placeholder="Pemeriksaan Penunjang"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="evaluation"
+        label="Evaluasi"
+        placeholder="Evaluasi"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="recommendation"
+        label="Anjuran"
+        placeholder="Anjuran"
+        :errors="errors" />
+      <DE.Cell :col-span="2">        
+        <RadioIllnessBcsWork
+          field-name="illnessBcsWork"
+          label="Suspek penyakit akibat kerja"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+    </DE.Block>
+    <Separator class="my-4" />
+
+    
+    <!-- FORM 3 -->
+    <h1 class="mb-3 text-base">Form 3</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="checkDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form3-diagnosis"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form3-therapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      
+      <DE.Cell class="mt-2" :col-span="2">
+          <FieldArray v-slot="{ fields, push, remove }" name="form3-programActivity">
+            <div v-for="(field, idx) in fields" :key="idx" class="w-1/2 flex items-center gap-3 mb-3">
+              <TextAreaInput 
+                class=""
+                :field-name="`form3-programActivity[${idx}]`"
+                :label="`Program/Kegiatan ${idx + 1}`"
+                :placeholder="`Masukkan Program/Kegiatan ${idx + 1}`"
+                :errors="errors" />
+              <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Program
+            </Button>
+          </FieldArray>
+      </DE.Cell>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/entry-form.vue b/app/components/app/therapy-protocol/entry-form.vue
new file mode 100644
index 00000000..22bae769
--- /dev/null
+++ b/app/components/app/therapy-protocol/entry-form.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { toTypedSchema } from '@vee-validate/zod'
+
+// components
+import { Form } from '~/components/pub/ui/form'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import Separator from '~/components/pub/ui/separator/Separator.vue'
+
+// form field components
+import { BaseTextarea, RadioRelations, SelectExaminationDate, RadioWorkDisease } from './field'
+
+// #region Props & Emits
+interface Props {
+  schema: any
+  initialValues?: any
+  patientId: number
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{}>()
+// #endregion
+
+// #region State & Computed
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+// #endregion region
+
+// #region Utilities & event handlers
+// #endregion
+
+// #region Watchers
+// #endregion
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues ? initialValues : {}"
+  >
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Anamnesa dan Riwayat Pasien</p>
+    <DE.Block
+      :col-count="3"
+      :cell-flex="false"
+    >
+      <SelectExaminationDate
+        field-name="examinationDate"
+        label="Tanggal Pemeriksaan"
+      />
+      <RadioRelations
+        field-name="relationshipToInsured"
+        label="Hubungan Dengan Tertanggung"
+        :col-span="2"
+      />
+      <BaseTextarea
+        field-name="anamnesis"
+        label="Anamnesa"
+      />
+      <BaseTextarea
+        field-name="medicalHistory"
+        label="Riwayat Penyakit"
+      />
+      <BaseTextarea
+        field-name="medicationHistory"
+        label="Riwayat Obat"
+      />
+    </DE.Block>
+
+    <div class="h-6">
+      <Separator />
+    </div>
+
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Pemeriksaan Penunjang</p>
+    <DE.Block
+      :col-count="2"
+      :cell-flex="false"
+    >
+      <BaseTextarea
+        field-name="supportDiagnosis"
+        label="Diagnosa (ICD-X)"
+      />
+      <BaseTextarea
+        field-name="functionalDiagnosis"
+        label="Diagnosa Fungsional (ICD-X)"
+      />
+      <BaseTextarea
+        field-name="treatmentDiagnosis"
+        label="Diagnosa Tata Laksana (ICD-IX)"
+      />
+      <BaseTextarea
+        field-name="supportExamination"
+        label="Pemeriksaan Penunjang"
+      />
+    </DE.Block>
+
+    <div class="h-6">
+      <Separator />
+    </div>
+
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Anjuran dan Evaluasi</p>
+    <DE.Block
+      :col-count="3"
+      :cell-flex="false"
+    >
+      <BaseTextarea
+        field-name="recommendation"
+        label="Anjuran"
+      />
+      <BaseTextarea
+        field-name="evaluation"
+        label="Evaluasi"
+      />
+      <RadioWorkDisease
+        field-name="isWorkRelatedDisease"
+        label="Suspek Penyakit Akibat Kerja"
+      />
+    </DE.Block>
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/entry.vue b/app/components/app/therapy-protocol/entry.vue
new file mode 100644
index 00000000..48065416
--- /dev/null
+++ b/app/components/app/therapy-protocol/entry.vue
@@ -0,0 +1,204 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+import FunctionalDiagnosisPicker from './picker-dialog/functional-diagnosis/diagnosis-picker.vue'
+import MedicalDiagnosisPicker from './picker-dialog/medical-diagnosis/diagnosis-picker.vue'
+import ArrangementProcedurePicker from './picker-dialog/arrangement-procedure/procedure-picker.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+// const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isFunctionalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isProcedurePickerDialogOpen = ref<boolean>(false)
+
+// function toggleMedicalDiagnosisPickerDialog() {
+//   isMedicalDiagnosisPickerDialogOpen.value = !isMedicalDiagnosisPickerDialogOpen.value
+// }
+// function toggleFunctionalDiagnosisPickerDialog() {
+//   isFunctionalDiagnosisPickerDialogOpen.value = !isFunctionalDiagnosisPickerDialogOpen.value
+// }
+
+// provide(`isDiagnosisPickerDialogOpen`, isDiagnosisPickerDialogOpen)
+// provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form ref="formRef" v-slot="{ values }" as="" keep-values :validation-schema="formSchema" :validate-on-mount="false"
+    validation-mode="onSubmit" :initial-values="initialValues ? initialValues : {}">
+    <h1 class="mb-1 text-base font-medium">Terapi ke 1</h1>
+
+
+    <!-- FORM 1 -->
+    <h1 class="mb-3 text-base">Form 1</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="form1ExaminationDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form1Diagnose"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form1TherapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      <DE.Block class="flex items-end h-fit" :col-count="3" :cell-flex="false">        
+        <div>
+          <h1 class="mb-1 font-medium">Frekuensi Terapi</h1>
+          <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+            <p class="">{{ `2` }}</p>
+            <p class="text-muted-foreground">x / Minggu</p>
+          </div>
+        </div>
+        <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+          <p>
+            <span class="text-muted-foreground">Selama</span>
+              {{ `1` }}
+            <span class="text-muted-foreground">Bulan</span>
+          </p>
+        </div>
+        <InputBase
+          field-name="form1TargetPeriod"
+          label="Waktu mencapai target (Bulan)"
+          placeholder="Masukkan angka"
+          :errors="errors"
+          numeric-only
+        />
+      </DE.Block>
+      <TextAreaInput 
+        field-name="form1TherapyTarget"
+        label="Target Terapi"
+        placeholder="Target Terapi"
+        :errors="errors" />
+    </DE.Block>
+    <Separator class="my-4" />
+
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base font-medium">Form 2</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">        
+        <RadioRelationship
+          field-name="form2RelationshipToInsured"
+          label="Hubungan dengan tertanggung"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+      <TextAreaInput 
+        field-name="anamnesis"
+        label="Anamnesa"
+        placeholder="Anamnesa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form2PhysicalExamination"
+        label="Pemeriksaan Fisik & Uji Fungsi"
+        placeholder="Pemeriksaan Fisik & Uji Fungsi"
+        :errors="errors" />
+      
+      <MedicalDiagnosisPicker
+        field-name="medicalDiagnoses"
+        title="Diagnosis Medis (ICD-X)" />
+      <FunctionalDiagnosisPicker
+        field-name="functionDiagnoses" 
+        title="Diagnosis Fungsional (ICD-X)" />
+      <ArrangementProcedurePicker
+        field-name="procedures"
+        title="Prosedur Tata Laksana (ICD-IX CM)" />
+      
+      <TextAreaInput 
+        field-name="supportingExams"
+        label="Pemeriksaan Penunjang"
+        placeholder="Pemeriksaan Penunjang"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="evaluation"
+        label="Evaluasi"
+        placeholder="Evaluasi"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="instruction"
+        label="Anjuran"
+        placeholder="Anjuran"
+        :errors="errors" />
+      <DE.Cell :col-span="2">        
+        <RadioIllnessBcsWork
+          field-name="workCauseStatus"
+          label="Suspek penyakit akibat kerja"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+    </DE.Block>
+    <Separator class="my-4" />
+
+    
+    <!-- FORM 3 -->
+    <h1 class="mb-3 text-base">Form 3</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="form3ExaminationDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form3Diagnose"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form3TherapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      
+      <DE.Cell class="mt-2" :col-span="2">
+          <FieldArray v-slot="{ fields, push, remove }" name="form3ProgramActivities">
+            <div v-for="(field, idx) in fields" :key="idx" class="w-1/2 flex items-center gap-3 mb-3">
+              <TextAreaInput 
+                class=""
+                :field-name="`form3ProgramActivities[${idx}]`"
+                :label="`Program/Kegiatan ${idx + 1}`"
+                :placeholder="`Masukkan Program/Kegiatan ${idx + 1}`"
+                :errors="errors" />
+              <Button v-if="idx !== 0" type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Program
+            </Button>
+          </FieldArray>
+      </DE.Cell>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/field/base-textarea.vue b/app/components/app/therapy-protocol/field/base-textarea.vue
new file mode 100644
index 00000000..e6e7a63c
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/base-textarea.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  label: string
+  fieldName: string
+  placeholder?: string
+  colSpan?: number
+}>()
+
+const { label, fieldName, placeholder = 'Masukkan catatan' } = props
+</script>
+
+<template>
+  <DE.Cell :col-span="colSpan || 1">
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Textarea
+              v-bind="componentField"
+              :placeholder="placeholder"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/index.ts b/app/components/app/therapy-protocol/field/index.ts
new file mode 100644
index 00000000..f3df2c2d
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/index.ts
@@ -0,0 +1,4 @@
+export { default as RadioRelations } from './radio-relations.vue'
+export { default as SelectExaminationDate } from './select-examination-date.vue'
+export { default as BaseTextarea } from './base-textarea.vue'
+export { default as RadioWorkDisease } from './radio-work-disease.vue'
diff --git a/app/components/app/therapy-protocol/field/radio-relations.vue b/app/components/app/therapy-protocol/field/radio-relations.vue
new file mode 100644
index 00000000..aba12b86
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/radio-relations.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+defineProps<{
+  label: string
+  fieldName: string
+  containerClass?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  colSpan?: number
+}>()
+
+const options = [
+  { label: 'Suami/Istri', value: 'spouse' },
+  { label: 'Anak', value: 'child' },
+]
+</script>
+
+<template>
+  <DE.Cell
+    :class="cn('radio-group-field', containerClass)"
+    :col-span="colSpan || 2"
+  >
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in options"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/radio-work-disease.vue b/app/components/app/therapy-protocol/field/radio-work-disease.vue
new file mode 100644
index 00000000..9eeaa0d8
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/radio-work-disease.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+defineProps<{
+  label: string
+  fieldName: string
+  containerClass?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  colSpan?: number
+}>()
+
+const options = [
+  { label: 'Ya', value: 'YA' },
+  { label: 'Tidak', value: 'TIDAK' },
+]
+</script>
+
+<template>
+  <DE.Cell
+    :class="cn('radio-group-field', containerClass)"
+    :col-span="colSpan || 1"
+  >
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in options"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/select-examination-date.vue b/app/components/app/therapy-protocol/field/select-examination-date.vue
new file mode 100644
index 00000000..6ab232b9
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/select-examination-date.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName: string
+  label: string
+  placeholder?: string
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+}>()
+
+const { placeholder = 'Pilih tanggal pemeriksaan', class: containerClass, fieldGroupClass, labelClass } = props
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              type="date"
+              min="1980-01-01"
+              :max="new Date().toISOString().split('T')[0]"
+              v-bind="componentField"
+              :placeholder="placeholder"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/history-dialog.vue b/app/components/app/therapy-protocol/history-dialog.vue
new file mode 100644
index 00000000..7bfcac10
--- /dev/null
+++ b/app/components/app/therapy-protocol/history-dialog.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './history-list.cfg'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import { cn } from '~/lib/utils'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/history-list.cfg.ts b/app/components/app/therapy-protocol/history-list.cfg.ts
new file mode 100644
index 00000000..0467589e
--- /dev/null
+++ b/app/components/app/therapy-protocol/history-list.cfg.ts
@@ -0,0 +1,45 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dp.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 140}, {width: 3},],
+
+  headers: [
+    [
+      { label: 'Tgl Pemeriksaan' },
+      { label: 'DPJP' },
+      { label: 'Anamnesa' },
+      { label: 'Permintaan Terapi' },
+      { label: 'Program/Kegiatan' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['birth_date', 'person.name', 'person.name', 'person.name', 'birth_date', "action"],
+
+  parses: {
+    birth_date: (rec: unknown): unknown => {
+      const { person } = rec as Patient
+
+      if (typeof person.birthDate == 'object' && person.birthDate) {
+        return (person.birthDate as Date).toLocaleDateString('id-ID')
+      } else if (typeof person.birthDate == 'string') {
+        return (person.birthDate as string).substring(0, 10)
+      }
+      return person.birthDate
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+}
diff --git a/app/components/app/therapy-protocol/list.cfg.ts b/app/components/app/therapy-protocol/list.cfg.ts
new file mode 100644
index 00000000..34155752
--- /dev/null
+++ b/app/components/app/therapy-protocol/list.cfg.ts
@@ -0,0 +1,53 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-duvp.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 140}, {width: 3},],
+
+  headers: [
+    [
+      { label: 'Tgl Pemeriksaan' },
+      { label: 'Anamnesa' },
+      { label: 'Permintaan Terapi' },
+      { label: 'Program' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['anamnesis', 'anamnesis', 'anamnesis', 'anamnesis', 'status', 'action'],
+
+  parses: {
+    birth_date: (rec: unknown): unknown => {
+      const { person } = rec as Patient
+
+      if (typeof person.birthDate == 'object' && person.birthDate) {
+        return (person.birthDate as Date).toLocaleDateString('id-ID')
+      } else if (typeof person.birthDate == 'string') {
+        return (person.birthDate as string).substring(0, 10)
+      }
+      return person.birthDate
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/therapy-protocol/list.vue b/app/components/app/therapy-protocol/list.vue
new file mode 100644
index 00000000..0d62cc6c
--- /dev/null
+++ b/app/components/app/therapy-protocol/list.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './list.cfg'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
new file mode 100644
index 00000000..91e9f72c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('ap_rec_id')!
+const recAction = inject<Ref<string>>('ap_rec_action')!
+const recItem = inject<Ref<any>>('ap_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
new file mode 100644
index 00000000..e4836c7c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
@@ -0,0 +1,120 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './procedure-list-cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { ProcedureSrcSchema, type ProcedureSrcFormData } from '~/schemas/procedure-src.schema'
+
+// Handlers
+import {
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/procedure-src.handler'
+
+// Services
+import { getList, getDetail } from '~/services/procedure-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'procedure-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'MCU Prosedur',
+  icon: 'i-lucide-clipboard-list',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('ap_rec_id', recId)
+provide('ap_rec_action', recAction)
+provide('ap_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isProcedurePickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class=""
+  />
+  <AppProcedureSrcList
+    :table-config="config"
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"
+  />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
new file mode 100644
index 00000000..4a44a40f
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import ProcedureListDialog from './procedure-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isProcedurePickerDialogOpen = ref<boolean>(false)
+provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isProcedurePickerDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="props.fieldName">
+      <ProcedureListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Prosedur</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
new file mode 100644
index 00000000..67be3075
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './diagnosis-list-cfg'
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { DiagnoseSrcSchema, type DiagnoseSrcFormData } from '~/schemas/diagnose-src.schema'
+
+// Handlers
+
+// Services
+import { getList, getDetail } from '~/services/diagnose-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'diagnose-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Daftar Diagnosis',
+  icon: 'i-lucide-microscope',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('fd_rec_id', recId)
+provide('fd_rec_action', recAction)
+provide('fd_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isFunctionalPickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class=""
+    />
+    <AppDiagnoseSrcList
+      :data="data"
+      :pagination-meta="paginationMeta"
+      :table-config="config"
+      @page-change="handlePageChange"
+    />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
new file mode 100644
index 00000000..e609450b
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import DiagnosisListDialog from './diagnosis-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isFunctionalPickerDialogOpen = ref<boolean>(false)
+provide(`isFunctionalPickerDialogOpen`, isFunctionalPickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isFunctionalPickerDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="fieldName">
+      <DiagnosisListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Diagnosis</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
new file mode 100644
index 00000000..ac7c8f29
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('fd_rec_id')!
+const recAction = inject<Ref<string>>('fd_rec_action')!
+const recItem = inject<Ref<any>>('fd_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
new file mode 100644
index 00000000..d299219f
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
@@ -0,0 +1,107 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './diagnosis-list-cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { DiagnoseSrcSchema, type DiagnoseSrcFormData } from '~/schemas/diagnose-src.schema'
+
+// Services
+import { getList, getDetail } from '~/services/diagnose-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'diagnose-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Daftar Diagnosis',
+  icon: 'i-lucide-microscope',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('md_rec_id', recId)
+provide('md_rec_action', recAction)
+provide('md_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isMedicalDiagnosisPickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class=""
+    />
+    <AppDiagnoseSrcList
+      :data="data"
+      :pagination-meta="paginationMeta"
+      :table-config="config"
+      @page-change="handlePageChange"
+    />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
new file mode 100644
index 00000000..76ce6dfd
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import DiagnosisListDialog from './diagnosis-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+provide(`isMedicalDiagnosisPickerDialogOpen`, isMedicalDiagnosisPickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isMedicalDiagnosisPickerDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="fieldName">
+      <DiagnosisListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Diagnosis</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+      
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
new file mode 100644
index 00000000..a30ca20c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('md_rec_id')!
+const recAction = inject<Ref<string>>('md_rec_action')!
+const recItem = inject<Ref<any>>('md_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/verify-dialog.vue b/app/components/app/therapy-protocol/verify-dialog.vue
new file mode 100644
index 00000000..d72a96c2
--- /dev/null
+++ b/app/components/app/therapy-protocol/verify-dialog.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import type { InstallationFormData } from '~/schemas/installation.schema'
+import TextCaptcha from './_common/text-captcha.vue'
+
+
+const props = defineProps<{
+  schema: any
+  errors?: FormErrors
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+const captchaRef = ref<InstanceType<typeof TextCaptcha> | null>(null)
+const captchaValid = ref(false)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: InstallationFormData = {
+    name: values.name || '',
+    code: values.code || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+function onCaptchaUpdate(valid: boolean) {
+  captchaValid.value = valid
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    validation-mode="onSubmit" 
+  >
+      <div class="border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+
+          <InputBase
+            field-name="name"
+            label="Nama"
+            placeholder="Masukkan Nama"
+            :errors="errors"/>
+          <InputBase
+            field-name="email"
+            label="Email"
+            placeholder="Masukkan Email"
+            :errors="errors"/>
+
+          <div class="mt-2">
+            <Label class="" for="password">Password</Label>
+            <Field class="" id="password" :errors="errors">
+              <FormField v-slot="{ componentField }" name="password">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="password"
+                      v-bind="componentField"
+                      type="password"
+                      class="w-full"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </div>
+
+          <TextCaptcha
+            ref="captchaRef"
+            :length="5"
+            :useSpacing="true"
+            :noiseChars="true"
+            @update:valid="onCaptchaUpdate"
+          />
+
+        </div>
+      </div>
+  </Form>
+</template>
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 23640af7..c7ac7b4f 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -14,6 +14,7 @@ import Status from '~/components/content/encounter/status.vue'
 import AssesmentFunctionList from '~/components/content/soapi/entry.vue'
 import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
 import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
+import TherapyProtocolList from '~/components/content/therapy-protocol/list.vue'
 import Prescription from '~/components/content/prescription/main.vue'
 import CpLabOrder from '~/components/content/cp-lab-order/main.vue'
 import Radiology from '~/components/content/radiology-order/main.vue'
@@ -59,7 +60,7 @@ const tabs: TabItem[] = [
     component: AssesmentFunctionList,
     props: { encounter: data, type: 'function', label: 'Asesmen Fungsi' },
   },
-  { value: 'therapy-protocol', label: 'Protokol Terapi' },
+  { value: 'therapy-protocol', label: 'Protokol Terapi', component: TherapyProtocolList, props: { encounter: data } },
   { value: 'education-assessment', label: 'Asesmen Kebutuhan Edukasi' },
   { value: 'consent', label: 'General Consent' },
   { value: 'patient-note', label: 'CPRJ' },
@@ -85,10 +86,6 @@ const tabs: TabItem[] = [
       <PubMyUiNavContentBa label="Kembali ke Daftar Kunjungan" />
     </div>
     <AppEncounterQuickInfo :data="data" />
-    <CompTab
-      :data="tabs"
-      :initial-active-tab="activeTab"
-      @change-tab="activeTab = $event"
-    />
+    <CompTab :data="tabs" :initial-active-tab="activeTab" @change-tab="activeTab = $event" />
   </div>
 </template>
diff --git a/app/components/content/therapy-protocol/add.vue b/app/components/content/therapy-protocol/add.vue
new file mode 100644
index 00000000..bb184e23
--- /dev/null
+++ b/app/components/content/therapy-protocol/add.vue
@@ -0,0 +1,152 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { ExposedForm } from '~/types/form'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import { toast } from '~/components/pub/ui/toast'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { TherapyProtocolMedicRehabilitationSchema, TherapyProtocolSchema } from '~/schemas/therapy-protocol.schema'
+import { handleActionSave } from '~/handlers/therapy-protocol.handler'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.medicalDiagnoses = JSON.stringify(formData.medicalDiagnoses)
+  formData.functionDiagnoses = JSON.stringify(formData.functionDiagnoses)
+  formData.procedures = JSON.stringify(formData.procedures)
+  formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+const initial = {
+  // Required String Fields
+  form1ExaminationDate: "2025-11-06",
+  form1Diagnose: 'Awwww',
+  form1TherapyRequest: 'Awwww',
+  form1TargetPeriod: 4,
+  form1TherapyTarget: 'Awwww',
+  form2RelationshipToInsured: 'child',
+  anamnesis: 'Bobo aja wak',
+  form2PhysicalExamination: 'Awwww',
+  medicalDiagnoses: [
+      {
+          id: 3,
+          code: "PROC002",
+          name: "Cesarean section"
+      }
+  ],
+  functionDiagnoses: [
+      {
+          id: 3,
+          code: "PROC002",
+          name: "Cesarean section"
+      }
+  ],
+  procedures: [
+      {
+          id: 5,
+          code: "PROC0100",
+          name: "Physical therapy session"
+      }
+  ],
+  supportingExams: 'Awwww',
+  evaluation: 'Awwww',
+  instruction: 'Awwww',
+  workCauseStatus: 'TIDAK', 
+  form3ExaminationDate: "2025-11-06",
+  form3Diagnose: 'Awwww',
+  form3TherapyRequest: 'Awwww',
+  form3ProgramActivities: ['Menonton Kakek Meninggoy',],
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Tambah</div>
+  <AppTherapyProtocolEntry
+    ref="inputForm"
+    :schema="TherapyProtocolMedicRehabilitationSchema"
+    :resume-arrangement-type="inputForm?.values.arrangement"
+    :initial-values="initial"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false"
+      @click="handleActionClick"/>
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/detail.vue b/app/components/content/therapy-protocol/detail.vue
new file mode 100644
index 00000000..e40a8044
--- /dev/null
+++ b/app/components/content/therapy-protocol/detail.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import type { ExposedForm } from '~/types/form';
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const personPatientForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const recDate = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  // handleActionClick('submit')
+  console.log(`tersubmit wak`)
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) {
+      await navigateTo(props.callbackUrl)
+      return
+    }
+
+    goBack()
+    // handleCancelForm()
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('rec_date', recDate) // for divergence if we trigger same action on same Record Item multiple times
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, recDate], () => {
+  switch (recAction.value) {
+    case ActionEvents.showConfirmVerify:
+      handleActionClick('submit')
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <AppTherapyProtocolDetail />
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Konfirmasi"
+    message="Apakah Anda yakin ingin Konfirmasi data ini?"
+    confirm-text="Konfirmasi"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/edit.vue b/app/components/content/therapy-protocol/edit.vue
new file mode 100644
index 00000000..99dd569e
--- /dev/null
+++ b/app/components/content/therapy-protocol/edit.vue
@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import type { ExposedForm } from '~/types/form';
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { getDetail } from '~/services/therapy-protocol.service';
+import { handleActionEdit } from '~/handlers/therapy-protocol.handler'
+import { TherapyProtocolMedicRehabilitationSchema } from '~/schemas/therapy-protocol.schema';
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const therapyId = typeof route.params.therapy_protocol_id == 'string' ? parseInt(route.params.therapy_protocol_id) : 0
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(therapyId)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    currentValue.medicalDiagnoses = await JSON.parse(currentValue.medicalDiagnoses)
+    currentValue.functionDiagnoses = await JSON.parse(currentValue.functionDiagnoses)
+    currentValue.procedures = await JSON.parse(currentValue.procedures)
+    console.log(currentValue)
+    inputForm.value?.setValues(currentValue)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionEdit(
+    inputData,
+    therapyId,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.medicalDiagnoses = JSON.stringify(formData.medicalDiagnoses)
+  formData.functionDiagnoses = JSON.stringify(formData.functionDiagnoses)
+  formData.procedures = JSON.stringify(formData.procedures)
+  formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Edit</div>
+  <AppTherapyProtocolEntry
+    ref="inputForm"
+    :schema="TherapyProtocolMedicRehabilitationSchema"
+    :resume-arrangement-type="inputForm?.values.arrangement"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false"
+      @click="handleActionClick"/>
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/history-list.vue b/app/components/content/therapy-protocol/history-list.vue
new file mode 100644
index 00000000..c04e7143
--- /dev/null
+++ b/app/components/content/therapy-protocol/history-list.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+
+// #region Imports
+import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getPatients, removePatient } from '~/services/patient.service'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+// #endregion
+
+// Props
+interface Props {
+}
+const props = defineProps<Props>()
+// #endregion
+
+// #region State
+const isVerifyDialogOpen = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getPatients({ ...params, includes: ['person', 'person-Addresses'] }),
+  entityName: 'patient',
+})
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const summaryLoading = ref(false)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+})
+// #endregion
+
+// #region Functions
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+async function handleConfirmAdd() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.value = false
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'therapy-protocol-id-detail',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'therapy-protocol-id-edit',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmVerify:
+      // Trigger confirmation modal open
+      handleConfirmAdd()
+      break
+
+    case ActionEvents.showPrint:
+      navigateTo('https://google.com', {
+        external: true,
+        open: { target: "_blank" },
+      });
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+
+  <Popover>
+      <PopoverTrigger as-child>
+        <Button variant="outline" :class="cn('mb-3 w-[280px] justify-start text-left font-normal',
+          !dateValue && 'text-muted-foreground')">
+          <CalendarIcon class="mr-2 h-4 w-4" />
+          <template v-if="dateValue.start">
+            <template v-if="dateValue.end">
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }} -
+              {{ df.format(dateValue.end.toDate(getLocalTimeZone())) }}
+            </template>
+
+            <template v-else>
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }}
+            </template>
+          </template>
+          <template v-else> Pick a date </template>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent class="w-auto p-0">
+        <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+          @update:start-value="(startDate) => (dateValue.start = startDate)" />
+      </PopoverContent>
+    </Popover>
+
+    <AppTherapyProtocolHistoryDialog
+      :data="data"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange" />
+</template>
\ No newline at end of file
diff --git a/app/components/content/therapy-protocol/list.vue b/app/components/content/therapy-protocol/list.vue
new file mode 100644
index 00000000..670f09ec
--- /dev/null
+++ b/app/components/content/therapy-protocol/list.vue
@@ -0,0 +1,262 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+
+// #region Imports
+import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getList, remove } from '~/services/therapy-protocol.service'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import type { ExposedForm } from '~/types/form'
+import { VerificationSchema } from '~/schemas/verification.schema'
+import { handleActionSave } from '~/handlers/therapy-protocol.handler'
+import { toast } from '~/components/pub/ui/toast'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+// #endregion
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+// #endregion
+
+// #region State
+const isVerifyDialogOpen = ref(false)
+const isHistoryDialogOpen = ref(false)
+const isPatientInTherapy = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'therapy-protocol',
+})
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const isRecordConfirmationOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const summaryLoading = ref(false)
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<number>(0)
+
+const isCaptchaValid = ref(false)
+provide('isCaptchaValid', isCaptchaValid)
+
+const headerPrep: HeaderPrep = {
+  title: "Protokol Terapi",
+  icon: 'i-lucide-newspaper',
+  addNav: {
+    label: "Protokol Terapi",
+    onClick: () => navigateTo({
+      name: 'rehab-encounter-id-therapy-protocol-add',
+    }),
+  },
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+
+  const isInTherapy = false // TODO: determine if patient is in therapy
+  handleIsPatientInTherapy(isInTherapy)
+})
+// #endregion
+
+// #region Functions
+function handleIsPatientInTherapy(value: boolean) {
+  if (value) {
+    isPatientInTherapy.value = true
+  } else {
+    isPatientInTherapy.value = false
+  }
+}
+async function handleOpenHistory() {
+  isHistoryDialogOpen.value = true
+  console.log(`jalan history`)
+}
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+async function handleVerify() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleConfirmVerify() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  isVerifyDialogOpen.value = false
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  // formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    handleConfirmVerify()
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.value = false
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'therapy-protocol-id-detail',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'rehab-encounter-id-therapy-protocol-therapy_protocol_id-edit',
+        params: { therapy_protocol_id: recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmVerify:
+      // Trigger confirmation modal open
+      handleVerify()
+      break
+
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <section class="mb-5 flex justify-between items-center">
+    <!-- DATE RANGE -->
+    <Popover>
+      <PopoverTrigger as-child>
+        <Button variant="outline" :class="cn('w-[280px] justify-start text-left font-normal',
+          !dateValue && 'text-muted-foreground')">
+          <CalendarIcon class="mr-2 h-4 w-4" />
+          <template v-if="dateValue.start">
+            <template v-if="dateValue.end">
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }} -
+              {{ df.format(dateValue.end.toDate(getLocalTimeZone())) }}
+            </template>
+
+            <template v-else>
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }}
+            </template>
+          </template>
+          <template v-else> Pick a date </template>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent class="w-auto p-0">
+        <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+          @update:start-value="(startDate) => (dateValue.start = startDate)" />
+      </PopoverContent>
+    </Popover>
+
+    <!-- HISTORY -->
+    <Button variant="outline" :class="cn('',)" @click="handleOpenHistory">
+          <Icon name="i-lucide-history" class="h-4 w-4" />
+          History
+    </Button>
+  </section>
+
+  <AppTherapyProtocolCommonBannerPatientInTherapy 
+    v-if="isPatientInTherapy"
+    class="mb-5" />
+    
+  <AppTherapyProtocolList
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"/>
+
+  <Dialog v-model:open="isVerifyDialogOpen" title="Verifikasi">
+    <AppTherapyProtocolVerifyDialog
+      ref="inputForm"
+      :schema="VerificationSchema"
+    />
+    <div class="flex justify-end">
+      <Action v-show="isCaptchaValid" :enable-draft="false" @click="handleActionClick" />
+    </div>
+  </Dialog>
+
+  <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+    <ContentTherapyProtocolHistoryList />
+  </Dialog>
+
+  <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+    <!-- <DocPreviewDialog :link="recItem.url" /> -->
+    <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+  </Dialog>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/data/dropdown-action-dp.vue b/app/components/pub/my-ui/data/dropdown-action-dp.vue
new file mode 100644
index 00000000..479cfebd
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-dp.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-duvp.vue b/app/components/pub/my-ui/data/dropdown-action-duvp.vue
new file mode 100644
index 00000000..22952bd5
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-duvp.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+  
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Edit',
+    onClick: () => {
+      edit()
+    },
+    icon: 'i-lucide-pencil',
+  },
+  {
+    label: 'Verifikasi',
+    onClick: () => {
+      verify()
+    },
+    icon: 'i-lucide-shield-check',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function edit() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showEdit
+  recItem.value = props.rec
+}
+
+function verify() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-p.vue b/app/components/pub/my-ui/data/dropdown-action-p.vue
new file mode 100644
index 00000000..2b7ad617
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/types.ts b/app/components/pub/my-ui/data/types.ts
index cf251cc8..c979fde5 100644
--- a/app/components/pub/my-ui/data/types.ts
+++ b/app/components/pub/my-ui/data/types.ts
@@ -78,6 +78,8 @@ export const ActionEvents = {
   showEdit: 'showEdit',
   showDetail: 'showDetail',
   showProcess: 'showProcess',
+  showConfirmVerify: 'showConfirmVerify',
+  showPrint: 'showPrint',
 }
 
 export interface DataTableLoader {
diff --git a/app/components/pub/my-ui/form/text-area-input.vue b/app/components/pub/my-ui/form/text-area-input.vue
new file mode 100644
index 00000000..70e288da
--- /dev/null
+++ b/app/components/pub/my-ui/form/text-area-input.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName: string
+  placeholder: string
+  label: string
+  errors?: FormErrors
+  class?: string
+  colSpan?: number
+  numericOnly?: boolean
+  maxLength?: number
+  isRequired?: boolean
+  isDisabled?: boolean
+}>()
+
+function handleInput(event: Event) {
+  const target = event.target as HTMLInputElement
+  let value = target.value
+
+  // Filter numeric only jika diperlukan
+  if (props.numericOnly) {
+    value = value.replace(/\D/g, '')
+  }
+
+  // Batasi panjang maksimal jika diperlukan
+  if (props.maxLength && value.length > props.maxLength) {
+    value = value.slice(0, props.maxLength)
+  }
+
+  // Update value jika ada perubahan
+  if (target.value !== value) {
+    target.value = value
+    // Trigger input event untuk update form
+    target.dispatchEvent(new Event('input', { bubbles: true }))
+  }
+}
+</script>
+
+<template>
+  <DE.Cell :col-span="colSpan || 1">
+    <DE.Label
+      class="mb-2 font-medium"
+      v-if="label !== ''"
+      :label-for="fieldName"
+      :is-required="isRequired && !isDisabled"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Textarea
+              :disabled="isDisabled"
+              v-bind="componentField"
+              :placeholder="placeholder"
+              :maxlength="maxLength"
+              :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0')"
+              autocomplete="off"
+              aria-autocomplete="none"
+              autocorrect="off"
+              autocapitalize="off"
+              spellcheck="false"
+              @input="handleInput"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/modal/dialog.vue b/app/components/pub/my-ui/modal/dialog.vue
index d771924f..1a3614f6 100644
--- a/app/components/pub/my-ui/modal/dialog.vue
+++ b/app/components/pub/my-ui/modal/dialog.vue
@@ -45,15 +45,12 @@ const isOpen = computed({
 
 <template>
   <Dialog v-model:open="isOpen">
-    <DialogContent
-      :class="sizeClass"
-      @interact-outside="(e: any) => preventOutside && e.preventDefault()"
-      @pointer-down-outside="(e: any) => preventOutside && e.preventDefault()"
-    >
+    <DialogContent :class="sizeClass" @interact-outside="(e: any) => preventOutside && e.preventDefault()"
+      @pointer-down-outside="(e: any) => preventOutside && e.preventDefault()">
       <DialogHeader>
         <DialogTitle :class="`text-sm 2xl:text-base font-semibold flex ${titleClass || ''}`">
-          <div v-if="props.titleIcon" class="me-2 pt-0.5">
-            <Icon :name="props.titleIcon" :class="`!pt-2`" />
+          <div class="me-2 pt-0.5">
+            <Icon v-if="props.titleIcon" :name="props.titleIcon" :class="`!pt-2`" />
           </div>
           <div>
             {{ props.title }}
@@ -66,4 +63,4 @@ const isOpen = computed({
       </DialogDescription>
     </DialogContent>
   </Dialog>
-</template>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/modal/doc-preview-dialog.vue b/app/components/pub/my-ui/modal/doc-preview-dialog.vue
new file mode 100644
index 00000000..26534456
--- /dev/null
+++ b/app/components/pub/my-ui/modal/doc-preview-dialog.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  link: string
+}>()
+
+const emit = defineEmits<{
+  // submit: [values: InstallationFormData, resetForm: () => void]
+  // cancel: [resetForm: () => void]
+}>()
+
+// Form cancel handler
+// function onCancelForm({ resetForm }: { resetForm: () => void }) {
+//   emit('cancel', resetForm)
+// }
+function onExternalLink() {
+  navigateTo(props.link, {external: true,open: { target: "_blank" },});
+}
+</script>
+
+<template>
+  <Button variant="link" class="absolute top-4 right-16" @click="onExternalLink">
+    Open in Browser
+    <Icon name="i-lucide-external-link" class="h-4 w-4" />
+  </Button>
+  <div class="border border-gray-400 rounded-lg w-full h-[80vh] overflow-hidden">
+    <embed style="width: 100%; height: 100%" :src="props.link" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/nav-footer/ba-dr-su.vue b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
index 8c292758..b35654da 100644
--- a/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
+++ b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue
@@ -26,19 +26,19 @@ function onClick(type: ClickType) {
   <div :class="`${defaultClass} ${additionalClass} ${btnClass}`">
     <div>
       <Button variant="ghost" type="button" @click="onClick('back')">
-        <Icon name="i-lucide-arrow-left"  />
+        <Icon name="i-lucide-arrow-left" />
         Back
       </Button>
     </div>
-    <div>
-      <Button v-show="enableDraft" variant="secondary" type="button" @click="onClick('draft')">
+    <div v-show="props.enableDraft">
+      <Button variant="secondary" type="button" @click="onClick('draft')">
         <Icon name="i-lucide-file" />
         Draft
       </Button>
     </div>
     <div>
       <Button type="button" @click="onClick('submit')">
-        <Icon name="i-lucide-check"  />
+        <Icon name="i-lucide-check" />
         Submit
       </Button>
     </div>
diff --git a/app/handlers/therapy-protocol.handler.ts b/app/handlers/therapy-protocol.handler.ts
new file mode 100644
index 00000000..c0423eff
--- /dev/null
+++ b/app/handlers/therapy-protocol.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/therapy-protocol.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/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
new file mode 100644
index 00000000..9593e171
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
+
+// Define permission-based computed properties
+const canCreate = true // hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <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
new file mode 100644
index 00000000..cf35e5ec
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
+
+// Define permission-based computed properties
+const canCreate = true // hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <ContentTherapyProtocolAdd />
+  </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
new file mode 100644
index 00000000..5fc1b9a6
--- /dev/null
+++ b/app/pages/(features)/therapy-protocol/[id]/detail.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail 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
new file mode 100644
index 00000000..c0629508
--- /dev/null
+++ b/app/pages/(features)/therapy-protocol/[id]/edit.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: '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
new file mode 100644
index 00000000..a489abc5
--- /dev/null
+++ b/app/pages/(features)/therapy-protocol/add.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah 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/schemas/therapy-protocol.schema.ts b/app/schemas/therapy-protocol.schema.ts
new file mode 100644
index 00000000..1c4e85a8
--- /dev/null
+++ b/app/schemas/therapy-protocol.schema.ts
@@ -0,0 +1,159 @@
+import { z } from 'zod'
+
+const TherapyProtocolSchema = z.object({
+  examinationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  relationshipToInsured: z.enum(['spouse', 'child'], {
+    required_error: 'Pilih hubungan',
+  }),
+  anamnesis: z.string({
+    required_error: 'Mohon lengkapi catatan anamnesa',
+  }),
+  medicalHistory: z.string({
+    required_error: 'Mohon lengkapi catatan riwayat penyakit',
+  }),
+  medicationHistory: z.string({
+    required_error: 'Mohon lengkapi catatan riwayat obat',
+  }),
+
+  supportDiagnosis: z.array(
+    z.object({
+      diagnosis: z.string({
+        required_error: 'Isi diagnosis',
+      }),
+    }),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  functionalDiagnosis: z.array(
+    z
+      .object({
+        diagnosis: z.string({}),
+      })
+      .optional(),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  treatmentDiagnosis: z.array(
+    z.object({
+      diagnosis: z.string({
+        required_error: 'Isi diagnosis',
+      }),
+    }),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  supportExamination: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan penunjang',
+  }),
+
+  recommendation: z.string({
+    required_error: 'Mohon lengkapi catatan anjuran',
+  }),
+  evaluation: z.string({
+    required_error: 'Mohon lengkapi catatan evaluasi',
+  }),
+  isWorkRelatedDisease: z.string({
+    required_error: 'Pilih apakah penyakit berkaitan dengan pekerjaan',
+  }),
+})
+
+
+
+const PickerItemSchema = z.object({
+  id: z.number().optional(),
+  code: z.string(),
+  name: z.string()
+})
+
+const TherapyProtocolMedicRehabilitationSchema = z.object({
+  form1ExaminationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  form1Diagnose: z.string({
+    required_error: 'Mohon lengkapi catatan diagnosa',
+  }),
+  form1TherapyRequest: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form1TargetPeriod: z.number({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form1TherapyTarget: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+
+  form2RelationshipToInsured: z.enum(['spouse', 'child'], {
+    required_error: 'Pilih hubungan',
+  }),
+  anamnesis: z.string({
+    required_error: 'Mohon lengkapi catatan anamnesa',
+  }),
+  form2PhysicalExamination: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan fisik',
+  }),
+
+  medicalDiagnoses: z.array(PickerItemSchema).default([]),
+  functionDiagnoses: z.array(PickerItemSchema).default([]),
+  procedures: z.array(PickerItemSchema).default([]),
+
+  supportingExams: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan penunjang',
+  }),
+  evaluation: z.string({
+    required_error: 'Mohon lengkapi catatan evaluasi',
+  }),
+  instruction: z.string({
+    required_error: 'Mohon lengkapi catatan anjuran',
+  }),
+  workCauseStatus: z.enum(['YA', 'TIDAK'], {
+    required_error: 'Pilih apakah penyakit berkaitan dengan pekerjaan',
+  }),
+
+  form3ExaminationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  form3Diagnose: z.string({
+    required_error: 'Mohon lengkapi catatan diagnosa',
+  }),
+  form3TherapyRequest: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form3ProgramActivities: z.array(
+    z.string({
+      required_error: 'Mohon lengkapi Program/Kegiatan',
+    }),
+    {
+      required_error: 'Isi Program/Kegiatan',
+    },
+  ).default(['']),
+})
+
+
+// {
+//     "encounter_id": 4,
+//     "doctor_code": "doc-3",
+//     "anamnesis": "",
+//     "medicalDiagnoses": "", //json
+//     "functionDiagnoses": "", //json
+//     "procedures":"", 
+//     "supportingExams":"",
+//     "instruction":"",
+//     "evaluation":"",
+//     "workCauseStatus":"YA",
+//     "frequency":1,
+//     "intervalUnit_code":"day",
+//     "duration":30,
+//     "durationUnit_code":"min"
+// }
+
+
+type TherapyProtocolFormData = z.infer<typeof TherapyProtocolSchema>
+type TherapyProtocolMedicRehabilitationFormData = z.infer<typeof TherapyProtocolMedicRehabilitationSchema>
+
+export { TherapyProtocolSchema, TherapyProtocolMedicRehabilitationSchema }
+export type { TherapyProtocolFormData, TherapyProtocolMedicRehabilitationFormData }
diff --git a/app/schemas/verification.schema.ts b/app/schemas/verification.schema.ts
new file mode 100644
index 00000000..22061c10
--- /dev/null
+++ b/app/schemas/verification.schema.ts
@@ -0,0 +1,19 @@
+import { z } from 'zod'
+
+const VerificationSchema = z.object({
+  name: z.string({
+    required_error: 'Mohon lengkapi Nama Anda',
+  }),
+  email: z.string({
+    required_error: 'Mohon lengkapi email',
+  }),
+  password: z.string({
+    required_error: 'Mohon lengkapi password',
+  }),
+})
+
+
+type VerificationFormData = z.infer<typeof VerificationSchema>
+
+export { VerificationSchema, }
+export type { VerificationFormData, }
diff --git a/app/services/therapy-protocol.service.ts b/app/services/therapy-protocol.service.ts
new file mode 100644
index 00000000..329115f6
--- /dev/null
+++ b/app/services/therapy-protocol.service.ts
@@ -0,0 +1,27 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+
+const path = '/api/v1/therapy-protocol'
+const name = 'therapy-protocol'
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
\ No newline at end of file

From f060ed33d204800e70304271849d6dd5d9714bd9 Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Mon, 24 Nov 2025 10:21:20 +0700
Subject: [PATCH 02/13] Feat: UI KFR

---
 .../kfr/_common/banner-patient-in-therapy.vue |  22 ++
 .../kfr/_common/btn-confirmation-detail.vue   |  28 ++
 .../app/kfr/_common/btn-history.vue           |  21 +
 .../app/kfr/_common/card-result.vue           |  66 ++++
 .../app/kfr/_common/dropdown-action.vue       | 100 +++++
 .../app/kfr/_common/radio-followup.vue        |  93 +++++
 .../app/kfr/_common/verify-badge.vue          |  44 +++
 app/components/app/kfr/entry.vue              | 128 ++++++
 app/components/app/kfr/history-list.cfg.ts    |  60 +++
 app/components/app/kfr/history-list.vue       |  61 +++
 app/components/app/kfr/list.cfg.ts            |  59 +++
 app/components/app/kfr/list.vue               |  14 +
 app/components/app/kfr/verify-dialog.vue      | 108 +++++
 app/components/content/encounter/process.vue  |   7 +
 app/components/content/kfr/entry.vue          | 138 +++++++
 app/components/content/kfr/list.vue           | 372 ++++++++++++++++++
 .../pub/my-ui/data/dropdown-action-dvvp.vue   | 103 +++++
 app/components/pub/my-ui/data/types.ts        |   2 +
 .../pub/my-ui/form/text-area-input.vue        |   4 +-
 .../pub/my-ui/form/text-captcha.vue           | 175 ++++++++
 app/handlers/kfr.handler.ts                   |  24 ++
 .../encounter/[id]/kfr/[kfr_id]/edit.vue      |  44 +++
 .../rehab/encounter/[id]/kfr/add.vue          |  44 +++
 app/schemas/kfr.schema.ts                     |  17 +
 app/services/kfr.service.ts                   |  27 ++
 25 files changed, 1759 insertions(+), 2 deletions(-)
 create mode 100644 app/components/app/kfr/_common/banner-patient-in-therapy.vue
 create mode 100644 app/components/app/kfr/_common/btn-confirmation-detail.vue
 create mode 100644 app/components/app/kfr/_common/btn-history.vue
 create mode 100644 app/components/app/kfr/_common/card-result.vue
 create mode 100644 app/components/app/kfr/_common/dropdown-action.vue
 create mode 100644 app/components/app/kfr/_common/radio-followup.vue
 create mode 100644 app/components/app/kfr/_common/verify-badge.vue
 create mode 100644 app/components/app/kfr/entry.vue
 create mode 100644 app/components/app/kfr/history-list.cfg.ts
 create mode 100644 app/components/app/kfr/history-list.vue
 create mode 100644 app/components/app/kfr/list.cfg.ts
 create mode 100644 app/components/app/kfr/list.vue
 create mode 100644 app/components/app/kfr/verify-dialog.vue
 create mode 100644 app/components/content/kfr/entry.vue
 create mode 100644 app/components/content/kfr/list.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-dvvp.vue
 create mode 100644 app/components/pub/my-ui/form/text-captcha.vue
 create mode 100644 app/handlers/kfr.handler.ts
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
 create mode 100644 app/schemas/kfr.schema.ts
 create mode 100644 app/services/kfr.service.ts

diff --git a/app/components/app/kfr/_common/banner-patient-in-therapy.vue b/app/components/app/kfr/_common/banner-patient-in-therapy.vue
new file mode 100644
index 00000000..27dc4445
--- /dev/null
+++ b/app/components/app/kfr/_common/banner-patient-in-therapy.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import { cn } from '~/lib/utils';
+
+const props = withDefaults(defineProps<{
+  assesmentDate?: string
+  class?: string
+}>(), {
+  assesmentDate: new Date().toISOString(),
+})
+</script>
+
+<template>
+    <div :class="cn('flex items-center gap-3 p-3 rounded-md text-orange-500 border border-orange-400 bg-orange-50',
+        props.class
+    )">
+        <Icon name="i-lucide-triangle-alert" class="h-9 w-9 align-middle transition-colors" />
+        <p class="font-medium">Pasien telah mencapai atau telah melampaui jadwal Asesment pada 
+          <b>{{ new Date(props.assesmentDate).toDateString() }}</b>
+          <br>
+           Harap melakukan Re-Asement sebelum melanjutkan Protocol Therapy</p>
+    </div>
+</template>
diff --git a/app/components/app/kfr/_common/btn-confirmation-detail.vue b/app/components/app/kfr/_common/btn-confirmation-detail.vue
new file mode 100644
index 00000000..e09432d5
--- /dev/null
+++ b/app/components/app/kfr/_common/btn-confirmation-detail.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+import Button from '~/components/pub/ui/button/Button.vue';
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const recDate = inject<Ref<any>>('rec_date')!
+
+function confirm() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  recDate.value = new Date().getTime()
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="confirm">
+        <Icon name="i-lucide-circle-check" class="h-4 w-4 align-middle transition-colors" />
+        Konfirmasi
+    </Button>
+</template>
diff --git a/app/components/app/kfr/_common/btn-history.vue b/app/components/app/kfr/_common/btn-history.vue
new file mode 100644
index 00000000..6804c451
--- /dev/null
+++ b/app/components/app/kfr/_common/btn-history.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+import Button from '~/components/pub/ui/button/Button.vue';
+
+const props = defineProps<{
+  
+}>()
+const isModalOpen = inject<Ref<boolean>>('isHistoryDialogOpen')!
+
+function openDialog() {
+  isModalOpen.value = true
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="openDialog">
+        <Icon name="i-lucide-history" class="h-4 w-4 align-middle transition-colors" />
+        History
+    </Button>
+</template>
diff --git a/app/components/app/kfr/_common/card-result.vue b/app/components/app/kfr/_common/card-result.vue
new file mode 100644
index 00000000..d77302ef
--- /dev/null
+++ b/app/components/app/kfr/_common/card-result.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+</script>
+
+<template>
+  <table>
+    <tbody>
+      <tr>
+        <td><b>S : </b></td>
+        <td>{{ props.rec.result.s }}</td>
+      </tr>
+    </tbody>
+  </table>
+  <Separator class="my-3" />
+  <table>
+    <tbody>
+      <tr>
+        <td><b>O : </b></td>
+        <td>{{ props.rec.result.o }}</td>
+      </tr>
+    </tbody>
+  </table>
+  <Separator class="my-3" />
+  <table>
+    <tbody>
+      <tr>
+        <td><b>A : </b></td>
+        <td>{{ props.rec.result.a }}</td>
+      </tr>
+    </tbody>
+  </table>
+  <Separator class="my-3" />
+  <div>
+    <h1><b>P : </b></h1>
+    <ul class="pl-5 list-disc space-y-1">
+      <li>
+        <h1><b>Goal of Treatment</b></h1>
+        <p>{{ props.rec.result.p.goal }}</p>
+      </li>
+      <li>
+        <h1><b>Tindakan/Program Rehabilitasi Medik</b></h1>
+        <p>{{ props.rec.result.p.action }}</p>
+      </li>
+      <li>
+        <h1><b>Edukasi</b></h1>
+        <p>{{ props.rec.result.p.education }}</p>
+      </li>
+      <li>
+        <h1><b>Frekuensi Kunjungan</b></h1>
+        <p>{{ props.rec.result.p.frequency }} x Perminggu</p>
+      </li>
+    </ul>
+  </div>
+  <Separator class="my-3" />
+  <table>
+    <tbody>
+      <tr>
+        <td><b>Rencana Tindak Lanjut : </b></td>
+        <td>{{ props.rec.result.plan }} - {{ props.rec.result.planDesc }}</td>
+      </tr>
+    </tbody>
+  </table>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/_common/dropdown-action.vue b/app/components/app/kfr/_common/dropdown-action.vue
new file mode 100644
index 00000000..f99c3c43
--- /dev/null
+++ b/app/components/app/kfr/_common/dropdown-action.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const { getActiveRole } = useUserStore()
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+
+const activeKey = ref<string | null>(null)
+const linkItems = computed(() => {
+  const role = getActiveRole()
+  const isAdmin = role == "system"
+  const isDoctorRole = role == "emp|doc"
+  const isPhysioRole = role == "emp|doc"
+  const isUnverified = true // recItem.id === 0
+  const isUnvalidated = true // recItem.id
+
+  const items: LinkItem[] = [
+    { label: 'Print', onClick: print, icon: 'i-lucide-printer', }
+  ]
+  if (isDoctorRole || isAdmin) {
+    items.push({ label: 'Edit', onClick: edit, icon: 'i-lucide-pencil', })
+
+    if (isUnverified) {
+      items.push({ label: 'Verify', onClick: verify, icon: 'i-lucide-check', })
+    }
+    if (!isUnverified && isUnvalidated) { // verified & unvalidated
+      items.push({ label: 'Validate', onClick: validate, icon: 'i-lucide-check-check', })
+    }
+
+    items.push({ label: 'Delete', onClick: del, icon: 'i-lucide-trash', })
+  }
+  
+  return items
+})
+
+function edit() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showEdit
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+
+function verify() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showVerify
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+function validate() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showValidate
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+function del() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmDelete
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800">
+          <Icon name="i-lucide-chevrons-up-down" class="ml-auto size-4" />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end">
+        <DropdownMenuGroup>
+          <DropdownMenuItem v-for="item in linkItems" :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700" @click="item.onClick" @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null">
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/kfr/_common/radio-followup.vue b/app/components/app/kfr/_common/radio-followup.vue
new file mode 100644
index 00000000..94ede9cb
--- /dev/null
+++ b/app/components/app/kfr/_common/radio-followup.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { value: 'EVALUASI', label: 'Evaluasi' },
+  { value: 'RUJUK', label: 'Rujuk' },
+  { value: 'SELESAI', label: 'Selesai' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/kfr/_common/verify-badge.vue b/app/components/app/kfr/_common/verify-badge.vue
new file mode 100644
index 00000000..c82c0c7c
--- /dev/null
+++ b/app/components/app/kfr/_common/verify-badge.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { Badge } from '~/components/pub/ui/badge'
+
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+
+const verifyStatusCodes: Record<string, string> = {
+  verified: 'Terverifikasi',
+  unverified: 'Belum Verifikasi',
+}
+const validateStatusCodes: Record<string, string> = {
+  validated: 'Tervalidasi',
+  unvalidated: 'Belum Validasi',
+}
+
+const verifyStatusText = computed(() => {
+  const code: keyof typeof verifyStatusCodes = props.rec.status.verified === 1 ? `verified` : `unverified`
+  return verifyStatusCodes[code]
+})
+const validateStatusText = computed(() => {
+  const code: keyof typeof validateStatusCodes = props.rec.status.validated === 1 ? `validated` : `unvalidated`
+  return validateStatusCodes[code]
+})
+
+const verifyBadgeVariant = computed(() => {
+  return props.rec.status.verified === 1 ? 'default' : 'outline'
+})
+const validateBadgeVariant = computed(() => {
+  return props.rec.status.validated === 1 ? 'default' : 'outline'
+})
+</script>
+
+<template>
+  <div class="flex flex-col gap-2 items-center justify-center">
+    <Badge :variant="verifyBadgeVariant" class="w-fit rounded-2xl text-[0.6rem]" >
+      {{ verifyStatusText }}
+    </Badge>
+    <Badge :variant="validateBadgeVariant" class="w-fit rounded-2xl text-[0.6rem]" >
+      {{ validateStatusText }}
+    </Badge>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/entry.vue b/app/components/app/kfr/entry.vue
new file mode 100644
index 00000000..e7d0c64f
--- /dev/null
+++ b/app/components/app/kfr/entry.vue
@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import RadioFollowup from './_common/radio-followup.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+// const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isFunctionalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isProcedurePickerDialogOpen = ref<boolean>(false)
+
+// function toggleMedicalDiagnosisPickerDialog() {
+//   isMedicalDiagnosisPickerDialogOpen.value = !isMedicalDiagnosisPickerDialogOpen.value
+// }
+// function toggleFunctionalDiagnosisPickerDialog() {
+//   isFunctionalDiagnosisPickerDialogOpen.value = !isFunctionalDiagnosisPickerDialogOpen.value
+// }
+
+// provide(`isDiagnosisPickerDialogOpen`, isDiagnosisPickerDialogOpen)
+// provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)        
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues">
+
+    <!-- FORM 1 -->
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">
+        <TextAreaInput
+          field-name="subjective"
+          label="Subjective"
+          placeholder="Subjective"
+          class="w-1/2"
+          :errors="errors" />
+      </DE.Cell>
+      <DE.Cell :col-span="2" >
+        <TextAreaInput
+          field-name="objective"
+          label="Objective"
+          placeholder="Masukkan Objective"
+          class="w-1/2"
+          :errors="errors" />
+      </DE.Cell>
+      <DE.Cell :col-span="2">
+        <TextAreaInput
+          field-name="assesment"
+          label="Assesment"
+          placeholder="Masukkan Assesment"
+          class="w-1/2"
+          :errors="errors" />
+      </DE.Cell>
+
+      <DE.Cell class="mt-2 px-4 bg-gray-50 border rounded-lg" :col-span="2">
+        <DE.Block :col-count="2" :cell-flex="false">
+          <TextAreaInput
+            field-name="planningGoal"
+            label="Goal of Treatment"
+            placeholder="Masukkan Goal of Treatment"
+            :errors="errors" />
+          <TextAreaInput
+            field-name="planningAction"
+            label="Tindakan/Program Rehabilitasi Medik"
+            placeholder="Masukkan Tindakan/Program Rehabilitasi Medik"
+            :errors="errors" />
+          <TextAreaInput
+            field-name="planningEducation"
+            label="Edukasi"
+            placeholder="Masukkan Edukasi"
+            :errors="errors" />
+          <InputBase
+            field-name="planningFrequency"
+            label="Frekuensi Kunjungan"
+            right-label="x Minggu"
+            placeholder="Masukkan Frekuensi Kunjungan"
+            :errors="errors"
+            numeric-only
+            is-disabled 
+          />
+        </DE.Block>
+      </DE.Cell>
+
+      <DE.Cell :col-span="2">      
+        <RadioFollowup
+          field-name="followUpPlan"
+          label="Rencana Tindak Lanjut"
+          :errors="errors"
+          is-required
+        />
+        <TextAreaInput
+          label=""
+          field-name="followUpPlanDesc"
+          placeholder="Masukkan Keterangan rencana tindak lanjut"
+          class="w-1/2 mt-3"
+          :errors="errors" />
+      </DE.Cell>
+
+      
+
+    </DE.Block>
+  </Form>
+</template>
diff --git a/app/components/app/kfr/history-list.cfg.ts b/app/components/app/kfr/history-list.cfg.ts
new file mode 100644
index 00000000..bc86241e
--- /dev/null
+++ b/app/components/app/kfr/history-list.cfg.ts
@@ -0,0 +1,60 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dp.vue'))
+const resultData = defineAsyncComponent(() => import('./_common/card-result.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+
+export const config: Config = {
+  cols: [{}, { width: 800 }, {}, { width: 120 }, { width: 3 },],
+
+  headers: [
+    [
+      { label: 'Tanggal' },
+      { label: 'Hasil Asesmen Pasien Dan Pemberian Pelayanan' },
+      { label: 'Jenis Form' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'result', 'type', 'status', 'action'],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    result(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: resultData,
+      }
+    },
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/kfr/history-list.vue b/app/components/app/kfr/history-list.vue
new file mode 100644
index 00000000..d0a0619a
--- /dev/null
+++ b/app/components/app/kfr/history-list.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './history-list.cfg'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import { cn } from '~/lib/utils'
+
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+  dateValue: DateRange
+}
+const props = defineProps<Props>()
+const df = new DateFormatter('en-US', {  dateStyle: 'medium',})
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+  'update:dateValue': [value: DateRange]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <Popover>
+            <PopoverTrigger as-child>
+                <Button variant="outline" :class="cn('mb-1 w-[280px] justify-start text-left font-normal',
+                !props.dateValue && 'text-muted-foreground')">
+                <CalendarIcon class="mr-2 h-4 w-4" />
+                <template v-if="props.dateValue.start">
+                    <template v-if="props.dateValue.end">
+                    {{ df.format(props.dateValue.start.toDate(getLocalTimeZone())) }} -
+                    {{ df.format(props.dateValue.end.toDate(getLocalTimeZone())) }}
+                    </template>
+
+                    <template v-else>
+                    {{ df.format(props.dateValue.start.toDate(getLocalTimeZone())) }}
+                    </template>
+                </template>
+                <template v-else> Pick a date </template>
+                </Button>
+            </PopoverTrigger>
+            <PopoverContent class="w-auto p-0">
+                <RangeCalendar v-model="props.dateValue" initial-focus :number-of-months="2"
+                    @update:model-value="(date) => emit('update:dateValue', date)" />
+            </PopoverContent>
+        </Popover>
+
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/list.cfg.ts b/app/components/app/kfr/list.cfg.ts
new file mode 100644
index 00000000..1ba6a461
--- /dev/null
+++ b/app/components/app/kfr/list.cfg.ts
@@ -0,0 +1,59 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./_common/dropdown-action.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+const resultData = defineAsyncComponent(() => import('./_common/card-result.vue'))
+
+export const config: Config = {
+  cols: [{}, { width: 800 }, {}, { width: 120 }, { width: 3 },],
+
+  headers: [
+    [
+      { label: 'Tanggal' },
+      { label: 'Hasil Asesmen Pasien Dan Pemberian Pelayanan' },
+      { label: 'Jenis Form' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'result', 'type', 'status', 'action'],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    result(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: resultData,
+      }
+    },
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/kfr/list.vue b/app/components/app/kfr/list.vue
new file mode 100644
index 00000000..f5d7a6bb
--- /dev/null
+++ b/app/components/app/kfr/list.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { config } from './list.cfg'
+
+interface Props {
+  data: any[]
+}
+defineProps<Props>()
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable v-bind="config" :rows="data" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/kfr/verify-dialog.vue b/app/components/app/kfr/verify-dialog.vue
new file mode 100644
index 00000000..c67bd977
--- /dev/null
+++ b/app/components/app/kfr/verify-dialog.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import type { InstallationFormData } from '~/schemas/installation.schema'
+import TextCaptcha from '~/components/pub/my-ui/form/text-captcha.vue'
+
+
+const props = defineProps<{
+  schema: any
+  errors?: FormErrors
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+const captchaRef = ref<InstanceType<typeof TextCaptcha> | null>(null)
+const captchaValid = ref(false)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: InstallationFormData = {
+    name: values.name || '',
+    code: values.code || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+function onCaptchaUpdate(valid: boolean) {
+  captchaValid.value = valid
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    validation-mode="onSubmit" 
+  >
+      <div class="border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+
+          <InputBase
+            field-name="name"
+            label="Nama"
+            placeholder="Masukkan Nama"
+            :errors="errors"/>
+          <InputBase
+            field-name="email"
+            label="Email"
+            placeholder="Masukkan Email"
+            :errors="errors"/>
+
+          <div class="mt-2">
+            <Label class="" for="password">Password</Label>
+            <Field class="" id="password" :errors="errors">
+              <FormField v-slot="{ componentField }" name="password">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="password"
+                      v-bind="componentField"
+                      type="password"
+                      class="w-full"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </div>
+
+          <TextCaptcha
+            ref="captchaRef"
+            :length="5"
+            :useSpacing="true"
+            :noiseChars="true"
+            @update:valid="onCaptchaUpdate"
+          />
+
+        </div>
+      </div>
+  </Form>
+</template>
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index c7ac7b4f..7605897e 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -14,6 +14,7 @@ import Status from '~/components/content/encounter/status.vue'
 import AssesmentFunctionList from '~/components/content/soapi/entry.vue'
 import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
 import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
+import KfrList from '~/components/content/kfr/list.vue'
 import TherapyProtocolList from '~/components/content/therapy-protocol/list.vue'
 import Prescription from '~/components/content/prescription/main.vue'
 import CpLabOrder from '~/components/content/cp-lab-order/main.vue'
@@ -54,6 +55,12 @@ const tabs: TabItem[] = [
     component: EarlyMedicalRehabList,
     props: { encounter: data, type: 'early-rehab', label: 'Pengkajian Awal Medis Rehabilitasi Medis' },
   },
+  {
+    value: 'kfr',
+    label: 'Formulir Rawat Jalan KFR',
+    component: KfrList,
+    props: { encounter: data, type: 'kfr', label: 'Formulir Rawat Jalan KFR' },
+  },
   {
     value: 'function-assessment',
     label: 'Asesmen Fungsi',
diff --git a/app/components/content/kfr/entry.vue b/app/components/content/kfr/entry.vue
new file mode 100644
index 00000000..743351bc
--- /dev/null
+++ b/app/components/content/kfr/entry.vue
@@ -0,0 +1,138 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { ExposedForm } from '~/types/form'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import { toast } from '~/components/pub/ui/toast'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { KfrSchema, } from '~/schemas/kfr.schema'
+import { handleActionSave } from '~/handlers/kfr.handler'
+import { getDetail } from '~/services/kfr.service';
+
+// #region Props & Emits
+const props = withDefaults(defineProps<{
+  callbackUrl?: string
+  mode?: 'add' | 'edit'
+}>(), {
+  mode: "add",
+})
+
+// form related state
+const route = useRoute()
+
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const kfrId = typeof route.params.kfr_id == 'string' ? parseInt(route.params.kfr_id) : 0
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  if(props.mode === `edit`) init()
+})
+// #endregion
+
+// #region Functions
+async function init(){
+  const result = await getDetail(kfrId)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    inputForm.value?.setValues(currentValue)
+  }
+}
+
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+
+const initial = {
+  // subjective: '',
+  // objective: '',
+  // assesment: '',
+  // planningGoal: '',
+  // planningAction: '',
+  // planningEducation: '',
+  planningFrequency: 2,
+  followUpPlan: 'EVALUASI', 
+  // followUpPlanDesc: '',
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">
+    {{ props.mode === "add" ? `Tambah` : `Update` }} Formulir Rawat Jalan KFR
+  </div>
+  <AppKfrEntry
+    ref="inputForm"
+    :schema="KfrSchema"
+    :initial-values="initial"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false" @click="handleActionClick"/>
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
diff --git a/app/components/content/kfr/list.vue b/app/components/content/kfr/list.vue
new file mode 100644
index 00000000..4a4613e9
--- /dev/null
+++ b/app/components/content/kfr/list.vue
@@ -0,0 +1,372 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Imports
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getList, remove } from '~/services/kfr.service'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import type { ExposedForm } from '~/types/form'
+import { VerificationSchema } from '~/schemas/verification.schema'
+import { handleActionSave } from '~/handlers/kfr.handler'
+import { toast } from '~/components/pub/ui/toast'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { CalendarDate } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+// #endregion
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const kfrId = typeof route.params.kfr_id == 'string' ? parseInt(route.params.kfr_id) : 0
+// #endregion
+
+// #region State
+const { getActiveRole } = useUserStore()
+const isVerifyDialogOpen = ref(false)
+const isValidateDialogOpen = ref(false)
+const isHistoryDialogOpen = ref(false)
+const isPatientInTherapy = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'kfr',
+})
+const historyData = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'kfr-history',
+})
+
+const dummy = [
+  {
+    id: 11,
+    date: new Date(),
+    result: {
+      s: `Example`,
+      o: `Example`,
+      a: `Example`,
+      p: {
+        goal: `Example`,
+        action: `Example`,
+        education: `Example`,
+        frequency: `Example`,
+      },
+      plan: `Example`,
+      planDesc: `Description`,
+    },
+    type: `Asesmen`,
+    status: {
+      verified: 1,
+      validated: 0,
+    },
+  }
+]
+
+const isRecordConfirmationOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const summaryLoading = ref(false)
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<number>(0)
+
+const isAssessment = ref<boolean>(false)
+const isTherapyProtocol = ref<boolean>(false)
+const isReassessment = ref<boolean>(true)
+const isInOrBeyondAssessmentPeriod = ref<boolean>(true)
+
+const isDoctor = computed(() => getActiveRole() === 'emp|doc')
+const isAdmin = computed(() => getActiveRole() === 'system')
+
+const isCaptchaValid = ref(false)
+provide('isCaptchaValid', isCaptchaValid)
+
+const addBtnTxt = computed(() => {
+  if (isAssessment.value) {
+    return `Tambah Asesmen`
+  } else if (isTherapyProtocol.value) {
+    return `Tambah Protokol Terapi`
+  } else if (isReassessment.value) {
+    return `Tambah Re-Asesmen`
+  }
+  return `Tambah Asesmen`
+})
+
+  const headerPrep: HeaderPrep = {
+    title: "Formulir Rawat Jalan KFR",
+    icon: 'i-lucide-newspaper',
+  }
+if(isDoctor.value || isAdmin.value) {
+  headerPrep.addNav = {
+    label: addBtnTxt.value,
+    onClick: () => navigateTo({
+      name: 'rehab-encounter-id-kfr-add',
+    }),
+  }
+}
+if(!isAssessment.value) {
+  headerPrep.components = [
+    {
+      component: defineAsyncComponent(() => import('~/components/app/kfr/_common/btn-history.vue')),
+      props: {  }
+    },
+  ];
+}
+
+  
+const defaultDate = {
+  start: new CalendarDate(2025, 1, 20),
+  end: new CalendarDate(2025, 1, 20).add({ days: 20 }),
+}
+const historyDateValue = ref(defaultDate) as Ref<DateRange>
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+
+  const isInTherapy = false // TODO: determine if patient is in therapy
+  handleIsPatientInTherapy(isInTherapy)
+})
+// #endregion
+
+// #region Functions
+function handleIsInAssesmentPeriood(value: boolean) {
+  if (value) {
+    isInOrBeyondAssessmentPeriod.value = true
+  } else {
+    isInOrBeyondAssessmentPeriod.value = false
+  }
+}
+function handleIsPatientInTherapy(value: boolean) {
+  if (value) {
+    isPatientInTherapy.value = true
+  } else {
+    isPatientInTherapy.value = false
+  }
+}
+
+async function handleOpenHistory() {
+  isHistoryDialogOpen.value = true
+}
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+function toggleHistoryDialog() {
+  isHistoryDialogOpen.value = !isHistoryDialogOpen.value
+}
+
+function handleVerify() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleConfirmVerify() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  isVerifyDialogOpen.value = false
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  // formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+
+async function handleConfirmValidate() {  
+    try {
+      // const result = await remove(record.id)
+      // if (result.success) {
+      //   toast({ title: 'Berhasil', description: 'Data berhasil dihapus', variant: 'default' })
+      //   await fetchData()
+      // } else {
+      //   toast({ title: 'Gagal', description: `Data gagal dihapus`, variant: 'destructive' })
+      // }
+    } catch (error) {
+      toast({ title: 'Gagal', description: `Something went wrong`, variant: 'destructive' })
+    }  
+}
+
+function handleCancelValidate() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+
+async function handleConfirmDelete(record: any, action: string) {
+  if (action === 'delete' && record?.id) {
+    try {
+      const result = await remove(record.id)
+      if (result.success) {
+        toast({ title: 'Berhasil', description: 'Data berhasil dihapus', variant: 'default' })
+        await fetchData()
+      } else {
+        toast({ title: 'Gagal', description: `Data gagal dihapus`, variant: 'destructive' })
+      }
+    } catch (error) {
+      toast({ title: 'Gagal', description: `Something went wrong`, variant: 'destructive' })
+    }
+  }
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    handleConfirmVerify()
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.value = false
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+provide('table_data_loader', isLoading)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showEdit:
+      // if(pagePermission.canUpdate) { 
+      navigateTo({
+        name: 'rehab-encounter-id-kfr-kfr_id-edit',
+        params: {
+          kfr_id: kfrId
+        }
+      })
+      // } else {
+      //   unauthorizedToast()
+      // }
+      break
+    case ActionEvents.showVerify:
+      // if(pagePermission.canUpdate) { 
+      handleVerify()
+      // } else {
+      //   unauthorizedToast()
+      // }
+      break
+    case ActionEvents.showValidate:
+      // if(pagePermission.canUpdate) {        
+      isValidateDialogOpen.value = true
+      // } else {
+      //   unauthorizedToast()
+      // }
+      break
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true
+      break
+    case ActionEvents.showConfirmDelete:
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <AppKfrCommonBannerPatientInTherapy v-if="isInOrBeyondAssessmentPeriod" class="mb-5" />
+
+  <AppKfrList :data="dummy" />
+
+  <Dialog v-model:open="isVerifyDialogOpen" title="Verifikasi">
+    <AppKfrVerifyDialog ref="inputForm" :schema="VerificationSchema" />
+    <div class="flex justify-end">
+      <Action v-show="isCaptchaValid" :enable-draft="false" @click="handleActionClick" />
+    </div>
+  </Dialog>
+
+  <Confirmation
+    v-model:open="isValidateDialogOpen"
+    title="Validasi Data"
+    message="Apakah Anda yakin ingin Validasi data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmValidate"
+    @cancel="handleCancelValidate"
+  />
+
+  <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+    <AppKfrHistoryList
+      :data="dummy"
+      v-model:date-value="historyDateValue"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange" />
+  </Dialog>
+
+  <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
+    @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
+    <template #default="{ record }">
+      <div class="text-sm">
+        <p>
+          <strong>ID:</strong>
+          {{ record?.id }}
+        </p>
+        <p v-if="record?.firstName">
+          <strong>Nama:</strong>
+          {{ record.firstName }}
+        </p>
+      </div>
+    </template>
+  </RecordConfirmation>
+
+  <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+    <!-- <DocPreviewDialog :link="recItem.url" /> -->
+    <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+  </Dialog>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/data/dropdown-action-dvvp.vue b/app/components/pub/my-ui/data/dropdown-action-dvvp.vue
new file mode 100644
index 00000000..a9e14942
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-dvvp.vue
@@ -0,0 +1,103 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Verifikasi',
+    onClick: () => {
+      verify()
+    },
+    icon: 'i-lucide-check',
+  },
+  {
+    label: 'Validasi',
+    onClick: () => {
+      validate()
+    },
+    icon: 'i-lucide-check-check',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function verify() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showVerify
+  recItem.value = props.rec
+}
+
+function validate() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showValidate
+  recItem.value = props.rec
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/data/types.ts b/app/components/pub/my-ui/data/types.ts
index c979fde5..48fc84b5 100644
--- a/app/components/pub/my-ui/data/types.ts
+++ b/app/components/pub/my-ui/data/types.ts
@@ -78,7 +78,9 @@ export const ActionEvents = {
   showEdit: 'showEdit',
   showDetail: 'showDetail',
   showProcess: 'showProcess',
+  showVerify: 'showVerify',
   showConfirmVerify: 'showConfirmVerify',
+  showValidate: 'showValidate',
   showPrint: 'showPrint',
 }
 
diff --git a/app/components/pub/my-ui/form/text-area-input.vue b/app/components/pub/my-ui/form/text-area-input.vue
index 70e288da..c8bdde02 100644
--- a/app/components/pub/my-ui/form/text-area-input.vue
+++ b/app/components/pub/my-ui/form/text-area-input.vue
@@ -47,7 +47,7 @@ function handleInput(event: Event) {
 <template>
   <DE.Cell :col-span="colSpan || 1">
     <DE.Label
-      class="mb-2 font-medium"
+      class="font-medium"
       v-if="label !== ''"
       :label-for="fieldName"
       :is-required="isRequired && !isDisabled"
@@ -69,7 +69,7 @@ function handleInput(event: Event) {
               v-bind="componentField"
               :placeholder="placeholder"
               :maxlength="maxLength"
-              :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0')"
+              :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0', props.class)"
               autocomplete="off"
               aria-autocomplete="none"
               autocorrect="off"
diff --git a/app/components/pub/my-ui/form/text-captcha.vue b/app/components/pub/my-ui/form/text-captcha.vue
new file mode 100644
index 00000000..de9d7f4b
--- /dev/null
+++ b/app/components/pub/my-ui/form/text-captcha.vue
@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { ref, computed, watch, defineEmits, defineProps, onMounted, nextTick, defineExpose } from 'vue'
+import Input from '~/components/pub/ui/input/Input.vue';
+import Button from '~/components/pub/ui/button/Button.vue';
+import waveyFingerprint from '~/assets/svg/wavey-fingerprint.svg'
+
+/**
+ * TextCaptcha props:
+ * - length: number of characters in the core captcha
+ * - caseSensitive: whether validation is case sensitive
+ * - useSpacing: show spaced-out characters (visual obfuscation only)
+ * - noiseChars: include random noise characters visually (not required to type)
+ */
+const props = defineProps({
+  length: { type: Number, default: 6 },
+  caseSensitive: { type: Boolean, default: false },
+  useSpacing: { type: Boolean, default: true },
+  noiseChars: { type: Boolean, default: false }, // adds random noise characters to display
+  refreshCooldownMs: { type: Number, default: 500 }, // guard repeated refresh
+})
+
+const emit = defineEmits<{
+  (e: 'update:valid', valid: boolean): void
+  (e: 'validated', valid: boolean): void
+  (e: 'change', value: string): void
+}>()
+
+// Internal state
+const raw = ref('')            // the canonical captcha value (what user must match, ignoring visual noise)
+const display = ref('')        // randomized visual representation (may include spacing/noise)
+const input = ref('')          // user typed value
+const lastRefresh = ref(0)
+const valid = inject('isCaptchaValid') as Ref<boolean>
+const errorMessage = ref('')
+
+/** Characters excluding ambiguous ones: 0/O, 1/l/I etc. */
+const CHARS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+
+function randomChar() {
+  return CHARS.charAt(Math.floor(Math.random() * CHARS.length))
+}
+
+/** Generate the canonical captcha string */
+function genRaw(len = props.length) {
+  let s = ''
+  for (let i = 0; i < len; i++) s += randomChar()
+  return s
+}
+
+/** Create a visually obfuscated display string (spacing, noise, random case) */
+function genDisplay(base: string) {
+  const arr: string[] = []
+  for (const ch of base) {
+    // toggle case randomly (only for letters)
+    const c = /[A-Za-z]/.test(ch) && Math.random() > 0.5 ? (Math.random() > 0.5 ? ch.toLowerCase() : ch.toUpperCase()) : ch
+    arr.push(c)
+    if (props.useSpacing && Math.random() > 0.3) arr.push(' ') // random space
+  }
+  return arr.join('')
+}
+
+/** Refresh captcha */
+function refresh() {
+  const now = Date.now()
+  if (now - lastRefresh.value < props.refreshCooldownMs) return
+  lastRefresh.value = now
+
+  raw.value = genRaw(props.length)
+  display.value = genDisplay(raw.value)
+  input.value = ''
+  valid.value = false
+  errorMessage.value = ''
+  // emit change so parent knows new value (but we don't send the raw canonical in production)
+  emit('change', display.value)
+}
+
+/** Normalize input and canonical for comparison */
+function normalizeForCompare(s: string) {
+  const normalized = s.replace(/\s+/g, '') // strip spaces
+  return props.caseSensitive ? normalized : normalized.toLowerCase()
+}
+
+/** Validate the current input */
+function validate() {
+  const left = normalizeForCompare(input.value)
+  const right = normalizeForCompare(raw.value)
+  if (!input.value) {
+    valid.value = false
+    errorMessage.value = 'Please enter the captcha text.'
+  } else if (left === right) {
+    valid.value = true
+    errorMessage.value = ''
+  } else {
+    valid.value = false
+    errorMessage.value = 'Captcha does not match.'
+  }
+  emit('update:valid', valid.value)
+  emit('validated', valid.value)
+  return valid.value
+}
+
+// expose a refresh method to parent via ref
+defineExpose({ refresh, validate, isValid: computed(() => valid.value) })
+
+// generate on mount
+onMounted(() => refresh())
+
+// // re-validate whenever input changes (lightweight)
+// watch(input, () => {
+//   // we don't auto-pass until the user explicitly validate (but we can optionally live-validate)
+//   // Here we perform live feedback but still emit validated only when called
+//   const left = normalizeForCompare(input.value)
+//   const right = normalizeForCompare(raw.value)
+//   valid.value = !!input.value && left === right
+//   // emit a live update so the parent can disable submit accordingly
+//   emit('update:valid', valid.value)
+// })
+</script>
+
+<template>
+  <div class="space-y-2 w-full max-w-sm">
+    <div class="flex items-center justify-between gap-3">
+      <!-- Captcha visual box -->
+      <div
+        role="img"
+        aria-label="Text captcha, type the characters shown"
+        tabindex="0"
+        class="select-none p-3 rounded-md border border-gray-200 text-white text-xl font-mono tracking-wider text-center w-full"
+      >
+        <span class="inline-block" v-html="display"></span>
+      </div>
+
+      <!-- Refresh -->
+      <div class="flex-shrink-0">
+        <Button variant="ghost" type="button" @click="refresh" title="Refresh captcha">
+          <Icon name="i-lucide-refresh-cw" />
+        </Button>
+      </div>
+    </div>
+
+    <!-- Input -->
+    <div class="flex gap-3 items-start">
+        <div class="flex-grow">
+            <Input
+                v-model="input"
+                :aria-invalid="valid ? 'false' : 'true'"
+                inputmode="text"
+                placeholder="Type the captcha text"
+                @keyup.enter="validate"
+            />
+            <p v-if="errorMessage" class="text-xs text-red-500 mt-1">{{ errorMessage }}</p>
+            <p v-else-if="valid" class="text-xs text-green-500 mt-1">Correct</p>
+            <p v-else class="text-xs text-gray-500 mt-1">Not case-sensitive</p>
+        </div>
+        <Button variant="outline" type="button" @click="validate" title="Validate"
+            class="border-orange-400">
+            <Icon name="i-lucide-check" class="text-orange-400" />
+        </Button>
+    </div>
+
+  </div>
+</template>
+
+<style scoped>
+/* small nicety: make noise/spaced display look irregular */
+div[role="img"] {
+  background: url('~/assets/svg/wavey-fingerprint.svg') repeat center;
+}
+
+div[role="img"] span {
+  letter-spacing: 0.12em;
+  font-weight: 600;
+  user-select: none;
+}
+</style>
\ No newline at end of file
diff --git a/app/handlers/kfr.handler.ts b/app/handlers/kfr.handler.ts
new file mode 100644
index 00000000..929b57cc
--- /dev/null
+++ b/app/handlers/kfr.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/kfr.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
new file mode 100644
index 00000000..91076c03
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/kfr/[kfr_id]/edit.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
+
+// Define permission-based computed properties
+const canCreate = true // hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <ContentKfrEntry mode="edit" />
+  </div>
+  <Error
+    v-else
+    :status-code="403"
+  />
+</template>
diff --git a/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue b/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
new file mode 100644
index 00000000..e8d1c895
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/kfr/add.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
+
+// Define permission-based computed properties
+const canCreate = true // hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <ContentKfrEntry />
+  </div>
+  <Error
+    v-else
+    :status-code="403"
+  />
+</template>
diff --git a/app/schemas/kfr.schema.ts b/app/schemas/kfr.schema.ts
new file mode 100644
index 00000000..3bbe43c6
--- /dev/null
+++ b/app/schemas/kfr.schema.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod'
+
+type KfrFormData = z.infer<typeof KfrSchema>
+const KfrSchema = z.object({
+  subjective: z.string({required_error: 'Mohon lengkapi Form',}),
+  objective: z.string({required_error: 'Mohon lengkapi Form',}),
+  assesment: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningGoal: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningAction: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningEducation: z.string({required_error: 'Mohon lengkapi Form',}),
+  planningFrequency: z.number({required_error: 'Mohon lengkapi Form',}),
+  followUpPlan: z.enum(['EVALUASI', 'RUJUK', "SELESAI"], {required_error: 'Mohon lengkapi status pasien', }),
+  followUpPlanDesc: z.string({required_error: 'Mohon lengkapi Form',}),
+})
+
+export { KfrSchema,  }
+export type { KfrFormData,  }
diff --git a/app/services/kfr.service.ts b/app/services/kfr.service.ts
new file mode 100644
index 00000000..7259aaa3
--- /dev/null
+++ b/app/services/kfr.service.ts
@@ -0,0 +1,27 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+
+const path = '/api/v1/kfr'
+const name = 'kfr'
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
\ No newline at end of file

From 4a465f399269037f9b0e19e06a2d9b2eae0f924e Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Mon, 24 Nov 2025 13:40:22 +0700
Subject: [PATCH 03/13] progress

---
 app/components/content/kfr/entry.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/components/content/kfr/entry.vue b/app/components/content/kfr/entry.vue
index 743351bc..a2352c1a 100644
--- a/app/components/content/kfr/entry.vue
+++ b/app/components/content/kfr/entry.vue
@@ -5,7 +5,7 @@ import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 import { toast } from '~/components/pub/ui/toast'
 import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
 import { KfrSchema, } from '~/schemas/kfr.schema'
-import { handleActionSave } from '~/handlers/kfr.handler'
+import { handleActionSave, handleActionEdit } from '~/handlers/kfr.handler'
 import { getDetail } from '~/services/kfr.service';
 
 // #region Props & Emits
@@ -50,12 +50,20 @@ function goBack() {
 
 async function handleConfirmAdd() {
   const inputData: any = await composeFormData()
-  const response = await handleActionSave(
-    inputData,
-    () => { },
-    () => { },
-    toast,
-  )
+  const response = props.mode === `add` 
+  ? await handleActionSave(
+      inputData,
+      () => { },
+      () => { },
+      toast,
+    )
+  : await handleActionEdit(
+      kfrId,
+      inputData,
+      () => { },
+      () => { },
+      toast,
+    )
 
   const data = (response?.body?.data ?? null)
   if (!data) return

From 3e5c03148b8fe03ca0fafeaf652f2cc95992be83 Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Tue, 25 Nov 2025 09:17:11 +0700
Subject: [PATCH 04/13] progress

---
 .../_common/select-billing-code.vue           |  71 +++++++
 .../_common/select-birth-desc.vue             |  71 +++++++
 .../_common/select-birth-place-desc.vue       |  71 +++++++
 .../surgery-report/_common/select-date.vue    | 117 +++++++++++
 .../_common/select-dissection-type.vue        |  71 +++++++
 .../_common/select-dpjp-anastesi.vue          |  87 ++++++++
 .../_common/select-dpjp-bedah.vue             |  87 ++++++++
 .../_common/select-specimen-type.vue          |  71 +++++++
 .../_common/select-surgery-order.vue          |  71 +++++++
 .../_common/select-surgery-system-type.vue    |  71 +++++++
 .../_common/select-surgery-type.vue           |  71 +++++++
 app/components/app/surgery-report/detail.vue  |  54 +++++
 app/components/app/surgery-report/entry.vue   | 183 ++++++++++++++++
 app/components/app/surgery-report/list.cfg.ts |  57 +++++
 app/components/app/surgery-report/list.vue    |  31 +++
 .../app/surgery-report/multiselect-picker.vue |  33 +++
 .../operative-action-list.cfg.ts              |  56 +++++
 app/components/content/encounter/process.vue  |   2 +
 .../content/surgery-report/detail.vue         |  77 +++++++
 .../content/surgery-report/entry.vue          | 194 +++++++++++++++++
 .../content/surgery-report/list.vue           | 195 ++++++++++++++++++
 .../pub/my-ui/nav-header/filter.vue           |   2 +-
 app/handlers/surgery-report.handler.ts        |  24 +++
 app/lib/constants.ts                          |  62 ++++++
 app/models/surgery-report.ts                  |  37 ++++
 .../[surgery_report_id]/edit.vue              |  41 ++++
 .../[surgery_report_id]/index.vue             |  41 ++++
 .../encounter/[id]/surgery-report/add.vue     |  41 ++++
 app/schemas/surgery-report.schema.ts          |  47 +++++
 app/services/surgery-report.service.ts        |  28 +++
 30 files changed, 2063 insertions(+), 1 deletion(-)
 create mode 100644 app/components/app/surgery-report/_common/select-billing-code.vue
 create mode 100644 app/components/app/surgery-report/_common/select-birth-desc.vue
 create mode 100644 app/components/app/surgery-report/_common/select-birth-place-desc.vue
 create mode 100644 app/components/app/surgery-report/_common/select-date.vue
 create mode 100644 app/components/app/surgery-report/_common/select-dissection-type.vue
 create mode 100644 app/components/app/surgery-report/_common/select-dpjp-anastesi.vue
 create mode 100644 app/components/app/surgery-report/_common/select-dpjp-bedah.vue
 create mode 100644 app/components/app/surgery-report/_common/select-specimen-type.vue
 create mode 100644 app/components/app/surgery-report/_common/select-surgery-order.vue
 create mode 100644 app/components/app/surgery-report/_common/select-surgery-system-type.vue
 create mode 100644 app/components/app/surgery-report/_common/select-surgery-type.vue
 create mode 100644 app/components/app/surgery-report/detail.vue
 create mode 100644 app/components/app/surgery-report/entry.vue
 create mode 100644 app/components/app/surgery-report/list.cfg.ts
 create mode 100644 app/components/app/surgery-report/list.vue
 create mode 100644 app/components/app/surgery-report/multiselect-picker.vue
 create mode 100644 app/components/app/surgery-report/operative-action-list.cfg.ts
 create mode 100644 app/components/content/surgery-report/detail.vue
 create mode 100644 app/components/content/surgery-report/entry.vue
 create mode 100644 app/components/content/surgery-report/list.vue
 create mode 100644 app/handlers/surgery-report.handler.ts
 create mode 100644 app/models/surgery-report.ts
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
 create mode 100644 app/schemas/surgery-report.schema.ts
 create mode 100644 app/services/surgery-report.service.ts

diff --git a/app/components/app/surgery-report/_common/select-billing-code.vue b/app/components/app/surgery-report/_common/select-billing-code.vue
new file mode 100644
index 00000000..321c2d33
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-billing-code.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, BillingCodeTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => BillingCodeTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-birth-desc.vue b/app/components/app/surgery-report/_common/select-birth-desc.vue
new file mode 100644
index 00000000..2b19f3bc
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-birth-desc.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, BirthDescriptionTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => BirthDescriptionTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-birth-place-desc.vue b/app/components/app/surgery-report/_common/select-birth-place-desc.vue
new file mode 100644
index 00000000..c6f2ed06
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-birth-place-desc.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, BirthPlaceDescriptionTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => BirthPlaceDescriptionTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-date.vue b/app/components/app/surgery-report/_common/select-date.vue
new file mode 100644
index 00000000..0468c752
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-date.vue
@@ -0,0 +1,117 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+  isWithTime?: boolean
+}>()
+
+const {
+  fieldName = 'birthDate',
+  label = 'Tanggal Lahir',
+  placeholder = 'Pilih tanggal lahir',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+// Function to calculate age with years, months, and days
+function calculateAge(birthDate: string | Date | undefined): string {
+  if (!birthDate) {
+    return 'Masukkan tanggal lahir'
+  }
+
+  try {
+    let dateObj: Date
+
+    if (typeof birthDate === 'string') {
+      dateObj = parseISO(birthDate)
+    } else {
+      dateObj = birthDate
+    }
+
+    const today = new Date()
+
+    // Calculate years, months, and days
+    const totalYears = differenceInYears(today, dateObj)
+
+    // Calculate remaining months after years
+    const yearsPassed = new Date(dateObj)
+    yearsPassed.setFullYear(yearsPassed.getFullYear() + totalYears)
+    const remainingMonths = differenceInMonths(today, yearsPassed)
+
+    // Calculate remaining days after years and months
+    const monthsPassed = new Date(yearsPassed)
+    monthsPassed.setMonth(monthsPassed.getMonth() + remainingMonths)
+    const remainingDays = differenceInDays(today, monthsPassed)
+
+    // Format the result
+    const parts = []
+    if (totalYears > 0) parts.push(`${totalYears} Tahun`)
+    if (remainingMonths > 0) parts.push(`${remainingMonths} Bulan`)
+    if (remainingDays > 0) parts.push(`${remainingDays} Hari`)
+
+    return parts.length > 0 ? parts.join(' ') : '0 Hari'
+  } catch {
+    return 'Masukkan tanggal lahir'
+  }
+}
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              :type="props.isWithTime ? 'datetime-local' : 'date'"
+              min="1900-01-01"
+              v-bind="componentField"
+              :placeholder="placeholder"
+              @update:model-value="
+                (value: string | number) => {
+                  const dateStr = typeof value === 'number' ? String(value) : value
+                  patientAge = calculateAge(dateStr)
+                }
+              "
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-dissection-type.vue b/app/components/app/surgery-report/_common/select-dissection-type.vue
new file mode 100644
index 00000000..45708dac
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-dissection-type.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, DissectionTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => DissectionTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-dpjp-anastesi.vue b/app/components/app/surgery-report/_common/select-dpjp-anastesi.vue
new file mode 100644
index 00000000..b649c28f
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-dpjp-anastesi.vue
@@ -0,0 +1,87 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const doctors = ref<Array<Item>>([])
+
+async function fetchDpjp() {
+  doctors.value = await getDoctorLabelList({
+    serviceType: 1,
+    serviceDate: new Date().toISOString().substring(0, 10),
+    includes: 'employee-person',
+  }, true)
+}
+
+onMounted(() => {
+  fetchDpjp()
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="doctors"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-dpjp-bedah.vue b/app/components/app/surgery-report/_common/select-dpjp-bedah.vue
new file mode 100644
index 00000000..b649c28f
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-dpjp-bedah.vue
@@ -0,0 +1,87 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const doctors = ref<Array<Item>>([])
+
+async function fetchDpjp() {
+  doctors.value = await getDoctorLabelList({
+    serviceType: 1,
+    serviceDate: new Date().toISOString().substring(0, 10),
+    includes: 'employee-person',
+  }, true)
+}
+
+onMounted(() => {
+  fetchDpjp()
+})
+
+// function handleDpjpChange(selected: string) {
+//   selectedDpjpId.value = selected ?? null
+// }
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="doctors"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-specimen-type.vue b/app/components/app/surgery-report/_common/select-specimen-type.vue
new file mode 100644
index 00000000..e1017e76
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-specimen-type.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, SpecimenTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => SpecimenTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-surgery-order.vue b/app/components/app/surgery-report/_common/select-surgery-order.vue
new file mode 100644
index 00000000..ff48d195
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-surgery-order.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, SurgeryOrderTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => SurgeryOrderTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-surgery-system-type.vue b/app/components/app/surgery-report/_common/select-surgery-system-type.vue
new file mode 100644
index 00000000..745904eb
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-surgery-system-type.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, SurgerySystemTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => SurgerySystemTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/_common/select-surgery-type.vue b/app/components/app/surgery-report/_common/select-surgery-type.vue
new file mode 100644
index 00000000..e396fe7d
--- /dev/null
+++ b/app/components/app/surgery-report/_common/select-surgery-type.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes, SurgeryTypeOptList } from '~/lib/constants'
+import { getValueLabelList as getDoctorLabelList } from '~/services/doctor.service'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Item } from '~/components/pub/my-ui/combobox'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const itemList = computed<Array<Item>>(() => SurgeryTypeOptList)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="itemList"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/detail.vue b/app/components/app/surgery-report/detail.vue
new file mode 100644
index 00000000..e10a2b91
--- /dev/null
+++ b/app/components/app/surgery-report/detail.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import { cn, } from '~/lib/utils'
+import type { ControlLetter } from '~/models/control-letter'
+
+// #region Props & Emits
+const props = defineProps<{
+  instance: ControlLetter | null
+}>()
+
+const emit = defineEmits<{
+  (e: 'click', type: string): void
+}>()
+
+// #endregion
+
+// #region State & Computed
+// #endregion
+
+// Computed addresses from nested data
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+
+// #endregion region
+
+// #region Utilities & event handlers
+function onClick(type: string) {
+  emit('click', type)
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <div :class="cn('min-h-[50vh] space-y-2',)">
+    <DetailRow label="Tgl Rencana Kontrol">{{ props.instance?.date ? new Date(props.instance?.date).toLocaleDateString('id-ID') : '-' }}</DetailRow>
+    <DetailRow label="Unit">{{ props.instance?.unit.name || '-' }}</DetailRow>
+    <DetailRow label="Spesialis">{{ props.instance?.specialist.name || '-' }}</DetailRow>
+    <DetailRow label="Sub Spesialis">{{ props.instance?.subspecialist.name || '-' }}</DetailRow>
+    <DetailRow label="DPJP">{{ props.instance?.doctor.employee.person.name || '-' }}</DetailRow>
+    <DetailRow label="Status SEP">{{ 'SEP INTERNAL' }}</DetailRow>
+  </div>
+  <div class="border-t-1 my-2 flex justify-end border-t-slate-300 py-2">
+    <PubMyUiNavFooterBaEd @click="onClick" />
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/app/components/app/surgery-report/entry.vue b/app/components/app/surgery-report/entry.vue
new file mode 100644
index 00000000..e3862ee5
--- /dev/null
+++ b/app/components/app/surgery-report/entry.vue
@@ -0,0 +1,183 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import SelectDpjpBedah from './_common/select-dpjp-bedah.vue'
+import SelectDpjpAnastesi from './_common/select-dpjp-anastesi.vue'
+import SelectSurgeryType from './_common/select-surgery-type.vue'
+import SelectBillingCode from './_common/select-billing-code.vue'
+import SelectSurgerySystemType from './_common/select-surgery-system-type.vue'
+import SelectDissectionType from './_common/select-dissection-type.vue'
+import SelectSurgeryOrder from './_common/select-surgery-order.vue'
+import SelectBirthDesc from './_common/select-birth-desc.vue'
+import SelectBirthPlaceDesc from './_common/select-birth-place-desc.vue'
+import SelectSpecimenType from './_common/select-specimen-type.vue'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+const isOperativeActionDialogOpen = inject<Ref<boolean>>('isOperativeActionDialogOpen')!
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+
+const handleToggleOperativeActionDialog = () => {
+  isOperativeActionDialogOpen.value = !isOperativeActionDialogOpen.value
+}
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues ? initialValues : {}"
+  >
+    <DE.Block :col-count="4" :cell-flex="false">
+      <SelectDpjpBedah :errors="errors"
+        field-name="a1"
+        label="DPJP Bedah" placeholder="Pilih DPJP Bedah"
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a2"
+        label="Operator" placeholder="Isi Operator"
+      />
+      <InputBase :errors="errors"
+        field-name="a3"
+        label="Asisten Operator" placeholder="Isi Asisten Operator"
+      />
+      <InputBase :errors="errors"
+        field-name="a4"
+        label="Instrumentir" placeholder="Isi Instrumentir"
+      />
+      <SelectDpjpAnastesi :errors="errors"
+        field-name="a5"
+        label="DPJP Anastesi" placeholder="Pilih DPJP Anastesi"
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Perawatan Anastesi" placeholder="Isi Perawatan Anastesi"
+      />
+      <SelectDate
+        field-name="a7"
+        label="Tanggal Pembedahan"
+        :errors="errors"
+        is-required
+      />
+    </DE.Block>
+    <DE.Block :col-count="4" :cell-flex="false">
+      <DE.Cell :col-span="2">
+        <TextAreaInput :errors="errors"
+          field-name="a8"
+          label="Diagnosa Pra Bedah" placeholder="Isi Diagnosa Pra Bedah"            
+          is-required
+        />
+      </DE.Cell>
+      <InputBase :errors="errors"
+        field-name="a9"
+        label="Perawat Pra Bedah" placeholder="Isi Perawat Pra Bedah"
+      />
+    </DE.Block>
+    
+    <!-- PICKER -->
+
+    <!-- -->
+
+    <DE.Block :col-count="3" :cell-flex="false">
+      <SelectSurgeryType :errors="errors"
+        field-name="a10"
+        label="Tipe Operasi" placeholder="Pilih Tipe Operasi"
+        is-required
+      />
+      <SelectBillingCode :errors="errors"
+        field-name="a11"
+        label="Kode Billing" placeholder="Pilih Kode Billing"
+        is-required
+      />
+      <SelectSurgerySystemType :errors="errors"
+        field-name="a12"
+        label="Sistem Operasi" placeholder="Pilih Sistem Operasi"
+        is-required
+      />      
+      <SelectDate :errors="errors"
+        field-name="a7"
+        label="Operasi Mulai"        
+        is-required
+        is-with-time
+      />    
+      <SelectDate :errors="errors"
+        field-name="a7"
+        label="Operasi Selesai"        
+        is-required
+        is-with-time
+      />
+      <div>
+        <p class="mt-1.5 mb-2">Lama Operasi</p>
+        <h1 class="text-lg"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
+      </div>
+      <SelectDate :errors="errors"
+        field-name="a7"
+        label="Pembiusan Mulai"        
+        is-required
+        is-with-time
+      />    
+      <SelectDate :errors="errors"
+        field-name="a7"
+        label="Pembiusan Selesai"        
+        is-required
+        is-with-time
+      />
+      <div>
+        <p class="mt-1.5 mb-2">Lama Pembiusan</p>
+        <h1 class="text-lg"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
+      </div>
+      <SelectDissectionType :errors="errors"
+        field-name="a13"
+        label="Tipe Pembedahan" placeholder="Pilih Tipe Pembedahan"
+        is-required
+      />
+      <SelectSurgeryOrder :errors="errors"
+        field-name="a14"
+        label="Urutan Operasi" placeholder="Pilih Urutan Operasi"
+        is-required
+      />
+      <SelectBirthDesc :errors="errors"
+        field-name="a15"
+        label="Ket. Lahir" placeholder="Pilih Ket. Lahir"
+        is-required
+      />
+      <SelectBirthPlaceDesc :errors="errors"
+        field-name="a16"
+        label="Ket. Tempat Lahir" placeholder="Pilih Ket. Tempat Lahir"
+        is-required
+      />
+      <SelectSpecimenType :errors="errors"
+        field-name="a17"
+        label="Specimen/Jaringan Dikirim Ke" placeholder="Pilih Specimen/Jaringan Dikirim Ke"
+        is-required
+      />
+    </DE.Block>
+    
+
+  </Form>
+</template>
diff --git a/app/components/app/surgery-report/list.cfg.ts b/app/components/app/surgery-report/list.cfg.ts
new file mode 100644
index 00000000..6a63af13
--- /dev/null
+++ b/app/components/app/surgery-report/list.cfg.ts
@@ -0,0 +1,57 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+import { educationCodes, genderCodes } from '~/lib/constants'
+import { calculateAge } from '~/lib/utils'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {}, {},],
+
+  headers: [
+    [
+      { label: 'Tgl Laporan' },
+      { label: 'DPJP Bedah' },
+      { label: 'DPJP Anastesi' },
+      { label: 'Tgl Pembedahan' },
+      { label: 'Jenis Operasi' },
+      { label: 'Kode Billing' },
+      { label: 'Sistem Operasi' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['date', 'doctor.employee.person.name', 'doctor.employee.person.name', 'date', 'name', 'name', 'name', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+
+  },
+}
diff --git a/app/components/app/surgery-report/list.vue b/app/components/app/surgery-report/list.vue
new file mode 100644
index 00000000..8274e752
--- /dev/null
+++ b/app/components/app/surgery-report/list.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './list.cfg'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
diff --git a/app/components/app/surgery-report/multiselect-picker.vue b/app/components/app/surgery-report/multiselect-picker.vue
new file mode 100644
index 00000000..98a146ce
--- /dev/null
+++ b/app/components/app/surgery-report/multiselect-picker.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import { config } from './operative-action-list.cfg'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+defineProps<Props>()
+const modelValue = defineModel<any[]>('modelValue', { default: [] })
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      select-mode="multiple"
+      v-model="modelValue"
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
diff --git a/app/components/app/surgery-report/operative-action-list.cfg.ts b/app/components/app/surgery-report/operative-action-list.cfg.ts
new file mode 100644
index 00000000..2d0a6637
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action-list.cfg.ts
@@ -0,0 +1,56 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+import { educationCodes, genderCodes } from '~/lib/constants'
+import { calculateAge } from '~/lib/utils'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {}, ],
+
+  headers: [
+    [
+      { label: 'Tgl Laporan' },
+      { label: 'DPJP Bedah' },
+      { label: 'DPJP Anastesi' },
+      { label: 'Tgl Pembedahan' },
+      { label: 'Jenis Operasi' },
+      { label: 'Kode Billing' },
+      { label: 'Sistem Operasi' },
+    ],
+  ],
+
+  keys: ['date', 'doctor.employee.person.name', 'doctor.employee.person.name', 'date', 'name', 'name', 'name'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+  },
+
+  components: {
+    // action(rec, idx) {
+    //   return {
+    //     idx,
+    //     rec: rec as object,
+    //     component: action,
+    //   }
+    // },
+  },
+
+  htmls: {
+    
+  },
+}
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 02fc7495..2e03029c 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -26,6 +26,7 @@ import DocUploadList from '~/components/content/document-upload/list.vue'
 import GeneralConsentList from '~/components/content/general-consent/entry.vue'
 import ResumeList from '~/components/content/resume/list.vue'
 import ControlLetterList from '~/components/content/control-letter/list.vue'
+import SurgeryReportList from '~/components/content/surgery-report/list.vue'
 
 const route = useRoute()
 const router = useRouter()
@@ -90,6 +91,7 @@ const tabs: TabItem[] = [
   { value: 'resume', label: 'Resume', component: ResumeList, props: { encounter: data } },
   { value: 'control', label: 'Surat Kontrol', component: ControlLetterList, props: { encounter: data } },
   { value: 'screening', label: 'Skrinning MPP' },
+  { value: 'surgery-report', label: 'Laporan Operasi', component: SurgeryReportList, props: { encounter: data } },
   {
     value: 'supporting-document',
     label: 'Upload Dokumen Pendukung',
diff --git a/app/components/content/surgery-report/detail.vue b/app/components/content/surgery-report/detail.vue
new file mode 100644
index 00000000..00d15f21
--- /dev/null
+++ b/app/components/content/surgery-report/detail.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import { withBase } from '~/models/_base'
+import type { HeaderPrep } from '~/components/pub/my-ui/data/types'
+import type { Patient } from '~/models/patient'
+import type { Person } from '~/models/person'
+import { getDetail } from '~/services/surgery-report.service'
+
+// Components
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import type { SurgeryReport } from '~/models/surgery-report'
+
+// #region Props & Emits
+const props = defineProps<{
+}>()
+
+// #endregion
+
+// #region State & Computed
+
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const surgeryReportId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+const surgeryReport = ref<SurgeryReport | null>(null)
+
+const headerPrep: HeaderPrep = {
+  title: 'Detail Laporan Operasi',
+  icon: 'i-lucide-newspaper',
+}
+
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(controlLetterId, {
+    includes: "unit,specialist,subspecialist,doctor-employee-person",
+  })
+  if (result.success) {
+    controlLetter.value = result.body?.data
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+// #endregion region
+
+// #region Utilities & event handlers
+function handleAction(type: string) {
+  switch (type) {
+    // case 'edit':
+    //   navigateTo({
+    //     name: 'rehab-encounter-id-surgery-report-control_letter_id-edit',
+    //     params: { id: encounterId, "control_letter_id": controlLetterId },
+    //   })
+    //   break
+
+    case 'back':
+      goBack()
+      break
+  }
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <Header :prep="headerPrep" :ref-search-nav="headerPrep.refSearchNav" />
+
+  <AppSurgeryReportDetail :instance="controlLetter" @click="handleAction" />
+</template>
diff --git a/app/components/content/surgery-report/entry.vue b/app/components/content/surgery-report/entry.vue
new file mode 100644
index 00000000..d36fcec1
--- /dev/null
+++ b/app/components/content/surgery-report/entry.vue
@@ -0,0 +1,194 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { Patient, genPatientProps } from '~/models/patient'
+import type { ExposedForm } from '~/types/form'
+import type { PatientBase } from '~/models/patient'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { genPatient } from '~/models/patient'
+import { PatientSchema } from '~/schemas/patient.schema'
+import { PersonAddressRelativeSchema } from '~/schemas/person-address-relative.schema'
+import { PersonAddressSchema } from '~/schemas/person-address.schema'
+import { PersonContactListSchema } from '~/schemas/person-contact.schema'
+import { PersonFamiliesSchema } from '~/schemas/person-family.schema'
+import { ResponsiblePersonSchema } from '~/schemas/person-relative.schema'
+import { uploadAttachment } from '~/services/patient.service'
+import { getDetail, update } from '~/services/surgery-report.service'
+import type { SurgeryReport } from '~/models/surgery-report'
+
+import { toast } from '~/components/pub/ui/toast'
+import { withBase } from '~/models/_base'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { SurgeryReportSchema } from '~/schemas/surgery-report.schema'
+import { formatDateYyyyMmDd } from '~/lib/date'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { getList, remove } from '~/services/surgery-report.service'
+import { handleActionEdit } from '~/handlers/surgery-report.handler'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'surgery-report',
+})
+// #endregion
+
+// #region State & Computed
+const route = useRoute()
+const router = useRouter()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const surgeryReportId = typeof route.params.surgery_report_id == 'string' ? parseInt(route.params.surgery_report_id) : 0
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const surgeryReport = ref({})
+const isConfirmationOpen = ref(false)
+const selectedOperativeAction = ref<any>(null)
+const isOperativeActionDialogOpen = ref(false)
+provide("isOperativeActionDialogOpen", isOperativeActionDialogOpen);
+
+const headerPrep: HeaderPrep = {
+  title: "Pilih Tindakan",
+  icon: 'i-lucide-history',
+}
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    // open filter modal
+  },
+  onInput: (val: string) => {
+    searchInput.value = val
+  },
+  onClear: () => {
+    searchInput.value = ''
+  },
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(surgeryReportId)
+  if (result.success) {
+    const responseData = {...result.body.data, date: formatDateYyyyMmDd(result.body.data.date)}
+    surgeryReport.value = responseData
+    inputForm.value?.setValues(responseData)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const response = await handleActionEdit(
+    surgeryReportId,
+    await composeFormData(),
+    () => { },
+    () => { },
+    toast,
+  )
+  goBack()
+}
+
+async function composeFormData(): Promise<SurgeryReport> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.encounter_id = encounterId
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) {
+      await navigateTo(props.callbackUrl)
+      return
+    }
+
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+
+function actionDialogHandler(type: string) {
+  if (type === 'submit') {
+    // icdPreview.value.procedures = selectedOperativeAction.value || []
+  }
+  isOperativeActionDialogOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Update Laporan Operasi</div>
+  <AppSurgeryReportEntry
+    ref="inputForm"
+    :schema="SurgeryReportSchema"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false" @click="handleActionClick" />
+  </div>
+
+  
+  <Dialog
+    v-model:open="isOperativeActionDialogOpen"
+    title=""
+    size="xl"
+  >
+    <Header
+      :prep="headerPrep"
+      :ref-search-nav="refSearchNav"
+      v-model:search="searchInput"
+      @search="handleSearch" />
+
+    <AppSurgeryReportPicker
+      v-model:model-value="selectedOperativeAction"
+      :data="data"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange"
+    />
+
+    <div class="my-2 flex justify-end py-2">
+      <ActionDialog @click="actionDialogHandler" />
+    </div>
+  </Dialog>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
+
+<style scoped>
+/* component style */
+</style>
diff --git a/app/components/content/surgery-report/list.vue b/app/components/content/surgery-report/list.vue
new file mode 100644
index 00000000..eddd10c7
--- /dev/null
+++ b/app/components/content/surgery-report/list.vue
@@ -0,0 +1,195 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+// #region Imports
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Filter from '~/components/pub/my-ui/nav-header/filter.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { getList, remove } from '~/services/surgery-report.service'
+import { toast } from '~/components/pub/ui/toast'
+import type { Encounter } from '~/models/encounter'
+import WarningAlert from '~/components/pub/my-ui/alert/warning-alert.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+// #endregion
+
+// #region State
+const props = defineProps<{
+  encounter?: Encounter
+}>()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'surgery-report',
+})
+
+const isFilterDialogOpen = ref(false)
+const isRecordConfirmationOpen = ref(false)
+const summaryLoading = ref(false)
+const isRequirementsMet = ref(true)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+const headerPrep: HeaderPrep = {
+  title: "Laporan Operasi",
+  icon: 'i-lucide-history',
+  addNav: {
+    label: "Laporan Operasi",
+    onClick: () => navigateTo({
+        name: 'rehab-encounter-id-surgery-report-add',
+        params: { id: encounterId },
+      }),
+  },
+}
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    isFilterDialogOpen.value = true
+  },
+  onInput: (val: string) => {
+    searchInput.value = val
+  },
+  onClear: () => {
+    searchInput.value = ''
+  },
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getListData()
+})
+// #endregion
+
+// #region Functions
+async function getListData() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching Data:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+// Handle confirmation result
+async function handleConfirmDelete(record: any, action: string) {
+  if (action === 'delete' && record?.id) {
+    try {
+      const result = await remove(record.id)
+      if (result.success) {
+        toast({ title: 'Berhasil', description: 'Data berhasil dihapus', variant: 'default' })
+        await fetchData()
+      } else {
+        toast({ title: 'Gagal', description: `Data gagal dihapus`, variant: 'destructive' })
+      }
+    } catch (error) {
+      toast({ title: 'Gagal', description: `Something went wrong`, variant: 'destructive' })
+    }
+  }
+}
+
+function handleCancelConfirmation() {
+  // Reset record state when cancelled
+  recId.value = 0
+  recAction.value = ''
+  recItem.value = null
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'rehab-encounter-id-surgery-report-control_letter_id',
+        params: { id: encounterId, "control_letter_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      // TODO: Handle edit action
+      // isFormEntryDialogOpen.value = true
+      navigateTo({
+        name: 'rehab-encounter-id-surgery-report-control_letter_id-edit',
+        params: { id: encounterId, "control_letter_id": recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmDelete:
+      // Trigger confirmation modal open
+      isRecordConfirmationOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <WarningAlert v-if="!isRequirementsMet"
+    class="mb-5"
+    text="Syarat pembuatan Laporan Operasi belum terpenuhi"
+    :description="[
+      'Lanjutan Penatalaksanaan Pasien harus pulang/KRS.',
+      'Status Resume Medis harus tervalidasi.'
+    ]" />
+
+  <div v-else>
+    <Header v-model:search="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="refSearchNav"
+      @search="handleSearch" />
+
+    <Filter
+      :prep="headerPrep"
+      :ref-search-nav="refSearchNav"
+      :enable-export="false"
+    />
+
+    <AppSurgeryReportList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+
+    <Dialog v-model:open="isFilterDialogOpen" title="Filter" size="lg">
+      <!-- <AppEncounterFilter
+        :installation="{
+          msg: { placeholder: 'Pilih' },
+          items: [],
+        }"
+        :schema="{}"
+      /> -->
+      aaaaaaa   
+    </Dialog>
+
+    <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
+      @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
+      <template #default="{ record }">
+        <div class="text-sm">
+          <p>
+            <strong>ID:</strong>
+            {{ record?.id }}
+          </p>
+          <p v-if="record?.firstName">
+            <strong>Nama:</strong>
+            {{ record.firstName }}
+          </p>
+          <p v-if="record?.code">
+            <strong>Kode:</strong>
+            {{ record.cellphone }}
+          </p>
+        </div>
+      </template>
+    </RecordConfirmation>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/nav-header/filter.vue b/app/components/pub/my-ui/nav-header/filter.vue
index 74f6d8dc..f4fef2b3 100644
--- a/app/components/pub/my-ui/nav-header/filter.vue
+++ b/app/components/pub/my-ui/nav-header/filter.vue
@@ -101,7 +101,7 @@ function onFilterClick() {
       </Button>
 
       <DropdownMenu v-show="props.enableExport">
-        <DropdownMenuTrigger as-child>
+        <DropdownMenuTrigger v-show="props.enableExport" as-child>
           <Button variant="outline" class="ml-auto border-orange-500 text-orange-600 hover:bg-orange-50">
             <Icon name="i-lucide-download" class="h-4 w-4" />
             Ekspor
diff --git a/app/handlers/surgery-report.handler.ts b/app/handlers/surgery-report.handler.ts
new file mode 100644
index 00000000..e24ab442
--- /dev/null
+++ b/app/handlers/surgery-report.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/surgery-report.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index 48fb5c8c..c676a799 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -425,3 +425,65 @@ export const supportingDocOpt = [
   { label: 'Data Penunjang', value: 'encounter-support' },
   { label: 'Lain - Lain', value: 'encounter-other' },
 ]
+
+
+export type SurgeryType = "kecil" | "sedang" | "besar" | "khusus"
+export const SurgeryTypeOptList: { label: string; value: SurgeryType }[] = [
+  { label: 'Kecil', value: 'kecil' },
+  { label: 'Sedang', value: 'sedang' },
+  { label: 'Besar', value: 'besar' },
+  { label: 'Khusus', value: 'khusus' },
+]
+
+export type BillingCodeType = "general" | "regional" | "local"
+export const BillingCodeTypeOptList: { label: string; value: BillingCodeType }[] = [
+  { label: 'General', value: 'general' },
+  { label: 'Regional', value: 'regional' },
+  { label: 'Local', value: 'local' },
+]
+
+export type SurgerySystemType = "cito" | "urgent" | "efektif" | "khusus"
+export const SurgerySystemTypeOptList: { label: string; value: SurgerySystemType }[] = [
+  { label: 'Cito', value: 'cito' },
+  { label: 'Urgent', value: 'urgent' },
+  { label: 'Efektif', value: 'efektif' },
+  { label: 'Khusus', value: 'khusus' },
+]
+
+export type DissectionType = "bersih" | "bersih terkontaminasi" | "terkontaminasi kotor" | "kotor"
+export const DissectionTypeOptList: { label: string; value: DissectionType }[] = [
+  { label: 'Bersih', value: 'bersih' },
+  { label: 'Bersih terkontaminasi', value: 'bersih terkontaminasi' },
+  { label: 'Terkontaminasi kotor', value: 'terkontaminasi kotor' },
+  { label: 'Kotor', value: 'kotor' },
+]
+
+export type SurgeryOrderType = "satu" | "ulangan"
+export const SurgeryOrderTypeOptList: { label: string; value: SurgeryOrderType }[] = [
+  { label: 'Satu', value: 'satu' },
+  { label: 'Ulangan', value: 'ulangan' },
+]
+
+export type BirthDescriptionType = "lahir hidup" | "lahir mati"
+export const BirthDescriptionTypeOptList: { label: string; value: BirthDescriptionType }[] = [
+  { label: 'Lahir Hidup', value: 'lahir hidup' },
+  { label: 'Lahir Mati', value: 'lahir mati' },
+]
+
+export type BirthPlaceDescriptionType = "rssa" | "bidan luar" | "dokter luar" | "dukun bayi" | "puskesmas" | "paramedis luar"
+export const BirthPlaceDescriptionTypeOptList: { label: string; value: BirthPlaceDescriptionType }[] = [
+  { label: 'RSSA', value: 'rssa' },
+  { label: 'Bidan luar', value: 'bidan luar' },
+  { label: 'Dokter luar', value: 'dokter luar' },
+  { label: 'Dukun bayi', value: 'dukun bayi' },
+  { label: 'Puskesmas', value: 'puskesmas' },
+  { label: 'Paramedis luar', value: 'paramedis luar' },
+]
+
+export type SpecimenType = "pa" | "mikrobiologi" | "laborat" | "tidak perlu"
+export const SpecimenTypeOptList: { label: string; value: SpecimenType }[] = [
+  { label: 'PA', value: 'pa' },
+  { label: 'Mikrobiologi', value: 'mikrobiologi' },
+  { label: 'Laborat', value: 'laborat' },
+  { label: 'Tidak perlu', value: 'tidak perlu' },
+]
\ No newline at end of file
diff --git a/app/models/surgery-report.ts b/app/models/surgery-report.ts
new file mode 100644
index 00000000..8eb0edef
--- /dev/null
+++ b/app/models/surgery-report.ts
@@ -0,0 +1,37 @@
+import { type Base, genBase } from "./_base"
+import { genDoctor, type Doctor } from "./doctor"
+import { genEncounter, type Encounter } from "./encounter"
+import { genSpecialist, type Specialist } from "./specialist"
+import { genSubspecialist, type Subspecialist } from "./subspecialist"
+import { genUnit, type Unit } from "./unit"
+
+export interface SurgeryReport extends Base {
+  encounter_id: number
+  encounter: Encounter
+  unit_id: number
+  unit: Unit
+  specialist_id: number
+  specialist: Specialist
+  subspecialist_id: number
+  subspecialist: Subspecialist
+  doctor_id: number
+  doctor: Doctor
+  date: ''
+}
+
+export function genSurgeryReport(): SurgeryReport {
+  return {
+    ...genBase(),
+    encounter_id: 0,
+    encounter: genEncounter(),
+    unit_id: 0,
+    unit: genUnit(),
+    specialist_id: 0,
+    specialist: genSpecialist(),
+    subspecialist_id: 0,
+    subspecialist: genSubspecialist(),
+    doctor_id: 0,
+    doctor: genDoctor(),
+    date: ''
+  }
+}
diff --git a/app/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
new file mode 100644
index 00000000..a90f1d10
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/edit.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Update 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
new file mode 100644
index 00000000..7d9db6bd
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/surgery-report/[surgery_report_id]/index.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail Surat Kontrol',
+  contentFrame: 'cf-container-md',
+})
+
+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
new file mode 100644
index 00000000..58faedef
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/surgery-report/add.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah 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/schemas/surgery-report.schema.ts b/app/schemas/surgery-report.schema.ts
new file mode 100644
index 00000000..5c1a024b
--- /dev/null
+++ b/app/schemas/surgery-report.schema.ts
@@ -0,0 +1,47 @@
+import { z } from 'zod'
+
+const SurgeryReportSchema = z.object({
+  sepStatus: z.string({
+    required_error: 'Mohon isi status SEP',
+  }).default('SEP Internal'),
+  unit_code: z.string({
+    required_error: 'Mohon isi Unit',
+  }),
+  specialist_code: z.string({
+    required_error: 'Mohon isi Spesialis',
+  }),
+  subspecialist_code: z.string({
+    required_error: 'Mohon isi Sub Spesialis',
+  }),
+  doctor_code: z.string({
+    required_error: 'Mohon isi DPJP',
+  }),
+  encounter_code: z.string().optional(),
+  date: z.string({
+    required_error: 'Mohon lengkapi Tanggal Kontrol',
+  })
+    .refine(
+      (date) => {
+        // Jika kosong, return false untuk required validation
+        if (!date || date.trim() === '') return false
+
+        // Jika ada isi, validasi format tanggal
+        try {
+          const dateObj = new Date(date)
+          // Cek apakah tanggal valid dan tahun >= 1900
+          return !isNaN(dateObj.getTime()) && dateObj.getFullYear() >= 1900
+        } catch {
+          return false
+        }
+      },
+      {
+        message: 'Mohon lengkapi Tanggal Kontrol dengan format yang valid',
+      },
+    )
+    .transform((dateStr) => new Date(dateStr).toISOString()),
+})
+
+type SurgeryReportFormData = z.infer<typeof SurgeryReportSchema>
+
+export { SurgeryReportSchema }
+export type { SurgeryReportFormData }
diff --git a/app/services/surgery-report.service.ts b/app/services/surgery-report.service.ts
new file mode 100644
index 00000000..e53874de
--- /dev/null
+++ b/app/services/surgery-report.service.ts
@@ -0,0 +1,28 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+import { encounterClassCodes } from '~/lib/constants'
+
+const path = '/api/v1/surgery-report'
+const name = 'surgery-report'
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
\ No newline at end of file

From 1dd8e8e7b3bdd8bf9f5734e5f0c561f64f804cfa Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Tue, 25 Nov 2025 09:23:57 +0700
Subject: [PATCH 05/13] Squashed commit of the following:

commit 72ce2260c50597f782f07d29db3985607ecc2f34
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 17 15:19:36 2025 +0700

    Feat: add doc preview in Therpay protocol List

commit 7032cd2409a660d40899ffd421137e4158cfde4a
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Wed Nov 12 15:34:30 2025 +0700

    Fix: prepare API integration protokol terapi verification

commit dbf6f78d00afc818baf2b34d128ee2153814cc88
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Wed Nov 12 14:09:28 2025 +0700

    Feat: add basic CRUD therapy protocol

commit 46a44e90fe4d4097b5460d2d4e5689b2a5389467
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 11 15:57:54 2025 +0700

    Fix: Prepare protokol terapi API Integration

commit 4674090566727cebd947e50e2c06c44e8c7afa7e
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 10 15:33:22 2025 +0700

    Fix: hotfix style add protokol terapi

commit 919c91abd8ef8b4cd193012eed7f5e8cf635cda2
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 10 15:17:14 2025 +0700

    Fix: Typo drpodown-action-p in protokol-terapi

commit e21d30eacf1a08118e289d4bb64889e708d5023a
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 10 15:14:33 2025 +0700

    Fix: add diagnose & procedure dialog picker in add protokol terapi

commit 9a3d73b72b0dceea778d83e7630c5ead110a6a4c
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 4 10:21:24 2025 +0700

    Fix: Add Schema therapy protocol rehab medik

commit 4d8d2d633bbbd78038b1cc607558c1ceb31c5986
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 4 09:30:55 2025 +0700

    Fix: refactor Actions Btn ba-dr-su

commit 5f290a6e4bd1559c0e5864a508c5ab650cfae6e8
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Mon Nov 3 17:08:20 2025 +0700

    Feat: UI protokol terapi in Rehab medik

commit 63010f69ff30532bb8ac91443112f31d4942b221
Author: Khafid Prayoga <khafidp@pm.me>
Date:   Tue Oct 21 09:54:13 2025 +0700

    wip: list protokol terapi

commit 44eedc298680a5255fee0ee8feee3e24beda93dd
Author: Khafid Prayoga <khafidp@pm.me>
Date:   Mon Oct 20 12:54:01 2025 +0700

    feat(therapy-protocol): init form entry

    feat(therapy-protocol): init page routes

    wip: init entry form

    wip: form entry protokol terapi

    todo: table procedure, and diagnose  picker

    wip: schema form new entry

    todo: picker/modal yang relateds ke form entry
---
 app/components/app/diagnose-src/list.vue      |   9 +-
 app/components/app/procedure-src/list.vue     |   9 +-
 .../_common/banner-patient-in-therapy.vue     |  19 ++
 .../_common/btn-confirmation-detail.vue       |  28 ++
 .../_common/radio-illness-bcs-work.vue        |  92 ++++++
 .../_common/radio-relationship.vue            |  92 ++++++
 .../_common/select-arrangement.vue            |  72 +++++
 .../_common/select-date-range.vue             |  52 ++++
 .../therapy-protocol/_common/select-date.vue  | 121 ++++++++
 .../_common/select-death-cause.vue            |  71 +++++
 .../_common/select-faskes.vue                 |  70 +++++
 .../_common/select-primary-diagnosis.vue      |  70 +++++
 .../_common/select-secondary-diagnosis.vue    |  71 +++++
 .../therapy-protocol/_common/text-captcha.vue | 175 ++++++++++++
 .../therapy-protocol/_common/verify-badge.vue |  30 ++
 .../app/therapy-protocol/add-list.cfg.ts      |  51 ++++
 .../app/therapy-protocol/detail-list.cfg.ts   |  28 ++
 .../app/therapy-protocol/detail.vue           | 145 ++++++++++
 app/components/app/therapy-protocol/edit.vue  | 217 +++++++++++++++
 .../app/therapy-protocol/entry-form.vue       | 137 +++++++++
 app/components/app/therapy-protocol/entry.vue | 204 ++++++++++++++
 .../therapy-protocol/field/base-textarea.vue  |  40 +++
 .../app/therapy-protocol/field/index.ts       |   4 +
 .../field/radio-relations.vue                 |  77 +++++
 .../field/radio-work-disease.vue              |  77 +++++
 .../field/select-examination-date.vue         |  52 ++++
 .../app/therapy-protocol/history-dialog.vue   |  43 +++
 .../app/therapy-protocol/history-list.cfg.ts  |  45 +++
 .../app/therapy-protocol/list.cfg.ts          |  53 ++++
 app/components/app/therapy-protocol/list.vue  |  31 +++
 .../dropdown-action-p.vue                     |  64 +++++
 .../procedure-list-cfg.ts                     |  33 +++
 .../arrangement-procedure/procedure-list.vue  | 120 ++++++++
 .../procedure-picker.vue                      |  62 +++++
 .../diagnosis-list-cfg.ts                     |  33 +++
 .../functional-diagnosis/diagnosis-list.vue   | 108 ++++++++
 .../functional-diagnosis/diagnosis-picker.vue |  62 +++++
 .../dropdown-action-p.vue                     |  64 +++++
 .../medical-diagnosis/diagnosis-list-cfg.ts   |  33 +++
 .../medical-diagnosis/diagnosis-list.vue      | 107 +++++++
 .../medical-diagnosis/diagnosis-picker.vue    |  63 +++++
 .../medical-diagnosis/dropdown-action-p.vue   |  64 +++++
 .../app/therapy-protocol/verify-dialog.vue    | 108 ++++++++
 app/components/content/encounter/process.vue  |   3 +-
 .../content/therapy-protocol/add.vue          | 152 ++++++++++
 .../content/therapy-protocol/detail.vue       | 115 ++++++++
 .../content/therapy-protocol/edit.vue         | 123 ++++++++
 .../content/therapy-protocol/history-list.vue | 178 ++++++++++++
 .../content/therapy-protocol/list.vue         | 262 ++++++++++++++++++
 .../pub/my-ui/data/dropdown-action-dp.vue     |  77 +++++
 .../pub/my-ui/data/dropdown-action-duvp.vue   | 106 +++++++
 .../pub/my-ui/data/dropdown-action-p.vue      |  64 +++++
 app/components/pub/my-ui/data/types.ts        |   1 +
 app/components/pub/my-ui/modal/dialog.vue     |   4 +-
 app/handlers/therapy-protocol.handler.ts      |  24 ++
 .../[therapy_protocol_id]/edit.vue            |  44 +++
 .../encounter/[id]/therapy-protocol/add.vue   |  44 +++
 .../therapy-protocol/[id]/detail.vue          |  41 +++
 .../(features)/therapy-protocol/[id]/edit.vue |  41 +++
 app/pages/(features)/therapy-protocol/add.vue |  41 +++
 app/schemas/therapy-protocol.schema.ts        | 159 +++++++++++
 app/services/therapy-protocol.service.ts      |  27 ++
 62 files changed, 4604 insertions(+), 8 deletions(-)
 create mode 100644 app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
 create mode 100644 app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
 create mode 100644 app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
 create mode 100644 app/components/app/therapy-protocol/_common/radio-relationship.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-arrangement.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-date-range.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-date.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-death-cause.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-faskes.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
 create mode 100644 app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
 create mode 100644 app/components/app/therapy-protocol/_common/text-captcha.vue
 create mode 100644 app/components/app/therapy-protocol/_common/verify-badge.vue
 create mode 100644 app/components/app/therapy-protocol/add-list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/detail-list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/detail.vue
 create mode 100644 app/components/app/therapy-protocol/edit.vue
 create mode 100644 app/components/app/therapy-protocol/entry-form.vue
 create mode 100644 app/components/app/therapy-protocol/entry.vue
 create mode 100644 app/components/app/therapy-protocol/field/base-textarea.vue
 create mode 100644 app/components/app/therapy-protocol/field/index.ts
 create mode 100644 app/components/app/therapy-protocol/field/radio-relations.vue
 create mode 100644 app/components/app/therapy-protocol/field/radio-work-disease.vue
 create mode 100644 app/components/app/therapy-protocol/field/select-examination-date.vue
 create mode 100644 app/components/app/therapy-protocol/history-dialog.vue
 create mode 100644 app/components/app/therapy-protocol/history-list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/list.cfg.ts
 create mode 100644 app/components/app/therapy-protocol/list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
 create mode 100644 app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
 create mode 100644 app/components/app/therapy-protocol/verify-dialog.vue
 create mode 100644 app/components/content/therapy-protocol/add.vue
 create mode 100644 app/components/content/therapy-protocol/detail.vue
 create mode 100644 app/components/content/therapy-protocol/edit.vue
 create mode 100644 app/components/content/therapy-protocol/history-list.vue
 create mode 100644 app/components/content/therapy-protocol/list.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-dp.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-duvp.vue
 create mode 100644 app/components/pub/my-ui/data/dropdown-action-p.vue
 create mode 100644 app/handlers/therapy-protocol.handler.ts
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
 create mode 100644 app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
 create mode 100644 app/pages/(features)/therapy-protocol/[id]/detail.vue
 create mode 100644 app/pages/(features)/therapy-protocol/[id]/edit.vue
 create mode 100644 app/pages/(features)/therapy-protocol/add.vue
 create mode 100644 app/schemas/therapy-protocol.schema.ts
 create mode 100644 app/services/therapy-protocol.service.ts

diff --git a/app/components/app/diagnose-src/list.vue b/app/components/app/diagnose-src/list.vue
index 1be60a60..9b603f6b 100644
--- a/app/components/app/diagnose-src/list.vue
+++ b/app/components/app/diagnose-src/list.vue
@@ -4,6 +4,7 @@ import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vu
 
 // Types
 import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import type { Config, } from '~/components/pub/my-ui/data-table'
 
 // Configs
 import { config } from './list-cfg'
@@ -11,9 +12,11 @@ import { config } from './list-cfg'
 interface Props {
   data: any[]
   paginationMeta: PaginationMeta
+  tableConfig?: Config
 }
-
-defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  tableConfig: () => config,
+})
 
 const emit = defineEmits<{
   pageChange: [page: number]
@@ -27,7 +30,7 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubMyUiDataTable
-      v-bind="config"
+      v-bind="props.tableConfig"
       :rows="data"
       :skeleton-size="paginationMeta?.pageSize"
     />
diff --git a/app/components/app/procedure-src/list.vue b/app/components/app/procedure-src/list.vue
index 1be60a60..d976b660 100644
--- a/app/components/app/procedure-src/list.vue
+++ b/app/components/app/procedure-src/list.vue
@@ -7,13 +7,16 @@ import type { PaginationMeta } from '~/components/pub/my-ui/pagination/paginatio
 
 // Configs
 import { config } from './list-cfg'
+import type { Config } from '~/components/pub/my-ui/data-table'
 
 interface Props {
   data: any[]
   paginationMeta: PaginationMeta
+  tableConfig?: Config
 }
-
-defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  tableConfig: () => config,
+})
 
 const emit = defineEmits<{
   pageChange: [page: number]
@@ -27,7 +30,7 @@ function handlePageChange(page: number) {
 <template>
   <div class="space-y-4">
     <PubMyUiDataTable
-      v-bind="config"
+      v-bind="props.tableConfig"
       :rows="data"
       :skeleton-size="paginationMeta?.pageSize"
     />
diff --git a/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue b/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
new file mode 100644
index 00000000..46ea79d9
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/banner-patient-in-therapy.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { cn } from '~/lib/utils';
+
+const props = withDefaults(defineProps<{
+  therapyEndDate?: string
+  class?: string
+}>(), {
+  therapyEndDate: new Date().toISOString(),
+})
+</script>
+
+<template>
+    <div :class="cn('flex items-center gap-2 p-3 rounded-md text-orange-500 border border-orange-400 bg-orange-50',
+        props.class
+    )">
+        <Icon name="i-lucide-triangle-alert" class="h-4 w-4 align-middle transition-colors" />
+        <p class="font-medium">Pasien ini sedang menjalankan program terapi sampai {{ new Date(props.therapyEndDate).toDateString() }}</p>
+    </div>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue b/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
new file mode 100644
index 00000000..e09432d5
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/btn-confirmation-detail.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+import Button from '~/components/pub/ui/button/Button.vue';
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const recDate = inject<Ref<any>>('rec_date')!
+
+function confirm() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  recDate.value = new Date().getTime()
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="confirm">
+        <Icon name="i-lucide-circle-check" class="h-4 w-4 align-middle transition-colors" />
+        Konfirmasi
+    </Button>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue b/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
new file mode 100644
index 00000000..86953443
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/radio-illness-bcs-work.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'Ya', value: 'YA' },
+  { label: 'Tidak', value: 'TIDAK' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/radio-relationship.vue b/app/components/app/therapy-protocol/_common/radio-relationship.vue
new file mode 100644
index 00000000..07aad8b8
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/radio-relationship.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'Suami/Istri', value: 'partner' },
+  { label: 'Anak', value: 'child' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-arrangement.vue b/app/components/app/therapy-protocol/_common/select-arrangement.vue
new file mode 100644
index 00000000..9a945d44
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-arrangement.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+const arrangementTypeOpts = [
+  { label: 'KRS', value: "krs" },
+  { label: 'MRS', value: "mrs" },
+  { label: 'Pindah IGD', value: "pindahIgd" },
+  { label: 'Rujuk', value: "rujuk" },
+  { label: 'Rujuk Balik', value: "rujukBalik" },
+  { label: 'Meninggal', value: "meninggal" },
+  { label: 'Lain Lain', value: "other" },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="label"
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+        <FormField :name="fieldName" v-slot="{ componentField, value }">
+          <FormItem>
+            <FormControl>
+              <Select 
+                v-bind="componentField" 
+                :model-value="value"
+                :items="arrangementTypeOpts"
+                :defaultValue='arrangementTypeOpts[0]?.value' 
+              />
+            </FormControl>            
+            <FormMessage />
+          </FormItem>
+        </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-date-range.vue b/app/components/app/therapy-protocol/_common/select-date-range.vue
new file mode 100644
index 00000000..c9048fcf
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-date-range.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import { CalendarDate, DateFormatter, getLocalTimeZone, type DateValue } from '@internationalized/date'
+
+const props = defineProps<{
+  dateValueStart?: DateValue | undefined
+  dateValueEnd?: DateValue | undefined
+}>()
+
+const {
+  dateValueStart = new CalendarDate(2022, 1, 20),
+  dateValueEnd = new CalendarDate(2022, 1, 20).add({ days: 20 }),
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+</script>
+
+<template>
+  <Popover>
+        <PopoverTrigger as-child>
+          <Button variant="outline" :class="cn('w-[280px] justify-start text-left font-normal',
+            (!dateValueStart && !dateValueEnd) && 'text-muted-foreground')">
+            <CalendarIcon class="mr-2 h-4 w-4" />
+            <template v-if="dateValueStart">
+              <template v-if="dateValueEnd">
+                {{ df.format(dateValueStart.toDate(getLocalTimeZone())) }} -
+                {{ df.format(dateValueEnd.toDate(getLocalTimeZone())) }}
+              </template>
+  
+              <template v-else>
+                {{ df.format(dateValueStart.toDate(getLocalTimeZone())) }}
+              </template>
+            </template>
+            <template v-else> Pick a date </template>
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent class="w-auto p-0">
+          <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+            @update:start-value="(startDate) => (dateValueStart = startDate)" />
+        </PopoverContent>
+      </Popover>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-date.vue b/app/components/app/therapy-protocol/_common/select-date.vue
new file mode 100644
index 00000000..74245e7e
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-date.vue
@@ -0,0 +1,121 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { differenceInDays, differenceInMonths, differenceInYears, parseISO } from 'date-fns'
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+  isDisabled?: boolean
+  isWithTime?: boolean
+}>()
+
+const {
+  fieldName = 'birthDate',
+  label = 'Tanggal Lahir',
+  placeholder = 'Pilih tanggal lahir',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+  isWithTime = false,
+} = props
+
+// Reactive variables for age calculation
+const patientAge = ref<string>('Masukkan tanggal lahir')
+
+// Function to calculate age with years, months, and days
+function calculateAge(birthDate: string | Date | undefined): string {
+  if (!birthDate) {
+    return 'Masukkan tanggal lahir'
+  }
+
+  try {
+    let dateObj: Date
+
+    if (typeof birthDate === 'string') {
+      dateObj = parseISO(birthDate)
+    } else {
+      dateObj = birthDate
+    }
+
+    const today = new Date()
+
+    // Calculate years, months, and days
+    const totalYears = differenceInYears(today, dateObj)
+
+    // Calculate remaining months after years
+    const yearsPassed = new Date(dateObj)
+    yearsPassed.setFullYear(yearsPassed.getFullYear() + totalYears)
+    const remainingMonths = differenceInMonths(today, yearsPassed)
+
+    // Calculate remaining days after years and months
+    const monthsPassed = new Date(yearsPassed)
+    monthsPassed.setMonth(monthsPassed.getMonth() + remainingMonths)
+    const remainingDays = differenceInDays(today, monthsPassed)
+
+    // Format the result
+    const parts = []
+    if (totalYears > 0) parts.push(`${totalYears} Tahun`)
+    if (remainingMonths > 0) parts.push(`${remainingMonths} Bulan`)
+    if (remainingDays > 0) parts.push(`${remainingDays} Hari`)
+
+    return parts.length > 0 ? parts.join(' ') : '0 Hari'
+  } catch {
+    return 'Masukkan tanggal lahir'
+  }
+}
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired && !isDisabled"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              :type="isWithTime ? 'datetime-local' : 'date'"
+              min="1900-01-01"
+              :max="new Date().toISOString().split('T')[0]"
+              v-bind="componentField"
+              :placeholder="placeholder"
+              :disabled="isDisabled"
+              @update:model-value="
+                (value: string | number) => {
+                  const dateStr = typeof value === 'number' ? String(value) : value
+                  patientAge = calculateAge(dateStr)
+                }
+              "
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-death-cause.vue b/app/components/app/therapy-protocol/_common/select-death-cause.vue
new file mode 100644
index 00000000..a155b139
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-death-cause.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="label"
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-faskes.vue b/app/components/app/therapy-protocol/_common/select-faskes.vue
new file mode 100644
index 00000000..0852195b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-faskes.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue b/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
new file mode 100644
index 00000000..0852195b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-primary-diagnosis.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label = 'Pekerjaan',
+  placeholder = 'Pilih pekerjaan',
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue b/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
new file mode 100644
index 00000000..a155b139
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/select-secondary-diagnosis.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import { cn, mapToComboboxOptList } from '~/lib/utils'
+import { occupationCodes } from '~/lib/constants'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  placeholder?: string
+  errors?: FormErrors
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'job',
+  label,
+  placeholder,
+  errors,
+  class: containerClass,
+  fieldGroupClass,
+  labelClass,
+} = props
+
+// Generate job options from constants, sama seperti pola genderCodes
+const jobOptions = mapToComboboxOptList(occupationCodes)
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      v-show="label"
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Combobox
+              class="focus:ring-0 focus:ring-offset-0"
+              :id="fieldName"
+              v-bind="componentField"
+              :items="jobOptions"
+              :placeholder="placeholder"
+              search-placeholder="Cari..."
+              empty-message="Data tidak ditemukan"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/_common/text-captcha.vue b/app/components/app/therapy-protocol/_common/text-captcha.vue
new file mode 100644
index 00000000..de9d7f4b
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/text-captcha.vue
@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { ref, computed, watch, defineEmits, defineProps, onMounted, nextTick, defineExpose } from 'vue'
+import Input from '~/components/pub/ui/input/Input.vue';
+import Button from '~/components/pub/ui/button/Button.vue';
+import waveyFingerprint from '~/assets/svg/wavey-fingerprint.svg'
+
+/**
+ * TextCaptcha props:
+ * - length: number of characters in the core captcha
+ * - caseSensitive: whether validation is case sensitive
+ * - useSpacing: show spaced-out characters (visual obfuscation only)
+ * - noiseChars: include random noise characters visually (not required to type)
+ */
+const props = defineProps({
+  length: { type: Number, default: 6 },
+  caseSensitive: { type: Boolean, default: false },
+  useSpacing: { type: Boolean, default: true },
+  noiseChars: { type: Boolean, default: false }, // adds random noise characters to display
+  refreshCooldownMs: { type: Number, default: 500 }, // guard repeated refresh
+})
+
+const emit = defineEmits<{
+  (e: 'update:valid', valid: boolean): void
+  (e: 'validated', valid: boolean): void
+  (e: 'change', value: string): void
+}>()
+
+// Internal state
+const raw = ref('')            // the canonical captcha value (what user must match, ignoring visual noise)
+const display = ref('')        // randomized visual representation (may include spacing/noise)
+const input = ref('')          // user typed value
+const lastRefresh = ref(0)
+const valid = inject('isCaptchaValid') as Ref<boolean>
+const errorMessage = ref('')
+
+/** Characters excluding ambiguous ones: 0/O, 1/l/I etc. */
+const CHARS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+
+function randomChar() {
+  return CHARS.charAt(Math.floor(Math.random() * CHARS.length))
+}
+
+/** Generate the canonical captcha string */
+function genRaw(len = props.length) {
+  let s = ''
+  for (let i = 0; i < len; i++) s += randomChar()
+  return s
+}
+
+/** Create a visually obfuscated display string (spacing, noise, random case) */
+function genDisplay(base: string) {
+  const arr: string[] = []
+  for (const ch of base) {
+    // toggle case randomly (only for letters)
+    const c = /[A-Za-z]/.test(ch) && Math.random() > 0.5 ? (Math.random() > 0.5 ? ch.toLowerCase() : ch.toUpperCase()) : ch
+    arr.push(c)
+    if (props.useSpacing && Math.random() > 0.3) arr.push(' ') // random space
+  }
+  return arr.join('')
+}
+
+/** Refresh captcha */
+function refresh() {
+  const now = Date.now()
+  if (now - lastRefresh.value < props.refreshCooldownMs) return
+  lastRefresh.value = now
+
+  raw.value = genRaw(props.length)
+  display.value = genDisplay(raw.value)
+  input.value = ''
+  valid.value = false
+  errorMessage.value = ''
+  // emit change so parent knows new value (but we don't send the raw canonical in production)
+  emit('change', display.value)
+}
+
+/** Normalize input and canonical for comparison */
+function normalizeForCompare(s: string) {
+  const normalized = s.replace(/\s+/g, '') // strip spaces
+  return props.caseSensitive ? normalized : normalized.toLowerCase()
+}
+
+/** Validate the current input */
+function validate() {
+  const left = normalizeForCompare(input.value)
+  const right = normalizeForCompare(raw.value)
+  if (!input.value) {
+    valid.value = false
+    errorMessage.value = 'Please enter the captcha text.'
+  } else if (left === right) {
+    valid.value = true
+    errorMessage.value = ''
+  } else {
+    valid.value = false
+    errorMessage.value = 'Captcha does not match.'
+  }
+  emit('update:valid', valid.value)
+  emit('validated', valid.value)
+  return valid.value
+}
+
+// expose a refresh method to parent via ref
+defineExpose({ refresh, validate, isValid: computed(() => valid.value) })
+
+// generate on mount
+onMounted(() => refresh())
+
+// // re-validate whenever input changes (lightweight)
+// watch(input, () => {
+//   // we don't auto-pass until the user explicitly validate (but we can optionally live-validate)
+//   // Here we perform live feedback but still emit validated only when called
+//   const left = normalizeForCompare(input.value)
+//   const right = normalizeForCompare(raw.value)
+//   valid.value = !!input.value && left === right
+//   // emit a live update so the parent can disable submit accordingly
+//   emit('update:valid', valid.value)
+// })
+</script>
+
+<template>
+  <div class="space-y-2 w-full max-w-sm">
+    <div class="flex items-center justify-between gap-3">
+      <!-- Captcha visual box -->
+      <div
+        role="img"
+        aria-label="Text captcha, type the characters shown"
+        tabindex="0"
+        class="select-none p-3 rounded-md border border-gray-200 text-white text-xl font-mono tracking-wider text-center w-full"
+      >
+        <span class="inline-block" v-html="display"></span>
+      </div>
+
+      <!-- Refresh -->
+      <div class="flex-shrink-0">
+        <Button variant="ghost" type="button" @click="refresh" title="Refresh captcha">
+          <Icon name="i-lucide-refresh-cw" />
+        </Button>
+      </div>
+    </div>
+
+    <!-- Input -->
+    <div class="flex gap-3 items-start">
+        <div class="flex-grow">
+            <Input
+                v-model="input"
+                :aria-invalid="valid ? 'false' : 'true'"
+                inputmode="text"
+                placeholder="Type the captcha text"
+                @keyup.enter="validate"
+            />
+            <p v-if="errorMessage" class="text-xs text-red-500 mt-1">{{ errorMessage }}</p>
+            <p v-else-if="valid" class="text-xs text-green-500 mt-1">Correct</p>
+            <p v-else class="text-xs text-gray-500 mt-1">Not case-sensitive</p>
+        </div>
+        <Button variant="outline" type="button" @click="validate" title="Validate"
+            class="border-orange-400">
+            <Icon name="i-lucide-check" class="text-orange-400" />
+        </Button>
+    </div>
+
+  </div>
+</template>
+
+<style scoped>
+/* small nicety: make noise/spaced display look irregular */
+div[role="img"] {
+  background: url('~/assets/svg/wavey-fingerprint.svg') repeat center;
+}
+
+div[role="img"] span {
+  letter-spacing: 0.12em;
+  font-weight: 600;
+  user-select: none;
+}
+</style>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/_common/verify-badge.vue b/app/components/app/therapy-protocol/_common/verify-badge.vue
new file mode 100644
index 00000000..30cd4c54
--- /dev/null
+++ b/app/components/app/therapy-protocol/_common/verify-badge.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { Badge } from '~/components/pub/ui/badge'
+
+const activeStatusCodes: Record<string, string> = {
+  verified: 'Verifikasi',
+  unverified: 'Belum Verifikasi',
+}
+
+const props = defineProps<{
+  rec: any
+  idx?: number
+}>()
+
+const statusText = computed(() => {
+  const code: keyof typeof activeStatusCodes = props.rec.status_code === 1 ? `verified` : `unverified`
+  return activeStatusCodes[code]
+})
+
+const badgeVariant = computed(() => {
+  return props.rec.status_code === 1 ? 'default' : 'outline'
+})
+</script>
+
+<template>
+  <div class="flex justify-center">
+    <Badge :variant="badgeVariant" class="rounded-2xl text-[0.6rem]" >
+      {{ statusText }}
+    </Badge>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/add-list.cfg.ts b/app/components/app/therapy-protocol/add-list.cfg.ts
new file mode 100644
index 00000000..856ae82b
--- /dev/null
+++ b/app/components/app/therapy-protocol/add-list.cfg.ts
@@ -0,0 +1,51 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+
+export const medicalDiagnosisConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Diagnosa' },
+      { label: 'ICD-X' },
+    ],
+  ],
+
+  keys: ['number', 'diagnosis', 'icd_x'],
+
+  parses: {  },
+}
+
+export const functionalDiagnosisConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Diagnosa' },
+      { label: 'ICD-X' },
+    ],
+  ],
+
+  keys: ['number', 'diagnosis', 'icd_x'],
+
+  parses: {  },
+}
+
+
+
+export const proceduralConfig: Config = {
+  cols: [{width: 10}, {}, {},],
+
+  headers: [
+    [
+      { label: 'No' },
+      { label: 'Prosedur' },
+      { label: 'ICD-IX' },
+    ],
+  ],
+
+  keys: ['number', 'procedure', 'icd_x'],
+
+  parses: {  },
+}
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/detail-list.cfg.ts b/app/components/app/therapy-protocol/detail-list.cfg.ts
new file mode 100644
index 00000000..e50113d7
--- /dev/null
+++ b/app/components/app/therapy-protocol/detail-list.cfg.ts
@@ -0,0 +1,28 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+const action = defineAsyncComponent(() => import('./_common/btn-confirmation-detail.vue'))
+
+export const detailTherapyProtocolListConfig: Config = {
+  cols: [{}, {}, {}, {width: 100},],
+
+  headers: [
+    [
+      { label: 'Program Kegiatan' },
+      { label: 'Paraf Terapis' },
+      { label: 'Paraf Dokter' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['program', 'therapistSign', 'doctorSign', 'action'],
+
+  parses: {  },
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+}
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/detail.vue b/app/components/app/therapy-protocol/detail.vue
new file mode 100644
index 00000000..e57ff3b1
--- /dev/null
+++ b/app/components/app/therapy-protocol/detail.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import SelectSecondaryDiagnosis from './_common/select-secondary-diagnosis.vue'
+import SelectPrimaryDiagnosis from './_common/select-primary-diagnosis.vue'
+import SelectArrangement from './_common/select-arrangement.vue'
+import type { ResumeArrangementType } from '~/schemas/resume.schema'
+import SelectFaskes from './_common/select-faskes.vue'
+import SelectDeathCause from './_common/select-death-cause.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, medicalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Badge from '~/components/pub/ui/badge/Badge.vue'
+import { detailTherapyProtocolListConfig } from './detail-list.cfg'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+
+const props = defineProps<{
+
+}>()
+
+const router = useRouter()
+const formRef = ref()
+const isConfirmationOpen = ref(false)
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+
+function goBack() {
+  router.go(-1)
+}
+async function handleConfirmAdd() {
+  // handleActionClick('submit')
+  console.log(`tersubmit wak`)
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {   
+    goBack()
+  }
+}
+
+const dummymedicalDiagnosis = [
+  { id: `asdfouno182y49128y3`, program: 'Latihan penguatan otot', icd_x: 'E11' },
+  { id: `asdfouno182y49128g8`, program: 'Mobilisasi otot', icd_x: 'I10' },
+]
+</script>
+
+<template>
+  <div class="flex items-center">         
+    <Button type="button" variant="outline" class="ml-auto text-gray-500 border border-orange-400 bg-orange-50" @click="handleActionClick('back')">
+      <Icon name="i-lucide-arrow-left" class="h-4 w-4 align-middle transition-colors" />
+      Kembali
+    </Button>
+  </div>
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 1</h1>
+    <DetailRow label="Tanggal Pemeriksaan">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Diagnosa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Permintaan Terapi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Frekuensi Terapi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Waktu Mencapai Target">{{ `aaaaaa bulan` }}</DetailRow>
+  </section>
+  <Separator class="my-5" />
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 2</h1>
+    <DetailRow label="Hubungan dengan Tertanggung">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Anamnesa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Pemeriksaan Fisik dan Uji Fungsi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Diagnosa Medis (ICD-X)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Diagnosa Fungsional (ICD-X)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Prosedur Tata Laksana (ICD-IX CM)" class="mb-1">
+      <Badge variant="outline" class="bg-gray-200">aaaaaa</Badge>
+    </DetailRow>
+    <DetailRow label="Pemeriksaan Penunjang">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Evaluasi">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Anjuran">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Suspek Penyakit Akibat Kerja">{{ `aaaaaa` }}</DetailRow>
+  </section>
+  <Separator class="my-5" />
+
+  <section class="">
+    <h1 class="mb-2 text-base font-medium">Form 3</h1>
+    <DetailRow label="Diagnosa">{{ `aaaaaa` }}</DetailRow>
+    <DetailRow label="Permintaan Terapi">{{ `aaaaaa` }}</DetailRow>
+
+    <div class="mt-3">
+      <PubMyUiDataTable 
+        v-bind="detailTherapyProtocolListConfig"
+        :rows="dummymedicalDiagnosis" />
+    </div>  
+
+  </section>
+</template>
diff --git a/app/components/app/therapy-protocol/edit.vue b/app/components/app/therapy-protocol/edit.vue
new file mode 100644
index 00000000..e871fc90
--- /dev/null
+++ b/app/components/app/therapy-protocol/edit.vue
@@ -0,0 +1,217 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import SelectSecondaryDiagnosis from './_common/select-secondary-diagnosis.vue'
+import SelectPrimaryDiagnosis from './_common/select-primary-diagnosis.vue'
+import SelectArrangement from './_common/select-arrangement.vue'
+import type { ResumeArrangementType } from '~/schemas/resume.schema'
+import SelectFaskes from './_common/select-faskes.vue'
+import SelectDeathCause from './_common/select-death-cause.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, medicalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  resumeArrangementType: ResumeArrangementType
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+
+const dummymedicalDiagnosis = [
+  { number: 1, diagnosis: 'Diabetes Mellitus', icd_x: 'E11' },
+  { number: 2, diagnosis: 'Hipertensi',  icd_x: 'I10' },
+  { number: 3, diagnosis: 'Asma Bronkial', icd_x: 'J45' },
+]
+</script>
+
+<template>
+  <Form ref="formRef" v-slot="{ values }" as="" keep-values :validation-schema="formSchema" :validate-on-mount="false"
+    validation-mode="onSubmit" :initial-values="initialValues ? initialValues : {}">
+    <h1 class="mb-1 text-base font-medium">Terapi ke 1</h1>
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base">Form 1</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="checkDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="diagnosis"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="therapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      <DE.Block class="flex items-end h-fit" :col-count="3" :cell-flex="false">        
+        <div>
+          <h1 class="mb-1 font-medium">Frekuensi Terapi</h1>
+          <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+            <p class="">{{ `2` }}</p>
+            <p class="text-muted-foreground">x / Minggu</p>
+          </div>
+        </div>
+        <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+          <p>
+            <span class="text-muted-foreground">Selama</span>
+              {{ `1` }}
+            <span class="text-muted-foreground">Bulan</span>
+          </p>
+        </div>
+        <InputBase
+          field-name="targetPeriodInMonths"
+          label="Waktu mencapai target (Bulan)"
+          placeholder="Masukkan angka"
+          :errors="errors"
+          numeric-only
+        />
+      </DE.Block>
+      <TextAreaInput 
+        field-name="therapyTarget"
+        label="Target Terapi"
+        placeholder="Target Terapi"
+        :errors="errors" />
+    </DE.Block>
+    <Separator class="my-4" />
+
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base font-medium">Form 2</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">        
+        <RadioRelationship
+          field-name="relationshipToPatient"
+          label="Hubungan dengan tertanggung"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+      <TextAreaInput 
+        field-name="anamnesa"
+        label="Anamnesa"
+        placeholder="Anamnesa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="physicalExamination"
+        label="Pemeriksaan Fisik & Uji Fungsi"
+        placeholder="Pemeriksaan Fisik & Uji Fungsi"
+        :errors="errors" />
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Diagnosis Medis (ICD-X)</h1>
+        <PubMyUiDataTable
+          v-bind="medicalDiagnosisConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Diagnosis Fungsional (ICD-X)</h1>
+        <PubMyUiDataTable
+          v-bind="functionalDiagnosisConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+      
+      <div class="">
+        <h1 class="mb-2 font-medium">Prosedur Tata Laksana (ICD-IX CM)</h1>
+        <PubMyUiDataTable
+          v-bind="proceduralConfig"
+          :rows="dummymedicalDiagnosis"
+          :skeleton-size="dummymedicalDiagnosis.length"
+        />
+      </div>
+
+      <TextAreaInput 
+        field-name="supportingExamination"
+        label="Pemeriksaan Penunjang"
+        placeholder="Pemeriksaan Penunjang"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="evaluation"
+        label="Evaluasi"
+        placeholder="Evaluasi"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="recommendation"
+        label="Anjuran"
+        placeholder="Anjuran"
+        :errors="errors" />
+      <DE.Cell :col-span="2">        
+        <RadioIllnessBcsWork
+          field-name="illnessBcsWork"
+          label="Suspek penyakit akibat kerja"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+    </DE.Block>
+    <Separator class="my-4" />
+
+    
+    <!-- FORM 3 -->
+    <h1 class="mb-3 text-base">Form 3</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="checkDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form3-diagnosis"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form3-therapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      
+      <DE.Cell class="mt-2" :col-span="2">
+          <FieldArray v-slot="{ fields, push, remove }" name="form3-programActivity">
+            <div v-for="(field, idx) in fields" :key="idx" class="w-1/2 flex items-center gap-3 mb-3">
+              <TextAreaInput 
+                class=""
+                :field-name="`form3-programActivity[${idx}]`"
+                :label="`Program/Kegiatan ${idx + 1}`"
+                :placeholder="`Masukkan Program/Kegiatan ${idx + 1}`"
+                :errors="errors" />
+              <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Program
+            </Button>
+          </FieldArray>
+      </DE.Cell>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/entry-form.vue b/app/components/app/therapy-protocol/entry-form.vue
new file mode 100644
index 00000000..22bae769
--- /dev/null
+++ b/app/components/app/therapy-protocol/entry-form.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { toTypedSchema } from '@vee-validate/zod'
+
+// components
+import { Form } from '~/components/pub/ui/form'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import Separator from '~/components/pub/ui/separator/Separator.vue'
+
+// form field components
+import { BaseTextarea, RadioRelations, SelectExaminationDate, RadioWorkDisease } from './field'
+
+// #region Props & Emits
+interface Props {
+  schema: any
+  initialValues?: any
+  patientId: number
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{}>()
+// #endregion
+
+// #region State & Computed
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+// #endregion region
+
+// #region Utilities & event handlers
+// #endregion
+
+// #region Watchers
+// #endregion
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    :validate-on-mount="false"
+    validation-mode="onSubmit"
+    :initial-values="initialValues ? initialValues : {}"
+  >
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Anamnesa dan Riwayat Pasien</p>
+    <DE.Block
+      :col-count="3"
+      :cell-flex="false"
+    >
+      <SelectExaminationDate
+        field-name="examinationDate"
+        label="Tanggal Pemeriksaan"
+      />
+      <RadioRelations
+        field-name="relationshipToInsured"
+        label="Hubungan Dengan Tertanggung"
+        :col-span="2"
+      />
+      <BaseTextarea
+        field-name="anamnesis"
+        label="Anamnesa"
+      />
+      <BaseTextarea
+        field-name="medicalHistory"
+        label="Riwayat Penyakit"
+      />
+      <BaseTextarea
+        field-name="medicationHistory"
+        label="Riwayat Obat"
+      />
+    </DE.Block>
+
+    <div class="h-6">
+      <Separator />
+    </div>
+
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Pemeriksaan Penunjang</p>
+    <DE.Block
+      :col-count="2"
+      :cell-flex="false"
+    >
+      <BaseTextarea
+        field-name="supportDiagnosis"
+        label="Diagnosa (ICD-X)"
+      />
+      <BaseTextarea
+        field-name="functionalDiagnosis"
+        label="Diagnosa Fungsional (ICD-X)"
+      />
+      <BaseTextarea
+        field-name="treatmentDiagnosis"
+        label="Diagnosa Tata Laksana (ICD-IX)"
+      />
+      <BaseTextarea
+        field-name="supportExamination"
+        label="Pemeriksaan Penunjang"
+      />
+    </DE.Block>
+
+    <div class="h-6">
+      <Separator />
+    </div>
+
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Anjuran dan Evaluasi</p>
+    <DE.Block
+      :col-count="3"
+      :cell-flex="false"
+    >
+      <BaseTextarea
+        field-name="recommendation"
+        label="Anjuran"
+      />
+      <BaseTextarea
+        field-name="evaluation"
+        label="Evaluasi"
+      />
+      <RadioWorkDisease
+        field-name="isWorkRelatedDisease"
+        label="Suspek Penyakit Akibat Kerja"
+      />
+    </DE.Block>
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/entry.vue b/app/components/app/therapy-protocol/entry.vue
new file mode 100644
index 00000000..48065416
--- /dev/null
+++ b/app/components/app/therapy-protocol/entry.vue
@@ -0,0 +1,204 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import SelectDate from './_common/select-date.vue'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import RadioRelationship from './_common/radio-relationship.vue'
+import RadioIllnessBcsWork from './_common/radio-illness-bcs-work.vue'
+import { functionalDiagnosisConfig, proceduralConfig } from './add-list.cfg'
+import FunctionalDiagnosisPicker from './picker-dialog/functional-diagnosis/diagnosis-picker.vue'
+import MedicalDiagnosisPicker from './picker-dialog/medical-diagnosis/diagnosis-picker.vue'
+import ArrangementProcedurePicker from './picker-dialog/arrangement-procedure/procedure-picker.vue'
+
+const props = defineProps<{
+  schema: any
+  initialValues?: any
+  errors?: FormErrors
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+
+// const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isFunctionalDiagnosisPickerDialogOpen = ref<boolean>(false)
+// const isProcedurePickerDialogOpen = ref<boolean>(false)
+
+// function toggleMedicalDiagnosisPickerDialog() {
+//   isMedicalDiagnosisPickerDialogOpen.value = !isMedicalDiagnosisPickerDialogOpen.value
+// }
+// function toggleFunctionalDiagnosisPickerDialog() {
+//   isFunctionalDiagnosisPickerDialogOpen.value = !isFunctionalDiagnosisPickerDialogOpen.value
+// }
+
+// provide(`isDiagnosisPickerDialogOpen`, isDiagnosisPickerDialogOpen)
+// provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form ref="formRef" v-slot="{ values }" as="" keep-values :validation-schema="formSchema" :validate-on-mount="false"
+    validation-mode="onSubmit" :initial-values="initialValues ? initialValues : {}">
+    <h1 class="mb-1 text-base font-medium">Terapi ke 1</h1>
+
+
+    <!-- FORM 1 -->
+    <h1 class="mb-3 text-base">Form 1</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="form1ExaminationDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form1Diagnose"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form1TherapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      <DE.Block class="flex items-end h-fit" :col-count="3" :cell-flex="false">        
+        <div>
+          <h1 class="mb-1 font-medium">Frekuensi Terapi</h1>
+          <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+            <p class="">{{ `2` }}</p>
+            <p class="text-muted-foreground">x / Minggu</p>
+          </div>
+        </div>
+        <div :class="cn('bg-gray-50 dark:bg-slate-950 ring-offset-background placeholder:text-muted-foreground flex justify-between items-center h-9 md:h-8 2xl:h-9 w-full rounded-md border border-gray-300 px-3 py-2 md:text-xs 2xl:text-sm file:border-0 file:bg-transparent md:file:!text-xs xl:file:!text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',)">
+          <p>
+            <span class="text-muted-foreground">Selama</span>
+              {{ `1` }}
+            <span class="text-muted-foreground">Bulan</span>
+          </p>
+        </div>
+        <InputBase
+          field-name="form1TargetPeriod"
+          label="Waktu mencapai target (Bulan)"
+          placeholder="Masukkan angka"
+          :errors="errors"
+          numeric-only
+        />
+      </DE.Block>
+      <TextAreaInput 
+        field-name="form1TherapyTarget"
+        label="Target Terapi"
+        placeholder="Target Terapi"
+        :errors="errors" />
+    </DE.Block>
+    <Separator class="my-4" />
+
+
+
+    <!-- FORM 2 -->
+    <h1 class="mb-3 text-base font-medium">Form 2</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <DE.Cell :col-span="2">        
+        <RadioRelationship
+          field-name="form2RelationshipToInsured"
+          label="Hubungan dengan tertanggung"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+      <TextAreaInput 
+        field-name="anamnesis"
+        label="Anamnesa"
+        placeholder="Anamnesa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form2PhysicalExamination"
+        label="Pemeriksaan Fisik & Uji Fungsi"
+        placeholder="Pemeriksaan Fisik & Uji Fungsi"
+        :errors="errors" />
+      
+      <MedicalDiagnosisPicker
+        field-name="medicalDiagnoses"
+        title="Diagnosis Medis (ICD-X)" />
+      <FunctionalDiagnosisPicker
+        field-name="functionDiagnoses" 
+        title="Diagnosis Fungsional (ICD-X)" />
+      <ArrangementProcedurePicker
+        field-name="procedures"
+        title="Prosedur Tata Laksana (ICD-IX CM)" />
+      
+      <TextAreaInput 
+        field-name="supportingExams"
+        label="Pemeriksaan Penunjang"
+        placeholder="Pemeriksaan Penunjang"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="evaluation"
+        label="Evaluasi"
+        placeholder="Evaluasi"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="instruction"
+        label="Anjuran"
+        placeholder="Anjuran"
+        :errors="errors" />
+      <DE.Cell :col-span="2">        
+        <RadioIllnessBcsWork
+          field-name="workCauseStatus"
+          label="Suspek penyakit akibat kerja"
+          :errors="errors"
+          is-required
+        />
+      </DE.Cell>
+    </DE.Block>
+    <Separator class="my-4" />
+
+    
+    <!-- FORM 3 -->
+    <h1 class="mb-3 text-base">Form 3</h1>
+    <DE.Block :col-count="2" :cell-flex="false">
+      <SelectDate field-name="form3ExaminationDate" label="Tanggal Pemeriksaan" :errors="errors"/>
+      <div></div>
+      <TextAreaInput
+        field-name="form3Diagnose"
+        label="Diagnosa"
+        placeholder="Diagnosa"
+        :errors="errors" />
+      <TextAreaInput 
+        field-name="form3TherapyRequest"
+        label="Permintaan Terapi"
+        placeholder="Permintaan Terapi"
+        :errors="errors" />
+      
+      <DE.Cell class="mt-2" :col-span="2">
+          <FieldArray v-slot="{ fields, push, remove }" name="form3ProgramActivities">
+            <div v-for="(field, idx) in fields" :key="idx" class="w-1/2 flex items-center gap-3 mb-3">
+              <TextAreaInput 
+                class=""
+                :field-name="`form3ProgramActivities[${idx}]`"
+                :label="`Program/Kegiatan ${idx + 1}`"
+                :placeholder="`Masukkan Program/Kegiatan ${idx + 1}`"
+                :errors="errors" />
+              <Button v-if="idx !== 0" type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Program
+            </Button>
+          </FieldArray>
+      </DE.Cell>
+    </DE.Block>
+
+  </Form>
+</template>
diff --git a/app/components/app/therapy-protocol/field/base-textarea.vue b/app/components/app/therapy-protocol/field/base-textarea.vue
new file mode 100644
index 00000000..e6e7a63c
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/base-textarea.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  label: string
+  fieldName: string
+  placeholder?: string
+  colSpan?: number
+}>()
+
+const { label, fieldName, placeholder = 'Masukkan catatan' } = props
+</script>
+
+<template>
+  <DE.Cell :col-span="colSpan || 1">
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Textarea
+              v-bind="componentField"
+              :placeholder="placeholder"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/index.ts b/app/components/app/therapy-protocol/field/index.ts
new file mode 100644
index 00000000..f3df2c2d
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/index.ts
@@ -0,0 +1,4 @@
+export { default as RadioRelations } from './radio-relations.vue'
+export { default as SelectExaminationDate } from './select-examination-date.vue'
+export { default as BaseTextarea } from './base-textarea.vue'
+export { default as RadioWorkDisease } from './radio-work-disease.vue'
diff --git a/app/components/app/therapy-protocol/field/radio-relations.vue b/app/components/app/therapy-protocol/field/radio-relations.vue
new file mode 100644
index 00000000..aba12b86
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/radio-relations.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+defineProps<{
+  label: string
+  fieldName: string
+  containerClass?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  colSpan?: number
+}>()
+
+const options = [
+  { label: 'Suami/Istri', value: 'spouse' },
+  { label: 'Anak', value: 'child' },
+]
+</script>
+
+<template>
+  <DE.Cell
+    :class="cn('radio-group-field', containerClass)"
+    :col-span="colSpan || 2"
+  >
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in options"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/radio-work-disease.vue b/app/components/app/therapy-protocol/field/radio-work-disease.vue
new file mode 100644
index 00000000..9eeaa0d8
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/radio-work-disease.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+defineProps<{
+  label: string
+  fieldName: string
+  containerClass?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  colSpan?: number
+}>()
+
+const options = [
+  { label: 'Ya', value: 'YA' },
+  { label: 'Tidak', value: 'TIDAK' },
+]
+</script>
+
+<template>
+  <DE.Cell
+    :class="cn('radio-group-field', containerClass)"
+    :col-span="colSpan || 1"
+  >
+    <DE.Label :label-for="fieldName">
+      {{ label }}
+    </DE.Label>
+    <DE.Field :id="fieldName">
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in options"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/field/select-examination-date.vue b/app/components/app/therapy-protocol/field/select-examination-date.vue
new file mode 100644
index 00000000..6ab232b9
--- /dev/null
+++ b/app/components/app/therapy-protocol/field/select-examination-date.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { Input } from '~/components/pub/ui/input'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName: string
+  label: string
+  placeholder?: string
+  class?: string
+  selectClass?: string
+  fieldGroupClass?: string
+  labelClass?: string
+}>()
+
+const { placeholder = 'Pilih tanggal pemeriksaan', class: containerClass, fieldGroupClass, labelClass } = props
+</script>
+
+<template>
+  <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
+    <DE.Label
+      :label-for="fieldName"
+      :class="cn('select-field-label', labelClass)"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <Input
+              id="birthDate"
+              type="date"
+              min="1980-01-01"
+              :max="new Date().toISOString().split('T')[0]"
+              v-bind="componentField"
+              :placeholder="placeholder"
+            />
+          </FormControl>
+          <FormMessage />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/therapy-protocol/history-dialog.vue b/app/components/app/therapy-protocol/history-dialog.vue
new file mode 100644
index 00000000..7bfcac10
--- /dev/null
+++ b/app/components/app/therapy-protocol/history-dialog.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './history-list.cfg'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import { cn } from '~/lib/utils'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/history-list.cfg.ts b/app/components/app/therapy-protocol/history-list.cfg.ts
new file mode 100644
index 00000000..0467589e
--- /dev/null
+++ b/app/components/app/therapy-protocol/history-list.cfg.ts
@@ -0,0 +1,45 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dp.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 140}, {width: 3},],
+
+  headers: [
+    [
+      { label: 'Tgl Pemeriksaan' },
+      { label: 'DPJP' },
+      { label: 'Anamnesa' },
+      { label: 'Permintaan Terapi' },
+      { label: 'Program/Kegiatan' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['birth_date', 'person.name', 'person.name', 'person.name', 'birth_date', "action"],
+
+  parses: {
+    birth_date: (rec: unknown): unknown => {
+      const { person } = rec as Patient
+
+      if (typeof person.birthDate == 'object' && person.birthDate) {
+        return (person.birthDate as Date).toLocaleDateString('id-ID')
+      } else if (typeof person.birthDate == 'string') {
+        return (person.birthDate as string).substring(0, 10)
+      }
+      return person.birthDate
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+}
diff --git a/app/components/app/therapy-protocol/list.cfg.ts b/app/components/app/therapy-protocol/list.cfg.ts
new file mode 100644
index 00000000..34155752
--- /dev/null
+++ b/app/components/app/therapy-protocol/list.cfg.ts
@@ -0,0 +1,53 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-duvp.vue'))
+const statusBadge = defineAsyncComponent(() => import('./_common/verify-badge.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {width: 140}, {width: 3},],
+
+  headers: [
+    [
+      { label: 'Tgl Pemeriksaan' },
+      { label: 'Anamnesa' },
+      { label: 'Permintaan Terapi' },
+      { label: 'Program' },
+      { label: 'Status' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['anamnesis', 'anamnesis', 'anamnesis', 'anamnesis', 'status', 'action'],
+
+  parses: {
+    birth_date: (rec: unknown): unknown => {
+      const { person } = rec as Patient
+
+      if (typeof person.birthDate == 'object' && person.birthDate) {
+        return (person.birthDate as Date).toLocaleDateString('id-ID')
+      } else if (typeof person.birthDate == 'string') {
+        return (person.birthDate as string).substring(0, 10)
+      }
+      return person.birthDate
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+    status(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: statusBadge,
+      }
+    },
+  },
+}
diff --git a/app/components/app/therapy-protocol/list.vue b/app/components/app/therapy-protocol/list.vue
new file mode 100644
index 00000000..0d62cc6c
--- /dev/null
+++ b/app/components/app/therapy-protocol/list.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './list.cfg'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+
+defineProps<Props>()
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
new file mode 100644
index 00000000..91e9f72c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('ap_rec_id')!
+const recAction = inject<Ref<string>>('ap_rec_action')!
+const recItem = inject<Ref<any>>('ap_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
new file mode 100644
index 00000000..e4836c7c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-list.vue
@@ -0,0 +1,120 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './procedure-list-cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { ProcedureSrcSchema, type ProcedureSrcFormData } from '~/schemas/procedure-src.schema'
+
+// Handlers
+import {
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/procedure-src.handler'
+
+// Services
+import { getList, getDetail } from '~/services/procedure-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'procedure-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'MCU Prosedur',
+  icon: 'i-lucide-clipboard-list',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('ap_rec_id', recId)
+provide('ap_rec_action', recAction)
+provide('ap_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isProcedurePickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+  <Header
+    v-model="searchInput"
+    :prep="headerPrep"
+    :ref-search-nav="headerPrep.refSearchNav"
+    @search="handleSearch"
+    class=""
+  />
+  <AppProcedureSrcList
+    :table-config="config"
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"
+  />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
new file mode 100644
index 00000000..4a44a40f
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/arrangement-procedure/procedure-picker.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import ProcedureListDialog from './procedure-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isProcedurePickerDialogOpen = ref<boolean>(false)
+provide(`isProcedurePickerDialogOpen`, isProcedurePickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isProcedurePickerDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="props.fieldName">
+      <ProcedureListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Prosedur</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
new file mode 100644
index 00000000..67be3075
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-list.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './diagnosis-list-cfg'
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { DiagnoseSrcSchema, type DiagnoseSrcFormData } from '~/schemas/diagnose-src.schema'
+
+// Handlers
+
+// Services
+import { getList, getDetail } from '~/services/diagnose-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'diagnose-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Daftar Diagnosis',
+  icon: 'i-lucide-microscope',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('fd_rec_id', recId)
+provide('fd_rec_action', recAction)
+provide('fd_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isFunctionalPickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class=""
+    />
+    <AppDiagnoseSrcList
+      :data="data"
+      :pagination-meta="paginationMeta"
+      :table-config="config"
+      @page-change="handlePageChange"
+    />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
new file mode 100644
index 00000000..e609450b
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/diagnosis-picker.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import DiagnosisListDialog from './diagnosis-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isFunctionalPickerDialogOpen = ref<boolean>(false)
+provide(`isFunctionalPickerDialogOpen`, isFunctionalPickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isFunctionalPickerDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="fieldName">
+      <DiagnosisListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Diagnosis</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
new file mode 100644
index 00000000..ac7c8f29
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/functional-diagnosis/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('fd_rec_id')!
+const recAction = inject<Ref<string>>('fd_rec_action')!
+const recItem = inject<Ref<any>>('fd_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
new file mode 100644
index 00000000..cc02aa1d
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list-cfg.ts
@@ -0,0 +1,33 @@
+import type { Config, RecComponent } from '~/components/pub/my-ui/data-table'
+import { defineAsyncComponent } from 'vue'
+
+const action = defineAsyncComponent(() => import('./dropdown-action-p.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, { width: 50 }],
+
+  headers: [[{ label: 'Kode' }, { label: 'Nama (FHIR)' }, { label: 'Nama (ID)' }, { label: '' }]],
+
+  keys: ['code', 'name', 'indName', 'action'],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama (FHIR)' },
+    { key: 'indName', label: 'Nama (ID)' },
+  ],
+
+  parses: {},
+
+  components: {
+    action(rec, idx) {
+      const res: RecComponent = {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+      return res
+    },
+  },
+
+  htmls: {},
+}
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
new file mode 100644
index 00000000..d299219f
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-list.vue
@@ -0,0 +1,107 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './diagnosis-list-cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { DiagnoseSrcSchema, type DiagnoseSrcFormData } from '~/schemas/diagnose-src.schema'
+
+// Services
+import { getList, getDetail } from '~/services/diagnose-src.service'
+
+const title = ref('')
+
+interface Props {
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const {
+  data,
+  isLoading,
+  paginationMeta,
+  searchInput,
+  handlePageChange,
+  handleSearch,
+  fetchData: getItemList,
+} = usePaginatedList({
+  fetchFn: async (params: any) => {
+    const result = await getList({
+      search: params.search,
+      sort: 'createdAt:desc',
+      'page-number': params['page-number'] || 0,
+      'page-size': params['page-size'] || 10,
+    })
+    return { success: result.success || false, body: result.body || {} }
+  },
+  entityName: 'diagnose-src',
+})
+
+const headerPrep: HeaderPrep = {
+  title: 'Daftar Diagnosis',
+  icon: 'i-lucide-microscope',
+  refSearchNav: {
+    placeholder: 'Cari (min. 3 karakter)...',
+    minLength: 3,
+    debounceMs: 500,
+    showValidationFeedback: true,
+    onInput: (val: string) => {
+      searchInput.value = val
+    },
+    onClick: () => {},
+    onClear: () => {},
+  },
+}
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+provide('md_rec_id', recId)
+provide('md_rec_action', recAction)
+provide('md_rec_item', recItem)
+provide('table_data_loader', isLoading)
+
+const isModalOpen = inject(`isMedicalDiagnosisPickerDialogOpen`) as Ref<boolean>
+
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      isModalOpen.value = false
+      break
+  }
+})
+
+onMounted(async () => {
+  await getItemList()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="" size="xl">
+    <Header
+      v-model="searchInput"
+      :prep="headerPrep"
+      :ref-search-nav="headerPrep.refSearchNav"
+      @search="handleSearch"
+      class=""
+    />
+    <AppDiagnoseSrcList
+      :data="data"
+      :pagination-meta="paginationMeta"
+      :table-config="config"
+      @page-change="handlePageChange"
+    />
+  </Dialog>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
new file mode 100644
index 00000000..76ce6dfd
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/diagnosis-picker.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import DiagnosisListDialog from './diagnosis-list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+
+const isMedicalDiagnosisPickerDialogOpen = ref<boolean>(false)
+provide(`isMedicalDiagnosisPickerDialogOpen`, isMedicalDiagnosisPickerDialogOpen)
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex items-center justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isMedicalDiagnosisPickerDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih Diagnosis
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="fieldName">
+      <DiagnosisListDialog :process-fn="push" />
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-1/2">Diagnosis</TableHead>
+              <TableHead class="w-1/2">ICD-X</TableHead>
+              <TableHead class="w-1/2">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+      
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
new file mode 100644
index 00000000..a30ca20c
--- /dev/null
+++ b/app/components/app/therapy-protocol/picker-dialog/medical-diagnosis/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('md_rec_id')!
+const recAction = inject<Ref<string>>('md_rec_action')!
+const recItem = inject<Ref<any>>('md_rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/app/therapy-protocol/verify-dialog.vue b/app/components/app/therapy-protocol/verify-dialog.vue
new file mode 100644
index 00000000..d72a96c2
--- /dev/null
+++ b/app/components/app/therapy-protocol/verify-dialog.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import type { InstallationFormData } from '~/schemas/installation.schema'
+import TextCaptcha from './_common/text-captcha.vue'
+
+
+const props = defineProps<{
+  schema: any
+  errors?: FormErrors
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  cancel: [resetForm: () => void]
+}>()
+
+const formSchema = toTypedSchema(props.schema)
+const formRef = ref()
+const captchaRef = ref<InstanceType<typeof TextCaptcha> | null>(null)
+const captchaValid = ref(false)
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  const formData: InstallationFormData = {
+    name: values.name || '',
+    code: values.code || '',
+  }
+  emit('submit', formData, resetForm)
+}
+
+function onCaptchaUpdate(valid: boolean) {
+  captchaValid.value = valid
+}
+
+// Form cancel handler
+function onCancelForm({ resetForm }: { resetForm: () => void }) {
+  emit('cancel', resetForm)
+}
+
+defineExpose({
+  validate: () => formRef.value?.validate(),
+  resetForm: () => formRef.value?.resetForm(),
+  setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
+  values: computed(() => formRef.value?.values),
+})
+</script>
+
+<template>
+  <Form
+    ref="formRef"
+    v-slot="{ values }"
+    as=""
+    keep-values
+    :validation-schema="formSchema"
+    validation-mode="onSubmit" 
+  >
+      <div class="border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+
+          <InputBase
+            field-name="name"
+            label="Nama"
+            placeholder="Masukkan Nama"
+            :errors="errors"/>
+          <InputBase
+            field-name="email"
+            label="Email"
+            placeholder="Masukkan Email"
+            :errors="errors"/>
+
+          <div class="mt-2">
+            <Label class="" for="password">Password</Label>
+            <Field class="" id="password" :errors="errors">
+              <FormField v-slot="{ componentField }" name="password">
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      id="password"
+                      v-bind="componentField"
+                      type="password"
+                      class="w-full"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              </FormField>
+            </Field>
+          </div>
+
+          <TextCaptcha
+            ref="captchaRef"
+            :length="5"
+            :useSpacing="true"
+            :noiseChars="true"
+            @update:valid="onCaptchaUpdate"
+          />
+
+        </div>
+      </div>
+  </Form>
+</template>
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 2e03029c..ab5eacee 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -27,6 +27,7 @@ import GeneralConsentList from '~/components/content/general-consent/entry.vue'
 import ResumeList from '~/components/content/resume/list.vue'
 import ControlLetterList from '~/components/content/control-letter/list.vue'
 import SurgeryReportList from '~/components/content/surgery-report/list.vue'
+import TherapyProtocolList from '~/components/content/therapy-protocol/list.vue'
 
 const route = useRoute()
 const router = useRouter()
@@ -74,7 +75,7 @@ const tabs: TabItem[] = [
     component: AssesmentFunctionList,
     props: { encounter: data, type: 'function', label: 'Asesmen Fungsi' },
   },
-  { value: 'therapy-protocol', label: 'Protokol Terapi' },
+  { value: 'therapy-protocol', label: 'Protokol Terapi', component: TherapyProtocolList, props: { encounter: data } },
   { value: 'education-assessment', label: 'Asesmen Kebutuhan Edukasi' },
   { value: 'patient-note', label: 'CPRJ', component: Cprj, props: { encounter: data } },
   { value: 'consent', label: 'General Consent', component: GeneralConsentList, props: { encounter: data } },
diff --git a/app/components/content/therapy-protocol/add.vue b/app/components/content/therapy-protocol/add.vue
new file mode 100644
index 00000000..bb184e23
--- /dev/null
+++ b/app/components/content/therapy-protocol/add.vue
@@ -0,0 +1,152 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import type { ExposedForm } from '~/types/form'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import { toast } from '~/components/pub/ui/toast'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { TherapyProtocolMedicRehabilitationSchema, TherapyProtocolSchema } from '~/schemas/therapy-protocol.schema'
+import { handleActionSave } from '~/handlers/therapy-protocol.handler'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.medicalDiagnoses = JSON.stringify(formData.medicalDiagnoses)
+  formData.functionDiagnoses = JSON.stringify(formData.functionDiagnoses)
+  formData.procedures = JSON.stringify(formData.procedures)
+  formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+const initial = {
+  // Required String Fields
+  form1ExaminationDate: "2025-11-06",
+  form1Diagnose: 'Awwww',
+  form1TherapyRequest: 'Awwww',
+  form1TargetPeriod: 4,
+  form1TherapyTarget: 'Awwww',
+  form2RelationshipToInsured: 'child',
+  anamnesis: 'Bobo aja wak',
+  form2PhysicalExamination: 'Awwww',
+  medicalDiagnoses: [
+      {
+          id: 3,
+          code: "PROC002",
+          name: "Cesarean section"
+      }
+  ],
+  functionDiagnoses: [
+      {
+          id: 3,
+          code: "PROC002",
+          name: "Cesarean section"
+      }
+  ],
+  procedures: [
+      {
+          id: 5,
+          code: "PROC0100",
+          name: "Physical therapy session"
+      }
+  ],
+  supportingExams: 'Awwww',
+  evaluation: 'Awwww',
+  instruction: 'Awwww',
+  workCauseStatus: 'TIDAK', 
+  form3ExaminationDate: "2025-11-06",
+  form3Diagnose: 'Awwww',
+  form3TherapyRequest: 'Awwww',
+  form3ProgramActivities: ['Menonton Kakek Meninggoy',],
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Tambah</div>
+  <AppTherapyProtocolEntry
+    ref="inputForm"
+    :schema="TherapyProtocolMedicRehabilitationSchema"
+    :resume-arrangement-type="inputForm?.values.arrangement"
+    :initial-values="initial"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false"
+      @click="handleActionClick"/>
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/detail.vue b/app/components/content/therapy-protocol/detail.vue
new file mode 100644
index 00000000..e40a8044
--- /dev/null
+++ b/app/components/content/therapy-protocol/detail.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import type { ExposedForm } from '~/types/form';
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const personPatientForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const isConfirmationOpen = ref(false)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const recDate = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  // handleActionClick('submit')
+  console.log(`tersubmit wak`)
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) {
+      await navigateTo(props.callbackUrl)
+      return
+    }
+
+    goBack()
+    // handleCancelForm()
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('rec_date', recDate) // for divergence if we trigger same action on same Record Item multiple times
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, recDate], () => {
+  switch (recAction.value) {
+    case ActionEvents.showConfirmVerify:
+      handleActionClick('submit')
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <AppTherapyProtocolDetail />
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Konfirmasi"
+    message="Apakah Anda yakin ingin Konfirmasi data ini?"
+    confirm-text="Konfirmasi"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/edit.vue b/app/components/content/therapy-protocol/edit.vue
new file mode 100644
index 00000000..99dd569e
--- /dev/null
+++ b/app/components/content/therapy-protocol/edit.vue
@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import type { ExposedForm } from '~/types/form';
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Confirmation from '~/components/pub/my-ui/confirmation/confirmation.vue'
+import { getDetail } from '~/services/therapy-protocol.service';
+import { handleActionEdit } from '~/handlers/therapy-protocol.handler'
+import { TherapyProtocolMedicRehabilitationSchema } from '~/schemas/therapy-protocol.schema';
+
+// #region Props & Emits
+const props = defineProps<{
+  callbackUrl?: string
+}>()
+
+// form related state
+const inputForm = ref<ExposedForm<any> | null>(null)
+// #endregion
+
+// #region State & Computed
+const router = useRouter()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+const therapyId = typeof route.params.therapy_protocol_id == 'string' ? parseInt(route.params.therapy_protocol_id) : 0
+const isConfirmationOpen = ref(false)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(async () => {
+  const result = await getDetail(therapyId)
+  if (result.success) {
+    const currentValue = result.body?.data || {}
+    currentValue.medicalDiagnoses = await JSON.parse(currentValue.medicalDiagnoses)
+    currentValue.functionDiagnoses = await JSON.parse(currentValue.functionDiagnoses)
+    currentValue.procedures = await JSON.parse(currentValue.procedures)
+    console.log(currentValue)
+    inputForm.value?.setValues(currentValue)
+  }
+})
+// #endregion
+
+// #region Functions
+function goBack() {
+  router.go(-1)
+}
+
+async function handleConfirmAdd() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionEdit(
+    inputData,
+    therapyId,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  goBack()
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  formData.medicalDiagnoses = JSON.stringify(formData.medicalDiagnoses)
+  formData.functionDiagnoses = JSON.stringify(formData.functionDiagnoses)
+  formData.procedures = JSON.stringify(formData.procedures)
+  formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    isConfirmationOpen.value = true
+  }
+
+  if (eventType === 'back') {
+    if (props.callbackUrl) return navigateTo(props.callbackUrl)
+    goBack()
+  }
+}
+
+function handleCancelAdd() {
+  isConfirmationOpen.value = false
+}
+// #endregion
+
+// #region Watchers
+// #endregion
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Edit</div>
+  <AppTherapyProtocolEntry
+    ref="inputForm"
+    :schema="TherapyProtocolMedicRehabilitationSchema"
+    :resume-arrangement-type="inputForm?.values.arrangement"
+  />
+  
+  <div class="my-2 flex justify-end py-2">
+    <Action :enable-draft="false"
+      @click="handleActionClick"/>
+  </div>
+
+  <Confirmation
+    v-model:open="isConfirmationOpen"
+    title="Simpan Data"
+    message="Apakah Anda yakin ingin menyimpan data ini?"
+    confirm-text="Simpan"
+    @confirm="handleConfirmAdd"
+    @cancel="handleCancelAdd"
+  />
+</template>
diff --git a/app/components/content/therapy-protocol/history-list.vue b/app/components/content/therapy-protocol/history-list.vue
new file mode 100644
index 00000000..c04e7143
--- /dev/null
+++ b/app/components/content/therapy-protocol/history-list.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+
+// #region Imports
+import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getPatients, removePatient } from '~/services/patient.service'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+// #endregion
+
+// Props
+interface Props {
+}
+const props = defineProps<Props>()
+// #endregion
+
+// #region State
+const isVerifyDialogOpen = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getPatients({ ...params, includes: ['person', 'person-Addresses'] }),
+  entityName: 'patient',
+})
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const summaryLoading = ref(false)
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+})
+// #endregion
+
+// #region Functions
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+async function handleConfirmAdd() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    // const patient: Patient = await composeFormData()
+    // let createdPatientId = 0
+
+    // const response = await handleActionSave(
+    //   patient,
+    //   () => {},
+    //   () => {},
+    //   toast,
+    // )
+
+    // const data = (response?.body?.data ?? null) as PatientBase | null
+    // if (!data) return
+    // createdPatientId = data.id
+
+    // If has callback provided redirect to callback with patientData
+    // if (props.callbackUrl) {
+    //   await navigateTo(props.callbackUrl + '?patient-id=' + patient.id)
+    //   return
+    // }
+
+    // Navigate to patient list or show success message
+    // await navigateTo('/outpatient/encounter')
+    // return
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.value = false
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'therapy-protocol-id-detail',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'therapy-protocol-id-edit',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmVerify:
+      // Trigger confirmation modal open
+      handleConfirmAdd()
+      break
+
+    case ActionEvents.showPrint:
+      navigateTo('https://google.com', {
+        external: true,
+        open: { target: "_blank" },
+      });
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+
+  <Popover>
+      <PopoverTrigger as-child>
+        <Button variant="outline" :class="cn('mb-3 w-[280px] justify-start text-left font-normal',
+          !dateValue && 'text-muted-foreground')">
+          <CalendarIcon class="mr-2 h-4 w-4" />
+          <template v-if="dateValue.start">
+            <template v-if="dateValue.end">
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }} -
+              {{ df.format(dateValue.end.toDate(getLocalTimeZone())) }}
+            </template>
+
+            <template v-else>
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }}
+            </template>
+          </template>
+          <template v-else> Pick a date </template>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent class="w-auto p-0">
+        <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+          @update:start-value="(startDate) => (dateValue.start = startDate)" />
+      </PopoverContent>
+    </Popover>
+
+    <AppTherapyProtocolHistoryDialog
+      :data="data"
+      :pagination-meta="paginationMeta"
+      @page-change="handlePageChange" />
+</template>
\ No newline at end of file
diff --git a/app/components/content/therapy-protocol/list.vue b/app/components/content/therapy-protocol/list.vue
new file mode 100644
index 00000000..670f09ec
--- /dev/null
+++ b/app/components/content/therapy-protocol/list.vue
@@ -0,0 +1,262 @@
+<script setup lang="ts">
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/my-ui/data/types'
+import type { Summary } from '~/components/pub/my-ui/summary-card/type'
+
+// #region Imports
+import { Calendar, Hospital, UserCheck, UsersRound } from 'lucide-vue-next'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import { ActionEvents } from '~/components/pub/my-ui/data/types'
+
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import SummaryCard from '~/components/pub/my-ui/summary-card/summary-card.vue'
+import { usePaginatedList } from '~/composables/usePaginatedList'
+
+import { getList, remove } from '~/services/therapy-protocol.service'
+import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import type { Encounter } from '~/models/encounter'
+import { cn } from '~/lib/utils'
+import { CalendarDate, DateFormatter, getLocalTimeZone } from '@internationalized/date'
+import type { DateRange } from 'radix-vue'
+import type { ExposedForm } from '~/types/form'
+import { VerificationSchema } from '~/schemas/verification.schema'
+import { handleActionSave } from '~/handlers/therapy-protocol.handler'
+import { toast } from '~/components/pub/ui/toast'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+// #endregion
+
+// Props
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const route = useRoute()
+const encounterId = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
+// #endregion
+
+// #region State
+const isVerifyDialogOpen = ref(false)
+const isHistoryDialogOpen = ref(false)
+const isPatientInTherapy = ref(false)
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params }),
+  entityName: 'therapy-protocol',
+})
+
+const df = new DateFormatter('en-US', {
+  dateStyle: 'medium',
+})
+
+const dateValue = ref({
+  start: new CalendarDate(2022, 1, 20),
+  end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const isRecordConfirmationOpen = ref(false)
+const isDocPreviewDialogOpen = ref(false)
+const summaryLoading = ref(false)
+
+const inputForm = ref<ExposedForm<any> | null>(null)
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+const timestamp = ref<number>(0)
+
+const isCaptchaValid = ref(false)
+provide('isCaptchaValid', isCaptchaValid)
+
+const headerPrep: HeaderPrep = {
+  title: "Protokol Terapi",
+  icon: 'i-lucide-newspaper',
+  addNav: {
+    label: "Protokol Terapi",
+    onClick: () => navigateTo({
+      name: 'rehab-encounter-id-therapy-protocol-add',
+    }),
+  },
+}
+// #endregion
+
+// #region Lifecycle Hooks
+onMounted(() => {
+  getPatientSummary()
+
+  const isInTherapy = false // TODO: determine if patient is in therapy
+  handleIsPatientInTherapy(isInTherapy)
+})
+// #endregion
+
+// #region Functions
+function handleIsPatientInTherapy(value: boolean) {
+  if (value) {
+    isPatientInTherapy.value = true
+  } else {
+    isPatientInTherapy.value = false
+  }
+}
+async function handleOpenHistory() {
+  isHistoryDialogOpen.value = true
+  console.log(`jalan history`)
+}
+async function getPatientSummary() {
+  try {
+    summaryLoading.value = true
+    await new Promise((resolve) => setTimeout(resolve, 500))
+  } catch (error) {
+    console.error('Error fetching patient summary:', error)
+  } finally {
+    summaryLoading.value = false
+  }
+}
+
+async function handleVerify() {
+  isVerifyDialogOpen.value = true
+}
+
+async function handleConfirmVerify() {
+  const inputData: any = await composeFormData()
+  const response = await handleActionSave(
+    inputData,
+    () => { },
+    () => { },
+    toast,
+  )
+
+  const data = (response?.body?.data ?? null)
+  if (!data) return
+  isVerifyDialogOpen.value = false
+}
+
+async function composeFormData(): Promise<any> {
+  const [input,] = await Promise.all([
+    inputForm.value?.validate(),
+  ])
+
+  const results = [input]
+  const allValid = results.every((r) => r?.valid)
+
+  // exit, if form errors happend during validation
+  if (!allValid) return Promise.reject('Form validation failed')
+
+  const formData = input?.values
+  // formData.encounter_id = encounterId
+
+  return new Promise((resolve) => resolve(formData))
+}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+  if (eventType === 'submit') {
+    handleConfirmVerify()
+  }
+
+  if (eventType === 'back') {
+    isVerifyDialogOpen.value = false
+  }
+}
+// #endregion
+
+// #region Provide
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('timestamp', timestamp)
+provide('table_data_loader', isLoading)
+// #endregion
+
+// #region Watchers
+watch([recId, recAction, timestamp], () => {
+  switch (recAction.value) {
+    case ActionEvents.showDetail:
+      navigateTo({
+        name: 'therapy-protocol-id-detail',
+        params: { id: recId.value },
+      })
+      break
+
+    case ActionEvents.showEdit:
+      navigateTo({
+        name: 'rehab-encounter-id-therapy-protocol-therapy_protocol_id-edit',
+        params: { therapy_protocol_id: recId.value },
+      })
+      break
+
+    case ActionEvents.showConfirmVerify:
+      // Trigger confirmation modal open
+      handleVerify()
+      break
+
+    case ActionEvents.showPrint:
+      isDocPreviewDialogOpen.value = true
+      break
+  }
+})
+// #endregion
+</script>
+
+<template>
+  <Header :prep="{ ...headerPrep }" />
+
+  <section class="mb-5 flex justify-between items-center">
+    <!-- DATE RANGE -->
+    <Popover>
+      <PopoverTrigger as-child>
+        <Button variant="outline" :class="cn('w-[280px] justify-start text-left font-normal',
+          !dateValue && 'text-muted-foreground')">
+          <CalendarIcon class="mr-2 h-4 w-4" />
+          <template v-if="dateValue.start">
+            <template v-if="dateValue.end">
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }} -
+              {{ df.format(dateValue.end.toDate(getLocalTimeZone())) }}
+            </template>
+
+            <template v-else>
+              {{ df.format(dateValue.start.toDate(getLocalTimeZone())) }}
+            </template>
+          </template>
+          <template v-else> Pick a date </template>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent class="w-auto p-0">
+        <RangeCalendar v-model="dateValue" initial-focus :number-of-months="2"
+          @update:start-value="(startDate) => (dateValue.start = startDate)" />
+      </PopoverContent>
+    </Popover>
+
+    <!-- HISTORY -->
+    <Button variant="outline" :class="cn('',)" @click="handleOpenHistory">
+          <Icon name="i-lucide-history" class="h-4 w-4" />
+          History
+    </Button>
+  </section>
+
+  <AppTherapyProtocolCommonBannerPatientInTherapy 
+    v-if="isPatientInTherapy"
+    class="mb-5" />
+    
+  <AppTherapyProtocolList
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"/>
+
+  <Dialog v-model:open="isVerifyDialogOpen" title="Verifikasi">
+    <AppTherapyProtocolVerifyDialog
+      ref="inputForm"
+      :schema="VerificationSchema"
+    />
+    <div class="flex justify-end">
+      <Action v-show="isCaptchaValid" :enable-draft="false" @click="handleActionClick" />
+    </div>
+  </Dialog>
+
+  <Dialog v-model:open="isHistoryDialogOpen" title="History" size="full">
+    <ContentTherapyProtocolHistoryList />
+  </Dialog>
+
+  <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+    <!-- <DocPreviewDialog :link="recItem.url" /> -->
+    <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+  </Dialog>
+</template>
\ No newline at end of file
diff --git a/app/components/pub/my-ui/data/dropdown-action-dp.vue b/app/components/pub/my-ui/data/dropdown-action-dp.vue
new file mode 100644
index 00000000..479cfebd
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-dp.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-duvp.vue b/app/components/pub/my-ui/data/dropdown-action-duvp.vue
new file mode 100644
index 00000000..22952bd5
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-duvp.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+  
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Detail',
+    onClick: () => {
+      detail()
+    },
+    icon: 'i-lucide-eye',
+  },
+  {
+    label: 'Edit',
+    onClick: () => {
+      edit()
+    },
+    icon: 'i-lucide-pencil',
+  },
+  {
+    label: 'Verifikasi',
+    onClick: () => {
+      verify()
+    },
+    icon: 'i-lucide-shield-check',
+  },
+  {
+    label: 'Print',
+    onClick: () => {
+      print()
+    },
+    icon: 'i-lucide-printer',
+  },
+]
+
+function detail() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showDetail
+  recItem.value = props.rec
+}
+
+function edit() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showEdit
+  recItem.value = props.rec
+}
+
+function verify() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showConfirmVerify
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+
+function print() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/dropdown-action-p.vue b/app/components/pub/my-ui/data/dropdown-action-p.vue
new file mode 100644
index 00000000..2b7ad617
--- /dev/null
+++ b/app/components/pub/my-ui/data/dropdown-action-p.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import type { LinkItem, ListItemDto } from './types'
+import { ActionEvents } from './types'
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const activeKey = ref<string | null>(null)
+const linkItems: LinkItem[] = [
+  {
+    label: 'Process',
+    onClick: () => {
+      process()
+    },
+    icon: 'i-lucide-arrow-right',
+  },
+]
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+}
+</script>
+
+<template>
+  <div>
+    <DropdownMenu>
+      <DropdownMenuTrigger as-child>
+        <SidebarMenuButton
+          size="lg"
+          class="data-[state=open]:text-sidebar-accent-foreground data-[state=open]:bg-white dark:data-[state=open]:bg-slate-800"
+        >
+          <Icon
+            name="i-lucide-chevrons-up-down"
+            class="ml-auto size-4"
+          />
+        </SidebarMenuButton>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        class="w-[--radix-dropdown-menu-trigger-width] min-w-40 rounded-lg border border-slate-200 bg-white text-black dark:border-slate-700 dark:bg-slate-800 dark:text-white"
+        align="end"
+      >
+        <DropdownMenuGroup>
+          <DropdownMenuItem
+            v-for="item in linkItems"
+            :key="item.label"
+            class="hover:bg-gray-100 dark:hover:bg-slate-700"
+            @click="item.onClick"
+            @mouseenter="activeKey = item.label"
+            @mouseleave="activeKey = null"
+          >
+            <Icon :name="item.icon ?? ''" />
+            <span :class="activeKey === item.label ? 'text-sidebar-accent-foreground' : ''">{{ item.label }}</span>
+          </DropdownMenuItem>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/components/pub/my-ui/data/types.ts b/app/components/pub/my-ui/data/types.ts
index 0d747580..df5e4f3c 100644
--- a/app/components/pub/my-ui/data/types.ts
+++ b/app/components/pub/my-ui/data/types.ts
@@ -86,6 +86,7 @@ export const ActionEvents = {
   showProcess: 'showProcess',
   showVerify: 'showVerify',
   showValidate: 'showValidate',
+  showConfirmVerify: 'showConfirmVerify',
   showPrint: 'showPrint',
 }
 
diff --git a/app/components/pub/my-ui/modal/dialog.vue b/app/components/pub/my-ui/modal/dialog.vue
index d771924f..e5bc5ab4 100644
--- a/app/components/pub/my-ui/modal/dialog.vue
+++ b/app/components/pub/my-ui/modal/dialog.vue
@@ -2,6 +2,8 @@
 import { Dialog } from '~/components/pub/ui/dialog'
 import DialogContent from '~/components/pub/ui/dialog/DialogContent.vue'
 import DialogDescription from '~/components/pub/ui/dialog/DialogDescription.vue'
+import DialogContent from '~/components/pub/ui/dialog/DialogContent.vue'
+import DialogDescription from '~/components/pub/ui/dialog/DialogDescription.vue'
 
 interface DialogProps {
   title: string
@@ -66,4 +68,4 @@ const isOpen = computed({
       </DialogDescription>
     </DialogContent>
   </Dialog>
-</template>
+</template>
\ No newline at end of file
diff --git a/app/handlers/therapy-protocol.handler.ts b/app/handlers/therapy-protocol.handler.ts
new file mode 100644
index 00000000..c0423eff
--- /dev/null
+++ b/app/handlers/therapy-protocol.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/therapy-protocol.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/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
new file mode 100644
index 00000000..9593e171
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/[therapy_protocol_id]/edit.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
+
+// Define permission-based computed properties
+const canCreate = true // hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <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
new file mode 100644
index 00000000..cf35e5ec
--- /dev/null
+++ b/app/pages/(features)/rehab/encounter/[id]/therapy-protocol/add.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Protokol Terapi',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => `${route.meta.title}`, // backtick to avoid the ts-plugin(2322) warning
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+// if (!hasAccess) {
+//   throw createError({
+//     statusCode: 403,
+//     statusMessage: 'Access denied',
+//   })
+// }
+
+// Define permission-based computed properties
+const canCreate = true // hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <ContentTherapyProtocolAdd />
+  </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
new file mode 100644
index 00000000..5fc1b9a6
--- /dev/null
+++ b/app/pages/(features)/therapy-protocol/[id]/detail.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Detail 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
new file mode 100644
index 00000000..c0629508
--- /dev/null
+++ b/app/pages/(features)/therapy-protocol/[id]/edit.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: '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
new file mode 100644
index 00000000..a489abc5
--- /dev/null
+++ b/app/pages/(features)/therapy-protocol/add.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/my-ui/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah 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/schemas/therapy-protocol.schema.ts b/app/schemas/therapy-protocol.schema.ts
new file mode 100644
index 00000000..1c4e85a8
--- /dev/null
+++ b/app/schemas/therapy-protocol.schema.ts
@@ -0,0 +1,159 @@
+import { z } from 'zod'
+
+const TherapyProtocolSchema = z.object({
+  examinationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  relationshipToInsured: z.enum(['spouse', 'child'], {
+    required_error: 'Pilih hubungan',
+  }),
+  anamnesis: z.string({
+    required_error: 'Mohon lengkapi catatan anamnesa',
+  }),
+  medicalHistory: z.string({
+    required_error: 'Mohon lengkapi catatan riwayat penyakit',
+  }),
+  medicationHistory: z.string({
+    required_error: 'Mohon lengkapi catatan riwayat obat',
+  }),
+
+  supportDiagnosis: z.array(
+    z.object({
+      diagnosis: z.string({
+        required_error: 'Isi diagnosis',
+      }),
+    }),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  functionalDiagnosis: z.array(
+    z
+      .object({
+        diagnosis: z.string({}),
+      })
+      .optional(),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  treatmentDiagnosis: z.array(
+    z.object({
+      diagnosis: z.string({
+        required_error: 'Isi diagnosis',
+      }),
+    }),
+    {
+      required_error: 'Isi diagnosis',
+    },
+  ),
+  supportExamination: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan penunjang',
+  }),
+
+  recommendation: z.string({
+    required_error: 'Mohon lengkapi catatan anjuran',
+  }),
+  evaluation: z.string({
+    required_error: 'Mohon lengkapi catatan evaluasi',
+  }),
+  isWorkRelatedDisease: z.string({
+    required_error: 'Pilih apakah penyakit berkaitan dengan pekerjaan',
+  }),
+})
+
+
+
+const PickerItemSchema = z.object({
+  id: z.number().optional(),
+  code: z.string(),
+  name: z.string()
+})
+
+const TherapyProtocolMedicRehabilitationSchema = z.object({
+  form1ExaminationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  form1Diagnose: z.string({
+    required_error: 'Mohon lengkapi catatan diagnosa',
+  }),
+  form1TherapyRequest: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form1TargetPeriod: z.number({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form1TherapyTarget: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+
+  form2RelationshipToInsured: z.enum(['spouse', 'child'], {
+    required_error: 'Pilih hubungan',
+  }),
+  anamnesis: z.string({
+    required_error: 'Mohon lengkapi catatan anamnesa',
+  }),
+  form2PhysicalExamination: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan fisik',
+  }),
+
+  medicalDiagnoses: z.array(PickerItemSchema).default([]),
+  functionDiagnoses: z.array(PickerItemSchema).default([]),
+  procedures: z.array(PickerItemSchema).default([]),
+
+  supportingExams: z.string({
+    required_error: 'Mohon lengkapi catatan pemeriksaan penunjang',
+  }),
+  evaluation: z.string({
+    required_error: 'Mohon lengkapi catatan evaluasi',
+  }),
+  instruction: z.string({
+    required_error: 'Mohon lengkapi catatan anjuran',
+  }),
+  workCauseStatus: z.enum(['YA', 'TIDAK'], {
+    required_error: 'Pilih apakah penyakit berkaitan dengan pekerjaan',
+  }),
+
+  form3ExaminationDate: z.string({
+    required_error: 'Pilih tanggal pemeriksaan',
+  }),
+  form3Diagnose: z.string({
+    required_error: 'Mohon lengkapi catatan diagnosa',
+  }),
+  form3TherapyRequest: z.string({
+    required_error: 'Mohon lengkapi catatan terapi',
+  }),
+  form3ProgramActivities: z.array(
+    z.string({
+      required_error: 'Mohon lengkapi Program/Kegiatan',
+    }),
+    {
+      required_error: 'Isi Program/Kegiatan',
+    },
+  ).default(['']),
+})
+
+
+// {
+//     "encounter_id": 4,
+//     "doctor_code": "doc-3",
+//     "anamnesis": "",
+//     "medicalDiagnoses": "", //json
+//     "functionDiagnoses": "", //json
+//     "procedures":"", 
+//     "supportingExams":"",
+//     "instruction":"",
+//     "evaluation":"",
+//     "workCauseStatus":"YA",
+//     "frequency":1,
+//     "intervalUnit_code":"day",
+//     "duration":30,
+//     "durationUnit_code":"min"
+// }
+
+
+type TherapyProtocolFormData = z.infer<typeof TherapyProtocolSchema>
+type TherapyProtocolMedicRehabilitationFormData = z.infer<typeof TherapyProtocolMedicRehabilitationSchema>
+
+export { TherapyProtocolSchema, TherapyProtocolMedicRehabilitationSchema }
+export type { TherapyProtocolFormData, TherapyProtocolMedicRehabilitationFormData }
diff --git a/app/services/therapy-protocol.service.ts b/app/services/therapy-protocol.service.ts
new file mode 100644
index 00000000..329115f6
--- /dev/null
+++ b/app/services/therapy-protocol.service.ts
@@ -0,0 +1,27 @@
+// Base
+import * as base from './_crud-base'
+
+// Constants
+
+const path = '/api/v1/therapy-protocol'
+const name = 'therapy-protocol'
+
+export function create(data: any) {
+  return base.create(path, data, name)
+}
+
+export function getList(params: any = null) {
+  return base.getList(path, params, name)
+}
+
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
+}
+
+export function update(id: number | string, data: any) {
+  return base.update(path, id, data, name)
+}
+
+export function remove(id: number | string) {
+  return base.remove(path, id, name)
+}
\ No newline at end of file

From f6ae61849d4e714b8d7a888178b0382a358c3eab Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Tue, 25 Nov 2025 14:09:25 +0700
Subject: [PATCH 06/13] Squashed commit of the following:

commit 8e3ea9e8d1d7e3b06bc6e53e0b97f62222276171
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Thu Nov 20 16:14:03 2025 +0700

    Feat: UI control letter history

commit f11f97f936447bdb225918abb43313f8db540d67
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Thu Nov 20 15:18:25 2025 +0700

    Squashed commit of the following:

    commit dab6adc4a98820d8686c5a336172af586b883c24
    Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
    Date:   Tue Nov 18 11:19:48 2025 +0700

        Fix: add role authorization in Resume

    commit c28fc8f7aa54048472b535ac7ccd916d5b0769c2
    Merge: 7ed1cc8 bcfb4c1
    Author: Muhammad Hasyim Chaidir Ali <68959522+Hasyim-Kai@users.noreply.github.com>
    Date:   Tue Nov 18 09:02:16 2025 +0700

        Merge branch 'dev' into feat/resume-81

    commit 7ed1cc83bfa62d8c9660ff1ee61b1f96661ef45a
    Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
    Date:   Mon Nov 17 15:04:01 2025 +0700

        Feat: add doc preview in Resume List

    commit bcfb4c1456b7b58c63d4969985200ceca72aee16
    Merge: 1cbde57 975c87d
    Author: Munawwirul Jamal <57973347+munaja@users.noreply.github.com>
    Date:   Mon Nov 17 11:15:14 2025 +0700

        Merge pull request #147 from dikstub-rssa/feat/surat-kontrol-135

        Feat: Integration Rehab Medik - Surat Kontrol

    commit 15ab43c1b143627892df2a9f82f418091b55ed7f
    Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
    Date:   Mon Nov 17 10:38:21 2025 +0700

        Feat: add verification capthca and form adjustment

    commit 53bd8e7f6e2b22b03690947f52b42744a17703ee
    Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
    Date:   Fri Nov 7 08:55:23 2025 +0700

        Fix: refactor rehab medik - Resume UI

    commit fc308809b848512a664659a51475e634e08f06f4
    Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
    Date:   Wed Oct 29 14:57:19 2025 +0700

        Feat: add UI Rehab Medik > Proses > Resume

    commit 9b383a543703f9331a7ff90d81abe16717a39884
    Merge: a4dc7d7 831749a
    Author: Muhammad Hasyim Chaidir Ali <68959522+Hasyim-Kai@users.noreply.github.com>
    Date:   Wed Oct 29 13:32:47 2025 +0700

        Merge pull request #139 from dikstub-rssa/dev

        Update branch feat/resume-81

commit 2b7bea70d66e8472220a2a2406889fc489cc1ebd
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 18 11:20:51 2025 +0700

    Fix: Typo in Control Letter

commit 808e91527cf95de2a47387bb792a3af2e16d907b
Author: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date:   Tue Nov 18 10:59:50 2025 +0700

    Fix: add role authorization in Control Letter
---
 .../app/control-letter/history-dialog.vue     | 28 ++++++
 .../app/control-letter/history-list.cfg.ts    | 85 +++++++++++++++++++
 .../content/control-letter/list.vue           | 69 ++++++++++++---
 app/components/pub/my-ui/data/print-btn.vue   | 30 +++++++
 app/lib/utils.ts                              |  2 +-
 5 files changed, 202 insertions(+), 12 deletions(-)
 create mode 100644 app/components/app/control-letter/history-dialog.vue
 create mode 100644 app/components/app/control-letter/history-list.cfg.ts
 create mode 100644 app/components/pub/my-ui/data/print-btn.vue

diff --git a/app/components/app/control-letter/history-dialog.vue b/app/components/app/control-letter/history-dialog.vue
new file mode 100644
index 00000000..7e5a2304
--- /dev/null
+++ b/app/components/app/control-letter/history-dialog.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+import { config } from './history-list.cfg'
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+}
+const props = defineProps<Props>()
+const isModalOpen = inject(`isHistoryDialogOpen`) as Ref<boolean>
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+</script>
+
+<template>
+  <Dialog v-model:open="isModalOpen" title="Riwayat Surat Kontrol" size="full">   
+    <PubMyUiDataTable
+            v-bind="config"
+            :rows="data"
+            :skeleton-size="props.paginationMeta?.pageSize"
+        />
+        <PaginationView :pagination-meta="props.paginationMeta" @page-change="handlePageChange" />
+  </Dialog>
+</template>
\ No newline at end of file
diff --git a/app/components/app/control-letter/history-list.cfg.ts b/app/components/app/control-letter/history-list.cfg.ts
new file mode 100644
index 00000000..443bf237
--- /dev/null
+++ b/app/components/app/control-letter/history-list.cfg.ts
@@ -0,0 +1,85 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+import { educationCodes, genderCodes } from '~/lib/constants'
+import { calculateAge } from '~/lib/utils'
+
+const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/print-btn.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {width: 130}, {width: 30},],
+
+  headers: [
+    [
+      { label: 'NAMA PASIEN' },
+      { label: 'NO.SURAT KONTROL' },
+      { label: 'NO.SEP' },
+      { label: 'TANGGAL RENCANA KONTROL' },
+      { label: 'TANGGAL TERBIT' },
+      { label: 'DPJP' },
+      { label: 'SPESIALIS' },
+      { label: 'SUBSPESIALIS' },
+      { label: 'TIPE RAWAT' },
+      { label: 'DIBUAT OLEH' },
+      { label: 'DIEDIT OLEH' },
+      { label: 'STATUS' },
+      { label: 'AKSI' },
+    ],
+  ],
+
+  keys: [
+    'date',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'name',
+    'status',
+    'action',
+  ],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+    date: (rec: unknown): unknown => {
+      const date = (rec as any).date
+      if (typeof date == 'object' && date) {
+        return (date as Date).toLocaleDateString('id-ID')
+      } else if (typeof date == 'string') {
+        return (date as string).substring(0, 10)
+      }
+      return date
+    },
+    specialist_subspecialist: (rec: unknown): unknown => {
+      return '-'
+    },
+    dpjp: (rec: unknown): unknown => {
+      // const { person } = rec as Patient
+      return '-'
+    },
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+    sep_status(_rec) {
+      return 'SEP Internal'
+    },
+  },
+}
diff --git a/app/components/content/control-letter/list.vue b/app/components/content/control-letter/list.vue
index c9353057..87a3d33e 100644
--- a/app/components/content/control-letter/list.vue
+++ b/app/components/content/control-letter/list.vue
@@ -11,8 +11,19 @@ import { getList, remove } from '~/services/control-letter.service'
 import { toast } from '~/components/pub/ui/toast'
 import type { Encounter } from '~/models/encounter'
 import WarningAlert from '~/components/pub/my-ui/alert/warning-alert.vue'
+import type { PagePermission } from '~/models/role'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+import { unauthorizedToast } from '~/lib/utils'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import DocPreviewDialog from '~/components/pub/my-ui/modal/doc-preview-dialog.vue'
+import HistoryDialog from '~/components/app/control-letter/history-dialog.vue'
 // #endregion
 
+// #region Permission
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/rehab/encounter']
+const { getPagePermissions } = useRBAC()
+const pagePermission = getPagePermissions(roleAccess)
+
 // #region State
 const props = defineProps<{
   encounter?: Encounter
@@ -24,6 +35,10 @@ const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSe
   fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
   entityName: 'control-letter',
 })
+const historyData = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: ['person', 'person-Addresses'] }),
+  entityName: 'control-letter-history',
+})
 
 const refSearchNav: RefSearchNav = {
   onClick: () => {
@@ -37,6 +52,10 @@ const refSearchNav: RefSearchNav = {
   },
 }
 
+const isHistoryDialogOpen = ref(false)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
+
+const isDocPreviewDialogOpen = ref(false)
 const isRecordConfirmationOpen = ref(false)
 const summaryLoading = ref(false)
 const isRequirementsMet = ref(true)
@@ -44,17 +63,20 @@ const isRequirementsMet = ref(true)
 const recId = ref<number>(0)
 const recAction = ref<string>('')
 const recItem = ref<any>(null)
+const timestamp = ref(new Date().toISOString())
 
 const headerPrep: HeaderPrep = {
   title: "Surat Kontrol",
   icon: 'i-lucide-newspaper',
-  addNav: {
+}
+if (pagePermission.canCreate) {
+  headerPrep.addNav = {
     label: "Surat Kontrol",
     onClick: () => navigateTo({
         name: 'rehab-encounter-id-control-letter-add',
         params: { id: encounterId },
       }),
-  },
+  }
 }
 // #endregion
 
@@ -105,11 +127,12 @@ function handleCancelConfirmation() {
 provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
+provide('timestamp', isLoading)
 provide('table_data_loader', isLoading)
 // #endregion
 
 // #region Watchers
-watch([recId, recAction], () => {
+watch([recId, recAction, timestamp], () => {
   switch (recAction.value) {
     case ActionEvents.showDetail:
       navigateTo({
@@ -119,17 +142,22 @@ watch([recId, recAction], () => {
       break
 
     case ActionEvents.showEdit:
-      // TODO: Handle edit action
-      // isFormEntryDialogOpen.value = true
-      navigateTo({
-        name: 'rehab-encounter-id-control-letter-control_letter_id-edit',
-        params: { id: encounterId, "control_letter_id": recId.value },
-      })
+      if(pagePermission.canUpdate){ 
+        navigateTo({
+          name: 'rehab-encounter-id-control-letter-control_letter_id-edit',
+          params: { id: encounterId, "control_letter_id": recId.value },
+        })
+      } else {
+        unauthorizedToast()
+      }
       break
 
     case ActionEvents.showConfirmDelete:
-      // Trigger confirmation modal open
-      isRecordConfirmationOpen.value = true
+      if(pagePermission.canDelete){
+        isRecordConfirmationOpen.value = true
+      } else {
+        unauthorizedToast()
+      }
       break
   }
 })
@@ -151,8 +179,19 @@ watch([recId, recAction], () => {
       :ref-search-nav="refSearchNav"
       @search="handleSearch" />
 
+    <div class="mb-3 flex justify-end items-center">
+      <Button variant="outline"
+        class="gap-1 bg-transparent items-center text-orange-400 border-orange-400"
+        @click="isHistoryDialogOpen = true">
+        <Icon name="i-lucide-history" class="h-4 w-4" /> Riwayat Program Nasional</Button>
+    </div>
+    
     <AppControlLetterList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
+    <Dialog v-model:open="isDocPreviewDialogOpen" title="Preview Dokumen" size="2xl">
+      <DocPreviewDialog :link="`https://www.antennahouse.com/hubfs/xsl-fo-sample/pdf/basic-link-1.pdf`" />
+    </Dialog>
+
     <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
       @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
       <template #default="{ record }">
@@ -172,5 +211,13 @@ watch([recId, recAction], () => {
         </div>
       </template>
     </RecordConfirmation>
+    
+      <HistoryDialog
+        v-model:is-modal-open="isHistoryDialogOpen"
+        :data="historyData.data.value"
+        :pagination-meta="historyData.paginationMeta"
+        @page-change="historyData.handlePageChange"
+      />
+
   </div>
 </template>
diff --git a/app/components/pub/my-ui/data/print-btn.vue b/app/components/pub/my-ui/data/print-btn.vue
new file mode 100644
index 00000000..a3d131b8
--- /dev/null
+++ b/app/components/pub/my-ui/data/print-btn.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+const props = defineProps<{
+  url: string
+  btnTxt?: string
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('rec_id')!
+const recAction = inject<Ref<string>>('rec_action')!
+const recItem = inject<Ref<any>>('rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+
+function handlePrint() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showPrint
+  recItem.value = props.rec
+  timestamp.value = new Date().toISOString()
+}
+</script>
+
+<template>
+  <Button 
+    class="gap-3 items-center border-orange-400 text-orange-400"
+    variant="outline" @click="handlePrint">
+    <Icon name="i-lucide-printer" class="h-4 w-4" />
+    {{ props.btnTxt || 'Preview' }}
+  </Button>
+</template>
\ No newline at end of file
diff --git a/app/lib/utils.ts b/app/lib/utils.ts
index 67f3d04b..e201a439 100644
--- a/app/lib/utils.ts
+++ b/app/lib/utils.ts
@@ -160,4 +160,4 @@ export function unauthorizedToast() {
     description: 'You are not authorized to perform this action.',
     variant: 'destructive',
   })
-}
+}
\ No newline at end of file

From 39b778ab7874cbb53a3f4b4284b1ddbe87621c74 Mon Sep 17 00:00:00 2001
From: hasyim_kai <muhammad.hasyim.c.a@gmail.com>
Date: Tue, 25 Nov 2025 14:39:41 +0700
Subject: [PATCH 07/13] Feat: UI Laporan Operasi

---
 .../surgery-report/_common/btn-history.vue    |  21 ++++
 .../app/surgery-report/_common/filter.vue     |  73 +++++++++++
 .../surgery-report/_common/history-dialog.vue |  52 ++++++++
 .../_common/radio-blood-type.vue              |  94 ++++++++++++++
 app/components/app/surgery-report/detail.vue  | 118 +++++++++++++++---
 app/components/app/surgery-report/entry.vue   | 106 +++++++++++++---
 .../app/surgery-report/multiselect-picker.vue |  33 -----
 .../operative-action-list.cfg.ts              |  56 ---------
 .../operative-action/dropdown-action.vue      |  30 +++++
 .../operative-action/list.cfg.ts              |  44 +++++++
 .../surgery-report/operative-action/list.vue  |  84 +++++++++++++
 .../operative-action/picker-dialog.vue        | 116 +++++++++++++++++
 .../content/surgery-report/detail.vue         |  34 ++---
 .../content/surgery-report/entry.vue          |  52 +-------
 .../content/surgery-report/list.vue           |  29 +++--
 .../pub/my-ui/form/view/detail-row.vue        |  10 +-
 app/components/pub/my-ui/modal/dialog.vue     |   2 -
 .../pub/my-ui/nav-header/filter.vue           |  11 +-
 .../[surgery_report_id]/index.vue             |   2 +-
 19 files changed, 756 insertions(+), 211 deletions(-)
 create mode 100644 app/components/app/surgery-report/_common/btn-history.vue
 create mode 100644 app/components/app/surgery-report/_common/filter.vue
 create mode 100644 app/components/app/surgery-report/_common/history-dialog.vue
 create mode 100644 app/components/app/surgery-report/_common/radio-blood-type.vue
 delete mode 100644 app/components/app/surgery-report/multiselect-picker.vue
 delete mode 100644 app/components/app/surgery-report/operative-action-list.cfg.ts
 create mode 100644 app/components/app/surgery-report/operative-action/dropdown-action.vue
 create mode 100644 app/components/app/surgery-report/operative-action/list.cfg.ts
 create mode 100644 app/components/app/surgery-report/operative-action/list.vue
 create mode 100644 app/components/app/surgery-report/operative-action/picker-dialog.vue

diff --git a/app/components/app/surgery-report/_common/btn-history.vue b/app/components/app/surgery-report/_common/btn-history.vue
new file mode 100644
index 00000000..972eab8e
--- /dev/null
+++ b/app/components/app/surgery-report/_common/btn-history.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { ActionEvents, type ListItemDto } from '~/components/pub/my-ui/data/types';
+import Button from '~/components/pub/ui/button/Button.vue';
+
+const props = defineProps<{
+  
+}>()
+const isModalOpen = inject<Ref<boolean>>('isHistoryDialogOpen')!
+
+function openDialog() {
+  isModalOpen.value = true
+}
+</script>
+
+<template>
+    <Button type="button" variant="outline" class="text-orange-500 border border-orange-400 bg-orange-50"
+        @click="openDialog">
+        <Icon name="i-lucide-history" class="h-4 w-4 align-middle transition-colors" />
+        History
+    </Button>
+</template>
\ No newline at end of file
diff --git a/app/components/app/surgery-report/_common/filter.vue b/app/components/app/surgery-report/_common/filter.vue
new file mode 100644
index 00000000..d5e99b30
--- /dev/null
+++ b/app/components/app/surgery-report/_common/filter.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import { cn } from '~/lib/utils'
+
+interface InstallationFormData {
+  name: string
+  code: string
+  encounterClassCode: string
+}
+
+const props = defineProps<{
+  schema: any
+  initialValues?: Partial<InstallationFormData>
+}>()
+
+const emit = defineEmits<{
+  submit: [values: InstallationFormData, resetForm: () => void]
+  reset: [resetForm: () => void]
+}>()
+
+// Form submission handler
+function onSubmitForm(values: any, { resetForm }: { resetForm: () => void }) {
+  emit('submit', values, resetForm)
+}
+
+// Form cancel handler
+function onResetForm({ resetForm }: { resetForm: () => void }) {
+  emit('reset', resetForm)
+}
+</script>
+
+<template>
+  <Form
+    v-slot="{ handleSubmit, resetForm }"
+    as=""
+    keep-values
+    :initial-values="initialValues"
+  >
+    <form id="entry-form" @submit="handleSubmit($event, (values) => onSubmitForm(values, { resetForm }))">
+      <div class="mb-5 border-b border-b-slate-300 pb-7 text-lg xl:text-xl">
+        <div class="flex flex-col justify-between">
+          <InputBase
+            field-name="patientName"
+            label="Nama Pasien"
+            placeholder="Nama Pasien"
+          />
+          <InputBase
+            field-name="cardNumber"
+            label="Nomor Kartu"
+            placeholder="Nomor Kartu"
+          />
+          <InputBase
+            field-name="sepNumber"
+            label="Nomor SEP"
+            placeholder="Nomor SEP"
+          />
+        </div>
+      </div>
+     
+      <div class="my-2 flex items-center gap-3 justify-end">
+        <Button @click="onResetForm" variant="secondary">Reset</Button>
+        <Button @click="onSubmitForm">Terapkan</Button>
+      </div>
+    </form>
+  </Form>
+</template>
diff --git a/app/components/app/surgery-report/_common/history-dialog.vue b/app/components/app/surgery-report/_common/history-dialog.vue
new file mode 100644
index 00000000..d92da4a5
--- /dev/null
+++ b/app/components/app/surgery-report/_common/history-dialog.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
+import Field from '~/components/pub/my-ui/form/field.vue'
+import Label from '~/components/pub/my-ui/form/label.vue'
+import Select from '~/components/pub/my-ui/form/select.vue'
+import { Form } from '~/components/pub/ui/form'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import SelectOriginPolyclinic from '~/components/app/bpjs/control-letter/_common/select-origin-polyclinic.vue'
+import SelectDestinationPolyclinic from '~/components/app/bpjs/control-letter/_common/select-destination-polyclinic.vue'
+import { cn } from '~/lib/utils'
+
+const props = defineProps()
+
+const items = reactive([
+  { id: 1, updatedBy: 'Kakek Sugiono', createdAt: new Date(Date.now() - 86400000 * 2) },
+  { id: 2, updatedBy: 'Kakek Sugiono', createdAt: new Date(Date.now() - 86400000) },
+  { id: 3, updatedBy: 'Kakek Sugiono', createdAt: new Date() },
+])
+const itemsCount = computed(() => items.length || 0)
+</script>
+
+<template>
+  <ul :class="cn('pb-5 flex flex-col min-h-[30rem]', '')">
+    <li v-for="(item, index) in items" :key="item.id" class="flex gap-3 items-start">
+
+      <div class="flex flex-col items-center">
+        <div class="h-5 w-5 rounded-full border-2 border-gray-300 flex items-center justify-center">
+          <div :class="cn('dark:bg-white border-gray-300 rounded-full p-1.5',
+            index === 0 ? 'bg-green-500' : 'bg-transparent'
+          )">
+          </div>
+        </div>
+
+        <hr v-if="index !== itemsCount - 1" class="h-14 w-0.5 bg-gray-300 dark:bg-gray-300" aria-hidden="true">
+      </div>
+
+      <div class="flex justify-between items-center min-w-96">
+        <div class="max-w-80">
+          <time :class="cn('mt-0 text-base font-medium text-gray-800 dark:text-gray-100', '')">
+            {{ item?.createdAt.toLocaleDateString('id-ID') }}
+          </time>
+          <h1 :class="cn('text-gray-500 dark:text-gray-400', '')">Ditambahkan Oleh : {{ item.updatedBy }}</h1>
+          <NuxtLink class="mt-1 text-orange-500" :to="`surgery-report/${item.id}`">
+            Lihat Detail
+          </NuxtLink>
+        </div>
+      </div>
+    </li>
+  </ul>
+</template>
\ No newline at end of file
diff --git a/app/components/app/surgery-report/_common/radio-blood-type.vue b/app/components/app/surgery-report/_common/radio-blood-type.vue
new file mode 100644
index 00000000..91def086
--- /dev/null
+++ b/app/components/app/surgery-report/_common/radio-blood-type.vue
@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import type { FormErrors } from '~/types/error'
+import { Label as RadioLabel } from '~/components/pub/ui/label'
+import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
+import { cn } from '~/lib/utils'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const props = defineProps<{
+  fieldName?: string
+  label?: string
+  errors?: FormErrors
+  class?: string
+  radioGroupClass?: string
+  radioItemClass?: string
+  labelClass?: string
+  isRequired?: boolean
+}>()
+
+const {
+  fieldName = 'isNewBorn',
+  label = 'Status Pasien',
+  errors,
+  class: containerClass,
+  radioGroupClass,
+  radioItemClass,
+  labelClass,
+} = props
+
+const newbornOptions = [
+  { label: 'PRC', value: 'prc' },
+  { label: 'FFP', value: 'ffp' },
+  { label: 'WB', value: 'wb' },
+  { label: 'TC', value: 'tc' },
+]
+</script>
+
+<template>
+  <DE.Cell :class="cn('radio-group-field', containerClass)" :col-span="2">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
+      {{ label }}
+    </DE.Label>
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
+        <FormItem>
+          <FormControl>
+            <RadioGroup
+              v-bind="componentField"
+              :class="cn('flex flex-row flex-wrap gap-4 sm:gap-6', radioGroupClass)"
+            >
+              <div
+                v-for="(option, index) in newbornOptions"
+                :key="option.value"
+                :class="cn('flex min-w-fit items-center space-x-2 pt-1', radioItemClass)"
+              >
+                <RadioGroupItem
+                  :id="`${fieldName}-${index}`"
+                  :value="option.value"
+                  :class="
+                    cn(
+                      'relative h-4 w-4 rounded-full border-muted-foreground before:absolute before:inset-1 before:rounded-full before:bg-primary before:opacity-0 before:transition-opacity data-[state=checked]:border-primary data-[state=checked]:bg-white data-[state=checked]:before:opacity-100 sm:h-5 sm:w-5',
+                      containerClass,
+                    )
+                  "
+                />
+                <RadioLabel
+                  :for="`${fieldName}-${index}`"
+                  :class="
+                    cn(
+                      'cursor-pointer select-none text-xs font-normal leading-none transition-colors hover:text-primary peer-disabled:cursor-not-allowed peer-disabled:opacity-70 sm:text-sm',
+                      labelClass,
+                    )
+                  "
+                >
+                  {{ option.label }}
+                </RadioLabel>
+              </div>
+            </RadioGroup>
+          </FormControl>
+          <FormMessage class="ml-0 mt-1" />
+        </FormItem>
+      </FormField>
+    </DE.Field>
+  </DE.Cell>
+</template>
diff --git a/app/components/app/surgery-report/detail.vue b/app/components/app/surgery-report/detail.vue
index e10a2b91..e0bb7727 100644
--- a/app/components/app/surgery-report/detail.vue
+++ b/app/components/app/surgery-report/detail.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import DetailRow from '~/components/pub/my-ui/form/view/detail-row.vue'
+import { type Variants, Badge } from '~/components/pub/ui/badge'
 import { cn, } from '~/lib/utils'
 import type { ControlLetter } from '~/models/control-letter'
+import * as DE from '~/components/pub/my-ui/doc-entry'
 
 // #region Props & Emits
 const props = defineProps<{
@@ -9,9 +11,18 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-  (e: 'click', type: string): void
+  (e: 'click'): void
 }>()
 
+const dummy = [
+  {
+    id: 1,
+    number: 1,
+    name: 'Operasi',
+    code: 'OP-001'
+  }
+]
+
 // #endregion
 
 // #region State & Computed
@@ -28,8 +39,8 @@ const emit = defineEmits<{
 // #endregion region
 
 // #region Utilities & event handlers
-function onClick(type: string) {
-  emit('click', type)
+function onClick() {
+  emit('click')
 }
 // #endregion
 
@@ -38,17 +49,96 @@ function onClick(type: string) {
 </script>
 
 <template>
-  <div :class="cn('min-h-[50vh] space-y-2',)">
-    <DetailRow label="Tgl Rencana Kontrol">{{ props.instance?.date ? new Date(props.instance?.date).toLocaleDateString('id-ID') : '-' }}</DetailRow>
-    <DetailRow label="Unit">{{ props.instance?.unit.name || '-' }}</DetailRow>
-    <DetailRow label="Spesialis">{{ props.instance?.specialist.name || '-' }}</DetailRow>
-    <DetailRow label="Sub Spesialis">{{ props.instance?.subspecialist.name || '-' }}</DetailRow>
-    <DetailRow label="DPJP">{{ props.instance?.doctor.employee.person.name || '-' }}</DetailRow>
-    <DetailRow label="Status SEP">{{ 'SEP INTERNAL' }}</DetailRow>
-  </div>
-  <div class="border-t-1 my-2 flex justify-end border-t-slate-300 py-2">
-    <PubMyUiNavFooterBaEd @click="onClick" />
-  </div>
+  <article :class="cn('space-y-10',)">
+    <div :class="cn('space-y-2',)">
+      <h1>Dibuat oleh {{ `Dr. Agus` }} pada {{ `11 Agustus 2025, 20.00` }}</h1>
+      <DetailRow label="Tanggal Laporan">{{ props.instance?.date ? new
+        Date(props.instance?.date).toLocaleDateString('id-ID') : '-' }}</DetailRow>
+    </div>
+    <div :class="cn('space-y-2',)">
+      <h1 class="font-semibold text-lg">Tim Pelaksanaan Operasi</h1>
+      <DetailRow label="DPJP Bedah">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Operator">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Asisten Operator">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Instrumentir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="DPJP Anastesi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Perawat Anastesi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Tanggal Pembedahan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Diagnosa Pra Bedah">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+      <DetailRow label="Perawat Pasca Bedah">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+    </div>
+
+    <div :class="cn('space-y-2',)">
+      <h1 class="font-semibold text-lg">Tindakan Operatif / Non Operatif Lain</h1>
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="w-14">No</TableHead>
+              <TableHead class="">Prosedur</TableHead>
+              <TableHead class="">Code</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in dummy" :key="idx">
+              <TableCell class="">{{ idx + 1 }}</TableCell>
+              <TableCell class="">{{ field.name }}</TableCell>
+              <TableCell class="">{{ field.code }}</TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+    
+    <div :class="cn('space-y-2',)">
+      <h1 class="font-semibold text-lg">Data Pelaksanaan Operasi</h1>
+      <DE.Block :col-count="2" :cell-flex="false">
+        <div>
+          <DetailRow label="Jenis Operasi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Kode Biling">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Sitem Operasi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Operasi Mulai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Operasi Selesai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Lama Operasi"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</DetailRow>
+          <DetailRow label="Pembiusan Mulai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Pembiusan Selesai">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Lama Pembiusan"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</DetailRow>
+        </div>
+        <div>
+          <DetailRow label="Jenis Pembedahan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Operasi ke">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Keterangan Lahir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Ket Tempat Lahir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Berat Badan">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Ket Saat Lahir">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Uraian Operasi">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Jumlah Pendarahan">{{ props.instance?.date ? props.instance?.date : '-' }} CC</DetailRow>
+        </div>
+        <div>
+          <DetailRow label="PRC">{{ props.instance?.date ? props.instance?.date : '-' }} CC</DetailRow>
+          <DetailRow label="FPP">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="WB">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="TC">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Merk">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Nama Implant">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Stiker/Nomor Register Implant">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Nama Pendamping Implant">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+        </div>
+        <div>
+          <DetailRow label-class="w-96" label="Specimen/Jaringan dikirim ke">{{ props.instance?.date ? props.instance?.date : '-' }}</DetailRow>
+          <DetailRow label="Keterangan Jaringan">
+            <Badge :variant="`outline`">
+              {{ `Example` }}
+            </Badge>
+          </DetailRow>
+        </div>
+      </DE.Block>
+    </div>
+
+    <div class="border-t-1 my-2 flex justify-end border-t-slate-300 py-2">
+      <PubMyUiNavFooterBa @click="onClick" />
+    </div>
+  </article>
 </template>
 
 <style scoped></style>
diff --git a/app/components/app/surgery-report/entry.vue b/app/components/app/surgery-report/entry.vue
index e3862ee5..8ac204f7 100644
--- a/app/components/app/surgery-report/entry.vue
+++ b/app/components/app/surgery-report/entry.vue
@@ -4,6 +4,7 @@ import { toTypedSchema } from '@vee-validate/zod'
 import { Form } from '~/components/pub/ui/form'
 import SelectDate from './_common/select-date.vue'
 import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import { FieldArray } from 'vee-validate'
 
 import * as DE from '~/components/pub/my-ui/doc-entry'
 import SelectDpjpBedah from './_common/select-dpjp-bedah.vue'
@@ -17,16 +18,18 @@ import SelectBirthDesc from './_common/select-birth-desc.vue'
 import SelectBirthPlaceDesc from './_common/select-birth-place-desc.vue'
 import SelectSpecimenType from './_common/select-specimen-type.vue'
 import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import RadioBloodType from './_common/radio-blood-type.vue'
+import OperativeActionPicker from './operative-action/picker-dialog.vue'
 
 const props = defineProps<{
   schema: any
   initialValues?: any
   errors?: FormErrors
+  operativeActionList?: any[]
 }>()
 
 const formSchema = toTypedSchema(props.schema)
 const formRef = ref()
-const isOperativeActionDialogOpen = inject<Ref<boolean>>('isOperativeActionDialogOpen')!
 
 defineExpose({
   validate: () => formRef.value?.validate(),
@@ -34,10 +37,6 @@ defineExpose({
   setValues: (values: any, shouldValidate = true) => formRef.value?.setValues(values, shouldValidate),
   values: computed(() => formRef.value?.values),
 })
-
-const handleToggleOperativeActionDialog = () => {
-  isOperativeActionDialogOpen.value = !isOperativeActionDialogOpen.value
-}
 </script>
 
 <template>
@@ -95,18 +94,20 @@ const handleToggleOperativeActionDialog = () => {
       </DE.Cell>
       <InputBase :errors="errors"
         field-name="a9"
-        label="Perawat Pra Bedah" placeholder="Isi Perawat Pra Bedah"
+        label="Perawat Pasca Bedah" placeholder="Isi Perawat Pasca Bedah"
       />
     </DE.Block>
     
     <!-- PICKER -->
-
+    <DE.Block :col-count="1" :cell-flex="false" class="w-1/2">
+      <OperativeActionPicker field-name="a63" title="Prosedur" />
+    </DE.Block>
     <!-- -->
 
     <DE.Block :col-count="3" :cell-flex="false">
       <SelectSurgeryType :errors="errors"
         field-name="a10"
-        label="Tipe Operasi" placeholder="Pilih Tipe Operasi"
+        label="Jenis Operasi" placeholder="Pilih Jenis Operasi"
         is-required
       />
       <SelectBillingCode :errors="errors"
@@ -133,32 +134,32 @@ const handleToggleOperativeActionDialog = () => {
       />
       <div>
         <p class="mt-1.5 mb-2">Lama Operasi</p>
-        <h1 class="text-lg"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
+        <h1 class="text-base"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
       </div>
       <SelectDate :errors="errors"
-        field-name="a7"
+        field-name="a44"
         label="Pembiusan Mulai"        
         is-required
         is-with-time
       />    
       <SelectDate :errors="errors"
-        field-name="a7"
+        field-name="a45"
         label="Pembiusan Selesai"        
         is-required
         is-with-time
       />
       <div>
         <p class="mt-1.5 mb-2">Lama Pembiusan</p>
-        <h1 class="text-lg"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
+        <h1 class="text-base"><b>{{ 1 }}</b> Jam <b>{{ 1 }}</b> Menit</h1>
       </div>
       <SelectDissectionType :errors="errors"
         field-name="a13"
-        label="Tipe Pembedahan" placeholder="Pilih Tipe Pembedahan"
+        label="Jenis Pembedahan" placeholder="Pilih Jenis Pembedahan"
         is-required
       />
       <SelectSurgeryOrder :errors="errors"
         field-name="a14"
-        label="Urutan Operasi" placeholder="Pilih Urutan Operasi"
+        label="Urutan Operasi Ke" placeholder="Pilih Urutan Operasi Ke"
         is-required
       />
       <SelectBirthDesc :errors="errors"
@@ -171,13 +172,88 @@ const handleToggleOperativeActionDialog = () => {
         label="Ket. Tempat Lahir" placeholder="Pilih Ket. Tempat Lahir"
         is-required
       />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Berat Badan" placeholder="Isi Berat Badan"
+        right-label="Gram"
+        numeric-only
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Ket. Saat Lahir" placeholder="Isi Ket. Saat Lahir"
+      />
+      <TextAreaInput :errors="errors"
+        field-name="a8"
+        label="Uraian Operasi" placeholder="Isi Uraian Operasi"            
+        is-required
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Jumlah Pendarahan" placeholder="Isi Jumlah Pendarahan"
+        right-label="cc"
+        numeric-only
+      />
+    </DE.Block>
+    
+
+    <DE.Block :col-count="1" :cell-flex="false" class="w-1/2">
+      <RadioBloodType :errors="errors"
+        field-name="a16"
+        label="Jenis Darah Masuk" placeholder="Pilih Jenis Darah Masuk"
+      />
+      <InputBase :errors="errors"
+        class=""
+        field-name="a6"
+        label="Jumlah Darah Masuk" placeholder="Isi Jumlah Darah Masuk"
+        right-label="cc"
+        numeric-only
+      />
+    </DE.Block>
+
+    <DE.Block :col-count="3" :cell-flex="false">
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Merk" placeholder="Isi Merk"
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Nama Implant" placeholder="Isi Nama Implant"
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Stiker / Nomor Register Implant" placeholder="Isi Stiker / Nomor Register Implant"
+      />
+      <InputBase :errors="errors"
+        field-name="a6"
+        label="Nama Penedamping Implant" placeholder="Isi Nama Penedamping Implant"
+      />
       <SelectSpecimenType :errors="errors"
         field-name="a17"
         label="Specimen/Jaringan Dikirim Ke" placeholder="Pilih Specimen/Jaringan Dikirim Ke"
         is-required
       />
     </DE.Block>
-    
+
+    <DE.Block :col-count="1" :cell-flex="false" class="w-1/2">
+          <FieldArray v-slot="{ fields, push, remove }" name="a32">
+            <div v-for="(field, idx) in fields" :key="idx" class="flex items-end gap-3 mb-3">      
+              <InputBase :errors="errors"
+                :field-name="`a32[${idx}]`"
+                label="Keterangan Jaringan" placeholder="Isi Keterangan Jaringan"
+              />
+              <Button v-if="idx !== 0" type="button" variant="destructive" size="sm" @click="remove(idx)">
+                <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+              </Button>
+            </div>
+
+            <Button type="button" variant="outline"
+              class="mt-3 w-full rounded-md border border-primary bg-white px-4 py-2 text-primary hover:border-primary hover:bg-primary hover:text-white sm:w-auto sm:text-sm"
+              @click="push(``)">
+              <Icon name="i-lucide-plus" class="mr-2 h-4 w-4 align-middle transition-colors" />
+              Tambah Keterangan Jaringan
+            </Button>
+          </FieldArray>
+    </DE.Block>
 
   </Form>
 </template>
diff --git a/app/components/app/surgery-report/multiselect-picker.vue b/app/components/app/surgery-report/multiselect-picker.vue
deleted file mode 100644
index 98a146ce..00000000
--- a/app/components/app/surgery-report/multiselect-picker.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<script setup lang="ts">
-import { config } from './operative-action-list.cfg'
-import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
-import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
-
-interface Props {
-  data: any[]
-  paginationMeta: PaginationMeta
-}
-defineProps<Props>()
-const modelValue = defineModel<any[]>('modelValue', { default: [] })
-
-const emit = defineEmits<{
-  pageChange: [page: number]
-}>()
-
-function handlePageChange(page: number) {
-  emit('pageChange', page)
-}
-</script>
-
-<template>
-  <div class="space-y-4">
-    <PubMyUiDataTable
-      select-mode="multiple"
-      v-model="modelValue"
-      v-bind="config"
-      :rows="data"
-      :skeleton-size="paginationMeta?.pageSize"
-    />
-    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
-  </div>
-</template>
diff --git a/app/components/app/surgery-report/operative-action-list.cfg.ts b/app/components/app/surgery-report/operative-action-list.cfg.ts
deleted file mode 100644
index 2d0a6637..00000000
--- a/app/components/app/surgery-report/operative-action-list.cfg.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import type { Config } from '~/components/pub/my-ui/data-table'
-import type { Patient } from '~/models/patient'
-import { defineAsyncComponent } from 'vue'
-import { educationCodes, genderCodes } from '~/lib/constants'
-import { calculateAge } from '~/lib/utils'
-
-const action = defineAsyncComponent(() => import('~/components/pub/my-ui/data/dropdown-action-dud.vue'))
-
-export const config: Config = {
-  cols: [{}, {}, {}, {}, {}, {}, {}, ],
-
-  headers: [
-    [
-      { label: 'Tgl Laporan' },
-      { label: 'DPJP Bedah' },
-      { label: 'DPJP Anastesi' },
-      { label: 'Tgl Pembedahan' },
-      { label: 'Jenis Operasi' },
-      { label: 'Kode Billing' },
-      { label: 'Sistem Operasi' },
-    ],
-  ],
-
-  keys: ['date', 'doctor.employee.person.name', 'doctor.employee.person.name', 'date', 'name', 'name', 'name'],
-
-  delKeyNames: [
-    { key: 'code', label: 'Kode' },
-    { key: 'name', label: 'Nama' },
-  ],
-
-  parses: {
-    date: (rec: unknown): unknown => {
-      const date = (rec as any).date
-      if (typeof date == 'object' && date) {
-        return (date as Date).toLocaleDateString('id-ID')
-      } else if (typeof date == 'string') {
-        return (date as string).substring(0, 10)
-      }
-      return date
-    },
-  },
-
-  components: {
-    // action(rec, idx) {
-    //   return {
-    //     idx,
-    //     rec: rec as object,
-    //     component: action,
-    //   }
-    // },
-  },
-
-  htmls: {
-    
-  },
-}
diff --git a/app/components/app/surgery-report/operative-action/dropdown-action.vue b/app/components/app/surgery-report/operative-action/dropdown-action.vue
new file mode 100644
index 00000000..7dc56c86
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/dropdown-action.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ActionEvents, type LinkItem, type ListItemDto } from '~/components/pub/my-ui/data/types';
+
+
+const props = defineProps<{
+  rec: ListItemDto
+}>()
+
+const recId = inject<Ref<number>>('ap_rec_id')!
+const recAction = inject<Ref<string>>('ap_rec_action')!
+const recItem = inject<Ref<any>>('ap_rec_item')!
+const timestamp = inject<Ref<any>>('timestamp')!
+
+const activeKey = ref<string | null>(null)
+
+function process() {
+  recId.value = props.rec.id || 0
+  recAction.value = ActionEvents.showProcess
+  recItem.value = props.rec
+  timestamp.value = new Date().getTime()
+}
+</script>
+
+<template>
+  <Button @click="process" variant="outline"
+          class="text-orange-400 border-orange-400 bg-transparent">
+          Pilih
+          <Icon name="i-lucide-arrow-right" class="h-4 w-4 align-middle transition-colors" />
+        </Button>
+</template>
diff --git a/app/components/app/surgery-report/operative-action/list.cfg.ts b/app/components/app/surgery-report/operative-action/list.cfg.ts
new file mode 100644
index 00000000..eeb08cff
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/list.cfg.ts
@@ -0,0 +1,44 @@
+import type { Config } from '~/components/pub/my-ui/data-table'
+import type { Patient } from '~/models/patient'
+import { defineAsyncComponent } from 'vue'
+import { educationCodes, genderCodes } from '~/lib/constants'
+import { calculateAge } from '~/lib/utils'
+
+const action = defineAsyncComponent(() => import('./dropdown-action.vue'))
+
+export const config: Config = {
+  cols: [{}, {}, {width: 30}, ],
+
+  headers: [
+    [
+      { label: 'Nama Prosedur' },
+      { label: 'Code' },
+      { label: 'Action' },
+    ],
+  ],
+
+  keys: ['name', 'code', 'action',],
+
+  delKeyNames: [
+    { key: 'code', label: 'Kode' },
+    { key: 'name', label: 'Nama' },
+  ],
+
+  parses: {
+
+  },
+
+  components: {
+    action(rec, idx) {
+      return {
+        idx,
+        rec: rec as object,
+        component: action,
+      }
+    },
+  },
+
+  htmls: {
+    
+  },
+}
diff --git a/app/components/app/surgery-report/operative-action/list.vue b/app/components/app/surgery-report/operative-action/list.vue
new file mode 100644
index 00000000..8b025e4f
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/list.vue
@@ -0,0 +1,84 @@
+<script setup lang="ts">
+// Components
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
+import type { PaginationMeta } from '~/components/pub/my-ui/pagination/pagination.type'
+import PaginationView from '~/components/pub/my-ui/pagination/pagination-view.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
+import { toast } from '~/components/pub/ui/toast'
+import { config } from './list.cfg'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
+import { ProcedureSrcSchema, type ProcedureSrcFormData } from '~/schemas/procedure-src.schema'
+
+// Handlers
+import {
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} from '~/handlers/procedure-src.handler'
+
+// Services
+import { getList, getDetail } from '~/services/procedure-src.service'
+
+const title = ref('')
+
+interface Props {
+  data: any[]
+  paginationMeta: PaginationMeta
+  processFn: (input: unknown) => void
+}
+const props = defineProps<Props>()
+
+const recId = ref<string>(``)
+const recAction = ref<string>(``)
+const recItem = ref<any>({})
+const timestamp = ref<any>({})
+provide('ap_rec_id', recId)
+provide('ap_rec_action', recAction)
+provide('ap_rec_item', recItem)
+provide('timestamp', timestamp)
+
+const emit = defineEmits<{
+  pageChange: [page: number]
+  toggleDialog: []
+}>()
+
+function handlePageChange(page: number) {
+  emit('pageChange', page)
+}
+
+watch([recId, recAction, ], () => {
+  switch (recAction.value) {
+    case ActionEvents.showProcess:
+      props.processFn({
+        id: recId.value,
+        code: recItem.value.code,
+        name: recItem.value.name,
+      })
+      emit('toggleDialog')
+      break
+  }
+})
+</script>
+
+<template>
+  <div class="space-y-4">
+    <PubMyUiDataTable
+      v-bind="config"
+      :rows="data"
+      :skeleton-size="paginationMeta?.pageSize"
+    />
+    <PaginationView :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+  </div>
+</template>
diff --git a/app/components/app/surgery-report/operative-action/picker-dialog.vue b/app/components/app/surgery-report/operative-action/picker-dialog.vue
new file mode 100644
index 00000000..a568c159
--- /dev/null
+++ b/app/components/app/surgery-report/operative-action/picker-dialog.vue
@@ -0,0 +1,116 @@
+<script setup lang="ts">
+import ProcedureListDialog from './list.vue'
+import type { FormErrors } from '~/types/error'
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form } from '~/components/pub/ui/form'
+import { FieldArray } from 'vee-validate'
+import InputBase from '~/components/pub/my-ui/form/input-base.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import TextAreaInput from '~/components/pub/my-ui/form/text-area-input.vue'
+import { cn } from '~/lib/utils'
+import TableHeader from '~/components/pub/ui/table/TableHeader.vue'
+import { is } from 'date-fns/locale'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import List from './list.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
+import Header from '~/components/pub/my-ui/nav-header/prep.vue'
+import { getList, getDetail } from '~/services/procedure-src.service'
+import { ActionEvents, type HeaderPrep, type RefSearchNav } from '~/components/pub/my-ui/data/types'
+
+interface Props {
+  fieldName: string
+  title: string
+}
+const props = defineProps<Props>()
+const isOperativeActionDialogOpen = ref(false)
+provide("isOperativeActionDialogOpen", isOperativeActionDialogOpen);
+
+const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSearch, fetchData } = usePaginatedList({
+  fetchFn: (params) => getList({ ...params, includes: 'specialist,subspecialist,doctor-employee-person', }),
+  entityName: 'surgery-report',
+})
+const headerPrep: HeaderPrep = {
+  title: props.title,
+  icon: 'i-lucide-clipboard-list',
+}
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    // open filter modal
+  },
+  onInput: (val: string) => {
+    searchInput.value = val
+  },
+  onClear: () => {
+    searchInput.value = ''
+  },
+}
+
+const handleToggleOperativeActionDialog = () => {
+  isOperativeActionDialogOpen.value = !isOperativeActionDialogOpen.value
+}
+
+const dummy = [
+  {
+    id: 1,
+    number: 1,
+    name: 'Operasi',
+    code: 'OP-001'
+  }
+]
+</script>
+
+<template>
+  <div class="">
+    <div class="mb-2 flex justify-between">
+      <h1 class="mb-2 font-medium">{{ title }}</h1>
+      <Button @click="isOperativeActionDialogOpen = true" size="xs" variant="outline"
+        class="text-orange-400 border-orange-400 bg-transparent">
+        <Icon name="i-lucide-search" class="h-4 w-4 align-middle transition-colors" />
+        Pilih {{ title }}
+      </Button>
+    </div>
+
+    <FieldArray v-slot="{ fields, push, remove }" :name="props.fieldName">
+      <Dialog
+        v-model:open="isOperativeActionDialogOpen"
+        title="" size="xl">
+        <Header
+              :prep="headerPrep"
+              :ref-search-nav="refSearchNav"
+              v-model:search="searchInput"
+              @search="handleSearch" />
+        <!-- <List :data="dummy" :process-fn="push" /> -->
+        <List
+          :data="dummy"
+          :pagination-meta="paginationMeta"
+          @page-change="handlePageChange"
+          @toggle-dialog="handleToggleOperativeActionDialog"
+          :process-fn="push"
+        />
+      </Dialog>
+
+      <div class="border border-gray-200 rounded-lg overflow-hidden">
+        <Table>
+          <TableHeader class="bg-gray-100">
+            <TableRow>
+              <TableHead class="">Prosedur</TableHead>
+              <TableHead class="">Code</TableHead>
+              <TableHead class="w-24">Action</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            <TableRow v-for="(field, idx) in fields" :key="idx">
+              <TableCell class="">{{ field.value?.name }}</TableCell>
+              <TableCell class="">{{ field.value?.code }}</TableCell>
+              <TableCell class="">
+                <Button type="button" variant="destructive" size="sm" @click="remove(idx)">
+                  <Icon name="i-lucide-trash-2" class="h-4 w-4" />
+                </Button>
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </div>
+    </FieldArray>
+  </div>
+</template>
diff --git a/app/components/content/surgery-report/detail.vue b/app/components/content/surgery-report/detail.vue
index 00d15f21..7c266329 100644
--- a/app/components/content/surgery-report/detail.vue
+++ b/app/components/content/surgery-report/detail.vue
@@ -32,14 +32,14 @@ const headerPrep: HeaderPrep = {
 // #endregion
 
 // #region Lifecycle Hooks
-onMounted(async () => {
-  const result = await getDetail(controlLetterId, {
-    includes: "unit,specialist,subspecialist,doctor-employee-person",
-  })
-  if (result.success) {
-    controlLetter.value = result.body?.data
-  }
-})
+// onMounted(async () => {
+//   const result = await getDetail(controlLetterId, {
+//     includes: "unit,specialist,subspecialist,doctor-employee-person",
+//   })
+//   if (result.success) {
+//     controlLetter.value = result.body?.data
+//   }
+// })
 // #endregion
 
 // #region Functions
@@ -50,19 +50,8 @@ function goBack() {
 // #endregion region
 
 // #region Utilities & event handlers
-function handleAction(type: string) {
-  switch (type) {
-    // case 'edit':
-    //   navigateTo({
-    //     name: 'rehab-encounter-id-surgery-report-control_letter_id-edit',
-    //     params: { id: encounterId, "control_letter_id": controlLetterId },
-    //   })
-    //   break
-
-    case 'back':
-      goBack()
-      break
-  }
+function handleAction() {
+  goBack()
 }
 // #endregion
 
@@ -72,6 +61,5 @@ function handleAction(type: string) {
 
 <template>
   <Header :prep="headerPrep" :ref-search-nav="headerPrep.refSearchNav" />
-
-  <AppSurgeryReportDetail :instance="controlLetter" @click="handleAction" />
+  <AppSurgeryReportDetail :instance="surgeryReport" @click="handleAction" />
 </template>
diff --git a/app/components/content/surgery-report/entry.vue b/app/components/content/surgery-report/entry.vue
index d36fcec1..ff817905 100644
--- a/app/components/content/surgery-report/entry.vue
+++ b/app/components/content/surgery-report/entry.vue
@@ -15,6 +15,7 @@ import { ResponsiblePersonSchema } from '~/schemas/person-relative.schema'
 import { uploadAttachment } from '~/services/patient.service'
 import { getDetail, update } from '~/services/surgery-report.service'
 import type { SurgeryReport } from '~/models/surgery-report'
+import ActionDialog from '~/components/pub/my-ui/nav-footer/ba-su.vue'
 
 import { toast } from '~/components/pub/ui/toast'
 import { withBase } from '~/models/_base'
@@ -48,24 +49,6 @@ const inputForm = ref<ExposedForm<any> | null>(null)
 const surgeryReport = ref({})
 const isConfirmationOpen = ref(false)
 const selectedOperativeAction = ref<any>(null)
-const isOperativeActionDialogOpen = ref(false)
-provide("isOperativeActionDialogOpen", isOperativeActionDialogOpen);
-
-const headerPrep: HeaderPrep = {
-  title: "Pilih Tindakan",
-  icon: 'i-lucide-history',
-}
-const refSearchNav: RefSearchNav = {
-  onClick: () => {
-    // open filter modal
-  },
-  onInput: (val: string) => {
-    searchInput.value = val
-  },
-  onClear: () => {
-    searchInput.value = ''
-  },
-}
 // #endregion
 
 // #region Lifecycle Hooks
@@ -131,13 +114,6 @@ async function handleActionClick(eventType: string) {
 function handleCancelAdd() {
   isConfirmationOpen.value = false
 }
-
-function actionDialogHandler(type: string) {
-  if (type === 'submit') {
-    // icdPreview.value.procedures = selectedOperativeAction.value || []
-  }
-  isOperativeActionDialogOpen.value = false
-}
 // #endregion
 
 // #region Watchers
@@ -146,39 +122,17 @@ function actionDialogHandler(type: string) {
 
 <template>
   <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Update Laporan Operasi</div>
+  <code>{{ selectedOperativeAction }}</code>
   <AppSurgeryReportEntry
     ref="inputForm"
     :schema="SurgeryReportSchema"
+    :operative-action-list="[]"
   />
   
   <div class="my-2 flex justify-end py-2">
     <Action :enable-draft="false" @click="handleActionClick" />
   </div>
 
-  
-  <Dialog
-    v-model:open="isOperativeActionDialogOpen"
-    title=""
-    size="xl"
-  >
-    <Header
-      :prep="headerPrep"
-      :ref-search-nav="refSearchNav"
-      v-model:search="searchInput"
-      @search="handleSearch" />
-
-    <AppSurgeryReportPicker
-      v-model:model-value="selectedOperativeAction"
-      :data="data"
-      :pagination-meta="paginationMeta"
-      @page-change="handlePageChange"
-    />
-
-    <div class="my-2 flex justify-end py-2">
-      <ActionDialog @click="actionDialogHandler" />
-    </div>
-  </Dialog>
-
   <Confirmation
     v-model:open="isConfirmationOpen"
     title="Simpan Data"
diff --git a/app/components/content/surgery-report/list.vue b/app/components/content/surgery-report/list.vue
index eddd10c7..82bbd7b3 100644
--- a/app/components/content/surgery-report/list.vue
+++ b/app/components/content/surgery-report/list.vue
@@ -27,6 +27,7 @@ const { data, isLoading, paginationMeta, searchInput, handlePageChange, handleSe
   entityName: 'surgery-report',
 })
 
+const isHistoryDialogOpen = ref(false)
 const isFilterDialogOpen = ref(false)
 const isRecordConfirmationOpen = ref(false)
 const summaryLoading = ref(false)
@@ -58,6 +59,12 @@ const refSearchNav: RefSearchNav = {
     searchInput.value = ''
   },
 }
+  headerPrep.components = [
+    {
+      component: defineAsyncComponent(() => import('~/components/app/surgery-report/_common/btn-history.vue')),
+      props: {  }
+    },
+  ];
 // #endregion
 
 // #region Lifecycle Hooks
@@ -79,6 +86,9 @@ async function getListData() {
 }
 
 // Handle confirmation result
+function handleFiltering(value: any) {
+  isFilterDialogOpen.value = false
+}
 async function handleConfirmDelete(record: any, action: string) {
   if (action === 'delete' && record?.id) {
     try {
@@ -108,6 +118,7 @@ provide('rec_id', recId)
 provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
+provide('isHistoryDialogOpen', isHistoryDialogOpen)
 // #endregion
 
 // #region Watchers
@@ -148,10 +159,7 @@ watch([recId, recAction], () => {
     ]" />
 
   <div v-else>
-    <Header v-model:search="searchInput"
-      :prep="headerPrep"
-      :ref-search-nav="refSearchNav"
-      @search="handleSearch" />
+    <Header :prep="headerPrep" />
 
     <Filter
       :prep="headerPrep"
@@ -162,14 +170,11 @@ watch([recId, recAction], () => {
     <AppSurgeryReportList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
     <Dialog v-model:open="isFilterDialogOpen" title="Filter" size="lg">
-      <!-- <AppEncounterFilter
-        :installation="{
-          msg: { placeholder: 'Pilih' },
-          items: [],
-        }"
-        :schema="{}"
-      /> -->
-      aaaaaaa   
+      <AppSurgeryReportCommonFilter @submit="handleFiltering" />
+    </Dialog>
+
+    <Dialog v-model:open="isHistoryDialogOpen" title="History">
+      <AppSurgeryReportCommonHistoryDialog />
     </Dialog>
 
     <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
diff --git a/app/components/pub/my-ui/form/view/detail-row.vue b/app/components/pub/my-ui/form/view/detail-row.vue
index 2b2b8f6f..c46b77b6 100644
--- a/app/components/pub/my-ui/form/view/detail-row.vue
+++ b/app/components/pub/my-ui/form/view/detail-row.vue
@@ -1,13 +1,17 @@
 <script setup lang="ts">
-defineProps<{
+import { cn } from '~/lib/utils';
+
+const props = defineProps<{
   label: string
+  class?: string
+  labelClass?: string
 }>()
 </script>
 
 <template>
-  <div class="flex flex-col gap-1 lg:grid lg:grid-cols-[180px_minmax(0,1fr)] lg:gap-x-3">
+  <div :class="cn(`flex flex-col gap-1 lg:grid lg:grid-cols-[180px_minmax(0,1fr)] lg:gap-x-3`, props.class)">
     <!-- Label -->
-    <span class="text-md font-normal text-muted-foreground">
+    <span :class="cn(`text-md font-normal text-muted-foreground`, props.labelClass)">
       {{ label }}
     </span>
 
diff --git a/app/components/pub/my-ui/modal/dialog.vue b/app/components/pub/my-ui/modal/dialog.vue
index e5bc5ab4..560b4733 100644
--- a/app/components/pub/my-ui/modal/dialog.vue
+++ b/app/components/pub/my-ui/modal/dialog.vue
@@ -2,8 +2,6 @@
 import { Dialog } from '~/components/pub/ui/dialog'
 import DialogContent from '~/components/pub/ui/dialog/DialogContent.vue'
 import DialogDescription from '~/components/pub/ui/dialog/DialogDescription.vue'
-import DialogContent from '~/components/pub/ui/dialog/DialogContent.vue'
-import DialogDescription from '~/components/pub/ui/dialog/DialogDescription.vue'
 
 interface DialogProps {
   title: string
diff --git a/app/components/pub/my-ui/nav-header/filter.vue b/app/components/pub/my-ui/nav-header/filter.vue
index f4fef2b3..27b93a1b 100644
--- a/app/components/pub/my-ui/nav-header/filter.vue
+++ b/app/components/pub/my-ui/nav-header/filter.vue
@@ -50,8 +50,11 @@ const value = ref({
   end: todayCalendar,
 }) as Ref<DateRange>
 
+
+function onInput(event: Event) {
+  props.refSearchNav?.onInput((event.target as HTMLInputElement).value)
+}
 function onFilterClick() {
-  console.log('Search:', searchQuery.value)
   console.log('Date Range:', dateRange.value)
   props.refSearchNav?.onClick()
 }
@@ -60,9 +63,11 @@ function onFilterClick() {
 <template>
   <header>
     <div class="flex items-center gap-2 mb-4 2xl:mb-5">
-      <div class="relative w-64">
+      
+      <div v-if="refSearchNav" class="relative w-64">
         <Search class="absolute left-3 top-1/2 size-4 -translate-y-1/2 text-gray-400" />
-        <Input v-model="searchQuery" type="text" placeholder="Cari Nama /No.RM" class="pl-9" />
+        <Input v-model="searchQuery" @input="onInput"
+          type="text" placeholder="Cari .." class="pl-9" />
       </div>
 
       <Popover>
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
index 7d9db6bd..df4cfdef 100644
--- 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
@@ -7,7 +7,7 @@ definePageMeta({
   middleware: ['rbac'],
   roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
   title: 'Detail Surat Kontrol',
-  contentFrame: 'cf-container-md',
+  contentFrame: 'cf-full-width',
 })
 
 const route = useRoute()

From 9b7a7192a04052abf2baf6c6196a5182a3ffe0fb Mon Sep 17 00:00:00 2001
From: Andrian Roshandy <andrianovsky95@gmail.com>
Date: Mon, 1 Dec 2025 08:31:14 +0700
Subject: [PATCH 08/13] feat/page-cleaning: menu adjustment

---
 app/handlers/encounter-init.handler.ts | 166 ++++++++++++++++---------
 1 file changed, 107 insertions(+), 59 deletions(-)

diff --git a/app/handlers/encounter-init.handler.ts b/app/handlers/encounter-init.handler.ts
index 886be1a1..3e1e85f3 100644
--- a/app/handlers/encounter-init.handler.ts
+++ b/app/handlers/encounter-init.handler.ts
@@ -55,23 +55,29 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  earlyNurseryAssessment: {
+    id: 'early-nursery-assessment',
+    title: 'Pengkajian Awal Keperawatan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
   earlyMedicalAssessment: {
     id: 'early-medical-assessment',
     title: 'Pengkajian Awal Medis',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  rehabMedicalAssessment: {
+  earlyMedicalRehabAssessment: {
     id: 'rehab-medical-assessment',
     title: 'Pengkajian Awal Medis Rehabilitasi Medis',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    classCode: ['ambulatory'],
     unit: 'rehab',
     afterId: 'early-medical-assessment',
   },
   functionAssessment: {
     id: 'function-assessment',
     title: 'Asesmen Fungsi',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    classCode: ['ambulatory'],
     unit: 'rehab',
     afterId: 'rehab-medical-assessment',
   },
@@ -102,16 +108,22 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  consent: {
-    id: 'consent',
+  generalConsent: {
+    id: 'general-consent',
     title: 'General Consent',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  patientNote: {
-    id: 'patient-note',
+  patientAmbNote: {
+    id: 'patient-amb-note',
     title: 'CPRJ',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    classCode: ['ambulatory', 'emergency'],
+    unit: 'all',
+  },
+  patientDevNote: {
+    id: 'patient-dev-note',
+    title: 'CPP',
+    classCode: ['inpatient'],
     unit: 'all',
   },
   prescription: {
@@ -120,38 +132,38 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  device: {
+  deviceOrder: {
     id: 'device-order',
     title: 'Order Alkes',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuRadiology: {
-    id: 'mcu-radiology',
+  radiologyOrder: {
+    id: 'radiology-order',
     title: 'Order Radiologi',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuLabPc: {
-    id: 'mcu-lab-pc',
+  cpLabOrder: {
+    id: 'cp-lab-order',
     title: 'Order Lab PK',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuLabMicro: {
-    id: 'mcu-lab-micro',
+  microLabOrder: {
+    id: 'micro-lab-order',
     title: 'Order Lab Mikro',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  mcuLabPa: {
-    id: 'mcu-lab-pa',
+  paLabOrder: {
+    id: 'pa-lab-order',
     title: 'Order Lab PA',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  medicalAction: {
-    id: 'medical-action',
+  actionRoomOrder: {
+    id: 'action-room-order',
     title: 'Order Ruang Tindakan',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
@@ -162,24 +174,48 @@ const defaultKeys: Record<string, any> = {
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  actionReport: {
+    id: 'action-report',
+    title: 'Laporan Tindakan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  surgeryReport: {
+    id: 'surgery-report',
+    title: 'Laporan Operasi',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  vacsinData: {
+    id: 'vacsin-data',
+    title: 'Data Vaksin',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
   consultation: {
     id: 'consultation',
     title: 'Konsultasi',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
-  resume: {
-    id: 'resume',
-    title: 'Resume',
-    classCode: ['ambulatory', 'emergency', 'inpatient'],
-    unit: 'all',
-  },
-  control: {
-    id: 'control',
+  controlLetter: {
+    id: 'control-letter',
     title: 'Surat Kontrol',
     classCode: ['ambulatory', 'emergency', 'inpatient'],
     unit: 'all',
   },
+  inpatientLetter: {
+    id: 'inpatient-letter',
+    title: 'SPRI',
+    classCode: ['ambulatory', 'emergency'],
+    unit: 'all',
+  },  
+  refBack: {
+    id: 'reference-back',
+    title: 'PRB',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },  
   screening: {
     id: 'screening',
     title: 'Skrinning MPP',
@@ -190,7 +226,19 @@ const defaultKeys: Record<string, any> = {
     id: 'supporting-document',
     title: 'Upload Dokumen Pendukung',
     classCode: ['ambulatory'],
-    unit: 'rehab',
+    unit: 'all',
+  },
+  resume: {
+    id: 'resume',
+    title: 'Resume',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
+  },
+  ambResume: {
+    id: 'amb-resume',
+    title: 'Resume Medis Rawat Jalan',
+    classCode: ['ambulatory', 'emergency', 'inpatient'],
+    unit: 'all',
   },
   priceList: {
     id: 'price-list',
@@ -244,12 +292,12 @@ export function injectComponents(id: string | number, data: EncounterListData, m
       label: currentKeys.earlyMedicalAssessment['title'],
     }
   }
-  if (currentKeys?.rehabMedicalAssessment) {
-    currentKeys.rehabMedicalAssessment['component'] = EarlyMedicalRehabListAsync
-    currentKeys.rehabMedicalAssessment['props'] = {
+  if (currentKeys?.earlyMedicalRehabAssessment) {
+    currentKeys.earlyMedicalRehabAssessment['component'] = EarlyMedicalRehabListAsync
+    currentKeys.earlyMedicalRehabAssessment['props'] = {
       encounter: data?.encounter,
       type: 'early-rehab',
-      label: currentKeys.rehabMedicalAssessment['title'],
+      label: currentKeys.earlyMedicalRehabAssessment['title'],
     }
   }
   if (currentKeys?.functionAssessment) {
@@ -287,44 +335,44 @@ export function injectComponents(id: string | number, data: EncounterListData, m
     currentKeys.educationAssessment['component'] = null
     currentKeys.educationAssessment['props'] = { encounter_id: id }
   }
-  if (currentKeys?.consent) {
-    currentKeys.consent['component'] = GeneralConsentListAsync
-    currentKeys.consent['props'] = { encounter_id: id }
+  if (currentKeys?.generalConsent) {
+    currentKeys.generalConsent['component'] = GeneralConsentListAsync
+    currentKeys.generalConsent['props'] = { encounter_id: id }
   }
-  if (currentKeys?.patientNote) {
-    currentKeys.patientNote['component'] = CprjAsync
-    currentKeys.patientNote['props'] = { encounter_id: id }
+  if (currentKeys?.patientAmbNote) {
+    currentKeys.patientAmbNote['component'] = CprjAsync
+    currentKeys.patientAmbNote['props'] = { encounter_id: id }
   }
   if (currentKeys?.prescription) {
     currentKeys.prescription['component'] = PrescriptionAsync
     currentKeys.prescription['props'] = { encounter_id: id }
   }
-  if (currentKeys?.device) {
-    currentKeys.device['component'] = DeviceOrderAsync
-    currentKeys.device['props'] = { encounter_id: id }
+  if (currentKeys?.deviceOrder) {
+    currentKeys.deviceOrder['component'] = DeviceOrderAsync
+    currentKeys.deviceOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuRadiology) {
-    currentKeys.mcuRadiology['component'] = RadiologyAsync
-    currentKeys.mcuRadiology['props'] = { encounter_id: id }
+  if (currentKeys?.radiologyOrder) {
+    currentKeys.radiologyOrder['component'] = RadiologyAsync
+    currentKeys.radiologyOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuLabPc) {
-    currentKeys.mcuLabPc['component'] = CpLabOrderAsync
-    currentKeys.mcuLabPc['props'] = { encounter_id: id }
+  if (currentKeys?.cpLabOrder) {
+    currentKeys.cpLabOrder['component'] = CpLabOrderAsync
+    currentKeys.cpLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuLabMicro) {
-    // TODO: add component for mcuLabMicro
-    currentKeys.mcuLabMicro['component'] = null
-    currentKeys.mcuLabMicro['props'] = { encounter_id: id }
+  if (currentKeys?.microLabOrder) {
+    // TODO: add component for microLabOrder
+    currentKeys.microLabOrder['component'] = null
+    currentKeys.microLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.mcuLabPa) {
-    // TODO: add component for mcuLabPa
-    currentKeys.mcuLabPa['component'] = null
-    currentKeys.mcuLabPa['props'] = { encounter_id: id }
+  if (currentKeys?.paLabOrder) {
+    // TODO: add component for paLabOrder
+    currentKeys.paLabOrder['component'] = null
+    currentKeys.paLabOrder['props'] = { encounter_id: id }
   }
-  if (currentKeys?.medicalAction) {
-    // TODO: add component for medicalAction
-    currentKeys.medicalAction['component'] = null
-    currentKeys.medicalAction['props'] = { encounter_id: id }
+  if (currentKeys?.actionRoomOrder) {
+    // TODO: add component for actionRoomOrder
+    currentKeys.actionRoomOrder['component'] = null
+    currentKeys.actionRoomOrder['props'] = { encounter_id: id }
   }
   if (currentKeys?.mcuResult) {
     // TODO: add component for mcuResult

From 5659aba87594c38812b0464174333d7a7febbd4b Mon Sep 17 00:00:00 2001
From: Andrian Roshandy <andrianovsky95@gmail.com>
Date: Tue, 2 Dec 2025 03:23:26 +0700
Subject: [PATCH 09/13] feat/page-cleaning: adjust encounter quick info

---
 app/components/app/encounter/quick-info.vue | 56 +++++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/app/components/app/encounter/quick-info.vue b/app/components/app/encounter/quick-info.vue
index 17e1053b..4705264b 100644
--- a/app/components/app/encounter/quick-info.vue
+++ b/app/components/app/encounter/quick-info.vue
@@ -7,17 +7,37 @@ const props = defineProps<{
   data: Encounter
 }>()
 
-let address = ref('')
-if (props.data.patient.person.addresses) {
-  address.value = props.data.patient.person.addresses.map((a) => a.address).join(', ')
-}
+const addressText = computed(() => {
+  if (props.data.patient.person.addresses && props.data.patient.person.addresses.length > 0) {
+    return props.data.patient.person.addresses.map((a) => a.address).join(', ')
+  }
+  return '-'
+})
 
-let dpjp = ref('')
+const paymentMethodText = computed(() => {
+  const code = props.data.paymentMethod_code
+  if (!code) return '-'
+
+  // Map payment method codes
+  if (code === 'insurance') {
+    return 'JKN'
+  } else if (code === 'jkn') {
+    return 'JKN'
+  } else if (code === 'jkmm') {
+    return 'JKMM'
+  } else if (code === 'spm') {
+    return 'SPM'
+  } else if (code === 'pks') {
+    return 'PKS'
+  }
+})
+
+let dpjpText = ref('')
 if (props.data.responsible_doctor) {
   const dp = props.data.responsible_doctor.employee.person
-  dpjp.value = `${dp.frontTitle} ${dp.name} ${dp.endTitle}`
+  dpjpText.value = `${dp.frontTitle} ${dp.name} ${dp.endTitle}`
 } else if (props.data.appointment_doctor) {
-  dpjp.value = props.data.appointment_doctor.employee.person.name
+  dpjpText.value = props.data.appointment_doctor.employee.person.name
 }
 </script>
 
@@ -31,7 +51,7 @@ if (props.data.responsible_doctor) {
       <div>
         <DE.Block mode="preview">
           <DE.Cell>
-            <DE.Label class="font-semibold">No. RM</DE.Label>
+            <DE.Label class="font-semibold">Tgl. Lahir</DE.Label>
             <DE.Colon />
             <DE.Field>
               {{ data.patient.person.birthDate?.substring(0, 10) }}
@@ -48,7 +68,7 @@ if (props.data.responsible_doctor) {
             <DE.Label class="font-semibold">Alamat</DE.Label>
             <DE.Colon />
             <DE.Field>
-              <div v-html="address"></div>
+              {{ addressText }}
             </DE.Field>
           </DE.Cell>
         </DE.Block>
@@ -70,7 +90,7 @@ if (props.data.responsible_doctor) {
             </DE.Field>
           </DE.Cell>
           <DE.Cell>
-            <DE.Label position="dynamic" class="font-semibold">Klinik</DE.Label>
+            <DE.Label position="dynamic" class="font-semibold">Diagnosa</DE.Label>
             <DE.Colon />
             <DE.Field>
               {{ data.unit?.name }}
@@ -84,17 +104,21 @@ if (props.data.responsible_doctor) {
             <DE.Label position="dynamic" class="font-semibold">DPJP</DE.Label>
             <DE.Colon />
             <DE.Field>
-              {{ dpjp }}
+              {{ dpjpText }}
             </DE.Field>
           </DE.Cell>
           <DE.Cell>
-            <DE.Label
-              position="dynamic"
-              class="!text-base font-semibold 2xl:!text-lg"
-            >
+            <DE.Label position="dynamic" class="font-semibold">Pembayaran</DE.Label>
+            <DE.Colon />
+            <DE.Field>
+              {{ paymentMethodText }}
+            </DE.Field>
+          </DE.Cell>
+          <DE.Cell>
+            <DE.Label position="dynamic" class="!text-base !font-semibold 2xl:!text-lg">
               Billing
             </DE.Label>
-            <DE.Colon class="pt-1" />
+            <DE.Colon class="pt-1"/>
             <DE.Field class="text-base 2xl:text-lg">
               Rp. 000.000
               <!-- {{ data }} -->

From 88a2dc5aba3a03fbecc5462776cc6e79729e4e56 Mon Sep 17 00:00:00 2001
From: Andrian Roshandy <andrianovsky95@gmail.com>
Date: Tue, 2 Dec 2025 10:02:00 +0700
Subject: [PATCH 10/13] feat/page-cleaning: adjust add encounter

---
 app/components/app/encounter/entry-form.vue   | 338 ++++++------
 .../app/encounter/entry-form.vue.backup       | 499 ++++++++++++++++++
 app/components/content/encounter/entry.vue    |  61 ++-
 app/handlers/encounter-entry.handler.ts       |  32 +-
 app/models/doctor.ts                          |   8 +-
 app/models/encounter.ts                       |  17 +-
 app/schemas/integration-encounter.schema.ts   |  40 +-
 app/services/_crud-base.ts                    |   2 +-
 app/services/doctor.service.ts                |   6 +-
 9 files changed, 779 insertions(+), 224 deletions(-)
 create mode 100644 app/components/app/encounter/entry-form.vue.backup

diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 22acbbb8..66d2e4e3 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -1,43 +1,57 @@
 <script setup lang="ts">
 // Components
-import Block from '~/components/pub/my-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/my-ui/doc-entry/field.vue'
-import Label from '~/components/pub/my-ui/doc-entry/label.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
 import { Button } from '~/components/pub/ui/button'
 import { Input } from '~/components/pub/ui/input'
-import Select from '~/components/pub/ui/select/Select.vue'
-import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import * as CB from '~/components/pub/my-ui/combobox'
+
 import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
-import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
 import FileUpload from '~/components/pub/my-ui/form/file-field.vue'
 
 // Types
 import { IntegrationEncounterSchema, type IntegrationEncounterFormData } from '~/schemas/integration-encounter.schema'
 import type { PatientEntity } from '~/models/patient'
-import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
 
 // Helpers
 import { toTypedSchema } from '@vee-validate/zod'
 import { useForm } from 'vee-validate'
 import { refDebounced } from '@vueuse/core'
+import type { Doctor } from '~/models/doctor'
 
+// References
+import { paymentMethodCodes } from '~/const/key-val/common'
+
+// App things
+import { genEncounter, type Encounter } from '~/models/encounter'
+
+// Props
 const props = defineProps<{
   isLoading?: boolean
   isReadonly?: boolean
   isSepValid?: boolean
   isCheckingSep?: boolean
-  doctor?: any[]
-  subSpecialist?: any[]
-  specialists?: TreeItem[]
-  payments: any[]
+  doctorItems?: CB.Item[]
+  selectedDoctor: Doctor
+  // subSpecialist?: any[]
+  // specialists?: TreeItem[]
+  // paymentMethods: PaymentMethodCode[]
   participantGroups?: any[]
   seps: any[]
   patient?: PatientEntity | null | undefined
-  objects?: any
+  // objects?: any
 }>()
 
+// Model
+const model = defineModel<Encounter>()
+model.value = genEncounter()
+
+// Common preparation
+const defaultCBItems = [{ label: 'Pilih', value: '' }];
+const paymentMethodItems = CB.recStrToItem(paymentMethodCodes)
+
+// Emit preparation
 const emit = defineEmits<{
+  (e: 'onSelectDoctor', code: string): void
   (e: 'event', menu: string, value?: any): void
   (e: 'fetch', value?: any): void
 }>()
@@ -48,10 +62,10 @@ const { handleSubmit, errors, defineField, meta } = useForm<IntegrationEncounter
 })
 
 // Bind fields and extract attrs
-const [doctorId, doctorIdAttrs] = defineField('doctorId')
-const [subSpecialistId, subSpecialistIdAttrs] = defineField('subSpecialistId')
+const [doctorCode, doctorCodeAttrs] = defineField('doctor_code')
+const [unitCode, unitCodeAttrs] = defineField('unit_code')
 const [registerDate, registerDateAttrs] = defineField('registerDate')
-const [paymentType, paymentTypeAttrs] = defineField('paymentType')
+const [paymentMethodCode, paymentMethodCodeAttrs] = defineField('paymentMethod_code')
 const [patientCategory, patientCategoryAttrs] = defineField('patientCategory')
 const [cardNumber, cardNumberAttrs] = defineField('cardNumber')
 const [sepType, sepTypeAttrs] = defineField('sepType')
@@ -68,30 +82,50 @@ const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
 const isSepValid = computed(() => props.isSepValid || false)
 const isCheckingSep = computed(() => props.isCheckingSep || false)
 
-const doctorOpts = computed(() => {
-  // Add default option
-  const defaultOption = [{ label: 'Pilih', value: '' }]
-  // Add doctors from props
-  const doctors = props.doctor || []
-  return [...defaultOption, ...doctors]
-})
+// Unit, specialist, subspecialist
+const unitFullName = ref('')
+watch(() => props.selectedDoctor, (doctor) => {
+    unitFullName.value = doctor.subspecialist?.name ??
+      doctor.specialist?.name ??
+      doctor.unit?.name ??
+      'tidak diketahui'
+    model.value!.unit_code = doctor.unit_code || ''
+    model.value!.specialist_code = doctor.specialist_code || ''
+    model.value!.subspecialist_code = doctor.subspecialist_code || ''
+  },
+)
+// const doctorOpts = computed(() => {
+//   const defaultOption = [{ label: 'Pilih', value: '' }]
+//   const doctors = props.doctors || []
+//   return [...defaultOption, ...doctors]
+// })
+// watch(doctorCode, (newValue) => {
+//   // doctor.value = props.doctors?.find(doc => doc.code === newValue)
+//   unitFullName.value = doctor.value?.subspecialist?.name ??
+//     doctor.value?.specialist?.name ??
+//     doctor.value?.unit?.name ??
+//     'tidak diketahui'
+//   model.value!.responsible_doctor_code = doctor.value?.code
+//   // const unitName = selectedDoctor?.specialist?.name || ''
+//   // emit('event', 'unit-changed', unitName)
+// })
 
-const isJKNPayment = computed(() => paymentType.value === 'jkn')
+const isJKNPayment = computed(() => paymentMethodCode.value === 'jkn')
 
-async function onFetchChildren(parentId: string): Promise<void> {
-  console.log('onFetchChildren', parentId)
-}
+// async function onFetchChildren(parentId: string): Promise<void> {
+//   console.log('onFetchChildren', parentId)
+// }
 
 // Watch specialist/subspecialist selection to fetch doctors
-watch(subSpecialistId, async (newValue) => {
-  if (newValue) {
-    console.log('SubSpecialist changed:', newValue)
-    // Reset doctor selection
-    doctorId.value = ''
-    // Emit fetch event to parent
-    emit('fetch', { subSpecialistId: newValue })
-  }
-})
+// watch(subSpecialistCode, async (newValue) => {
+//   if (newValue) {
+//     console.log('SubSpecialist changed:', newValue)
+//     // Reset doctor selection
+//     doctorCode.value = ''
+//     // Emit fetch event to parent
+//     emit('fetch', { subSpecialistCode: newValue })
+//   }
+// })
 
 // Debounced SEP number watcher: emit change only after user stops typing
 const debouncedSepNumber = refDebounced(sepNumber, 500)
@@ -100,25 +134,25 @@ watch(debouncedSepNumber, (newValue) => {
 })
 
 // Sync props to form fields
-watch(
-  () => props.objects,
-  (objects) => {
-    if (objects && Object.keys(objects).length > 0) {
-      patientName.value = objects?.patientName || ''
-      nationalIdentity.value = objects?.nationalIdentity || ''
-      medicalRecordNumber.value = objects?.medicalRecordNumber || ''
-      doctorId.value = objects?.doctorId || ''
-      subSpecialistId.value = objects?.subSpecialistId || ''
-      registerDate.value = objects?.registerDate || ''
-      paymentType.value = objects?.paymentType || ''
-      patientCategory.value = objects?.patientCategory || ''
-      cardNumber.value = objects?.cardNumber || ''
-      sepType.value = objects?.sepType || ''
-      sepNumber.value = objects?.sepNumber || ''
-    }
-  },
-  { deep: true, immediate: true },
-)
+// watch(
+//   () => props.objects,
+//   (objects) => {
+//     if (objects && Object.keys(objects).length > 0) {
+//       patientName.value = objects?.patientName || ''
+//       nationalIdentity.value = objects?.nationalIdentity || ''
+//       medicalRecordNumber.value = objects?.medicalRecordNumber || ''
+//       doctorCode.value = objects?.doctorCode || ''
+//       subSpecialistCode.value = objects?.subSpecialistCode || ''
+//       registerDate.value = objects?.registerDate || ''
+//       paymentMethodCode.value = objects?.paymentMethodCode || ''
+//       patientCategory.value = objects?.patientCategory || ''
+//       cardNumber.value = objects?.cardNumber || ''
+//       sepType.value = objects?.sepType || ''
+//       sepNumber.value = objects?.sepNumber || ''
+//     }
+//   },
+//   { deep: true, immediate: true },
+// )
 
 watch(
   () => props.patient,
@@ -136,11 +170,11 @@ watch(
 function onAddSep() {
   const formValues = {
     patientId: patientId.value || '',
-    doctorCode: doctorId.value,
-    subSpecialistCode: subSpecialistId.value,
+    doctorCode: doctorCode.value,
+    // subSpecialistCode: subSpecialistCode.value,
     registerDate: registerDate.value,
     cardNumber: cardNumber.value,
-    paymentType: paymentType.value,
+    paymentMethodCode: paymentMethodCode.value,
     sepType: sepType.value
   }
   emit('event', 'add-sep', formValues)
@@ -158,14 +192,14 @@ const formRef = ref<HTMLFormElement | null>(null)
 function submitForm() {
   console.log('🔵 submitForm called, formRef:', formRef.value)
   console.log('🔵 Form values:', {
-    doctorId: doctorId.value,
-    subSpecialistId: subSpecialistId.value,
+    doctorCode: doctorCode.value,
+    // subSpecialistCode: subSpecialistCode.value,
     registerDate: registerDate.value,
-    paymentType: paymentType.value,
+    paymentMethodCode: paymentMethodCode.value,
   })
   console.log('🔵 Form errors:', errors.value)
   console.log('🔵 Form meta:', meta.value)
-  
+
   // Trigger form submit using native form submit
   // This will trigger validation and onSubmit handler
   if (formRef.value) {
@@ -179,7 +213,7 @@ function submitForm() {
       preventDefault: () => {},
       target: formRef.value || {},
     } as SubmitEvent
-    
+
     // Call onSubmit directly
     console.log('🔵 Calling onSubmit with mock event')
     onSubmit(mockEvent)
@@ -231,149 +265,151 @@ defineExpose({
         </div>
       </div>
 
-      <Block
+      <DE.Block
         labelSize="thin"
         class="!pt-0"
         :colCount="3"
         :cellFlex="false"
       >
-        <Cell>
-          <Label height="compact">Nama Pasien</Label>
-          <Field :errMessage="errors.patientName">
+        <DE.Cell>
+          <DE.Label height="compact">Nama Pasien</DE.Label>
+          <DE.Field :errMessage="errors.patientName">
             <Input
               id="patientName"
               v-model="patientName"
               v-bind="patientNameAttrs"
               :disabled="true"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">NIK</Label>
-          <Field :errMessage="errors.nationalIdentity">
+        <DE.Cell>
+          <DE.Label height="compact">NIK</DE.Label>
+          <DE.Field :errMessage="errors.nationalIdentity">
             <Input
               id="nationalIdentity"
               v-model="nationalIdentity"
               v-bind="nationalIdentityAttrs"
               :disabled="true"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">No. RM</Label>
-          <Field :errMessage="errors.medicalRecordNumber">
+        <DE.Cell>
+          <DE.Label height="compact">No. RM</DE.Label>
+          <DE.Field :errMessage="errors.medicalRecordNumber">
             <Input
               id="medicalRecordNumber"
               v-model="medicalRecordNumber"
               v-bind="medicalRecordNumberAttrs"
               :disabled="true"
             />
-          </Field>
-        </Cell>
-      </Block>
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
 
       <hr />
 
       <!-- Data Kunjungan -->
       <h3 class="text-lg font-semibold">Data Kunjungan</h3>
 
-      <Block
+      <DE.Block
         labelSize="thin"
         class="!pt-0"
         :colCount="3"
         :cellFlex="false"
       >
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Dokter
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.doctorId">
-            <Combobox
-              id="doctorId"
-              v-model="doctorId"
-              v-bind="doctorIdAttrs"
-              :items="doctorOpts"
+          </DE.Label>
+          <DE.Field :errMessage="errors.doctor_code">
+            <CB.Combobox
+              id="doctorCode"
+              v-model="doctorCode"
+              v-bind="doctorCodeAttrs"
+              :items="[...defaultCBItems, ...doctorItems]"
               :is-disabled="isLoading || isReadonly"
               placeholder="Pilih Dokter"
               search-placeholder="Cari Dokter"
               empty-message="Dokter tidak ditemukan"
+              @update:model-value="(value) => emit('onSelectDoctor', value)"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Spesialis / Subspesialis
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.subSpecialistId">
-            <TreeSelect
-              id="subSpecialistId"
-              v-model="subSpecialistId"
-              v-bind="subSpecialistIdAttrs"
+          </DE.Label>
+          <DE.Field :errMessage="errors.unit_code">
+            <Input :value="unitFullName"/>
+            <!-- <TreeSelect
+              id="subSpecialistCode"
+              v-model="subSpecialistCode"
+              v-bind="subSpecialistCodeAttrs"
               :data="specialists || []"
               :on-fetch-children="onFetchChildren"
-            />
-          </Field>
-        </Cell>
-      </Block>
+            /> -->
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
 
-      <Block
+      <DE.Block
         labelSize="thin"
         class="!pt-0"
         :colCount="3"
         :cellFlex="false"
       >
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Tanggal Daftar
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.registerDate">
+          </DE.Label>
+          <DE.Field :errMessage="errors.registerDate">
             <DatepickerSingle
               id="registerDate"
               v-model="registerDate"
               v-bind="registerDateAttrs"
               placeholder="Pilih tanggal"
             />
-          </Field>
-        </Cell>
+          </DE.Field>
+        </DE.Cell>
 
-        <Cell>
-          <Label height="compact">
+        <DE.Cell>
+          <DE.Label height="compact">
             Jenis Pembayaran
             <span class="text-red-500">*</span>
-          </Label>
-          <Field :errMessage="errors.paymentType">
-            <Select
-              id="paymentType"
-              v-model="paymentType"
-              v-bind="paymentTypeAttrs"
-              :items="payments"
+          </DE.Label>
+          <DE.Field :errMessage="errors.paymentMethod_code">
+            <CB.Combobox
+              id="paymentMethodCode"
+              v-model="paymentMethodCode"
+              v-bind="paymentMethodCodeAttrs"
+              :items="paymentMethodItems"
               :disabled="isLoading || isReadonly"
               placeholder="Pilih Jenis Pembayaran"
             />
-          </Field>
-        </Cell>
-      </Block>
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
 
       <!-- BPJS Fields (conditional) -->
       <template v-if="isJKNPayment">
-        <Block
+        <DE.Block
           labelSize="thin"
           class="!pt-0"
           :colCount="3"
           :cellFlex="false"
         >
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               Kelompok Peserta
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.patientCategory">
+            </DE.Label>
+            <DE.Field :errMessage="errors.patientCategory">
               <Select
                 id="patientCategory"
                 v-model="patientCategory"
@@ -382,15 +418,15 @@ defineExpose({
                 :disabled="isLoading || isReadonly"
                 placeholder="Pilih Kelompok Peserta"
               />
-            </Field>
-          </Cell>
+            </DE.Field>
+          </DE.Cell>
 
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               No. Kartu BPJS
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.cardNumber">
+            </DE.Label>
+            <DE.Field :errMessage="errors.cardNumber">
               <Input
                 id="cardNumber"
                 v-model="cardNumber"
@@ -398,15 +434,15 @@ defineExpose({
                 :disabled="isLoading || isReadonly"
                 placeholder="Masukkan nomor kartu BPJS"
               />
-            </Field>
-          </Cell>
+            </DE.Field>
+          </DE.Cell>
 
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               Jenis SEP
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.sepType">
+            </DE.Label>
+            <DE.Field :errMessage="errors.sepType">
               <Select
                 id="sepType"
                 v-model="sepType"
@@ -415,22 +451,22 @@ defineExpose({
                 :disabled="isLoading || isReadonly"
                 placeholder="Pilih Jenis SEP"
               />
-            </Field>
-          </Cell>
-        </Block>
+            </DE.Field>
+          </DE.Cell>
+        </DE.Block>
 
-        <Block
+        <DE.Block
           labelSize="thin"
           class="!pt-0"
           :colCount="3"
           :cellFlex="false"
         >
-          <Cell>
-            <Label height="compact">
+          <DE.Cell>
+            <DE.Label height="compact">
               No. SEP
               <span class="text-red-500">*</span>
-            </Label>
-            <Field :errMessage="errors.sepNumber">
+            </DE.Label>
+            <DE.Field :errMessage="errors.sepNumber">
               <div class="flex gap-2">
                 <Input
                   id="sepNumber"
@@ -474,8 +510,8 @@ defineExpose({
                   />
                 </Button>
               </div>
-            </Field>
-          </Cell>
+            </DE.Field>
+          </DE.Cell>
 
           <FileUpload
             field-name="sepFile"
@@ -492,7 +528,7 @@ defineExpose({
             :accept="['pdf', 'jpg', 'png']"
             :max-size-mb="1"
           />
-        </Block>
+        </DE.Block>
       </template>
     </form>
   </div>
diff --git a/app/components/app/encounter/entry-form.vue.backup b/app/components/app/encounter/entry-form.vue.backup
new file mode 100644
index 00000000..f92b7736
--- /dev/null
+++ b/app/components/app/encounter/entry-form.vue.backup
@@ -0,0 +1,499 @@
+<script setup lang="ts">
+// Components
+import Block from '~/components/pub/my-ui/doc-entry/block.vue'
+import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
+import Field from '~/components/pub/my-ui/doc-entry/field.vue'
+import Label from '~/components/pub/my-ui/doc-entry/label.vue'
+import { Button } from '~/components/pub/ui/button'
+import { Input } from '~/components/pub/ui/input'
+import Select from '~/components/pub/ui/select/Select.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
+import TreeSelect from '~/components/pub/my-ui/select-tree/tree-select.vue'
+import FileUpload from '~/components/pub/my-ui/form/file-field.vue'
+
+// Types
+import { IntegrationEncounterSchema, type IntegrationEncounterFormData } from '~/schemas/integration-encounter.schema'
+import type { PatientEntity } from '~/models/patient'
+import type { TreeItem } from '~/components/pub/my-ui/select-tree/type'
+
+// Helpers
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+import { refDebounced } from '@vueuse/core'
+
+const props = defineProps<{
+  isLoading?: boolean
+  isReadonly?: boolean
+  isSepValid?: boolean
+  isCheckingSep?: boolean
+  doctor?: any[]
+  subSpecialist?: any[]
+  specialists?: TreeItem[]
+  payments: any[]
+  participantGroups?: any[]
+  seps: any[]
+  patient?: PatientEntity | null | undefined
+  objects?: any
+}>()
+
+const emit = defineEmits<{
+  (e: 'event', menu: string, value?: any): void
+  (e: 'fetch', value?: any): void
+}>()
+
+// Validation schema
+const { handleSubmit, errors, defineField, meta } = useForm<IntegrationEncounterFormData>({
+  validationSchema: toTypedSchema(IntegrationEncounterSchema),
+})
+
+// Bind fields and extract attrs
+const [doctorId, doctorIdAttrs] = defineField('doctorId')
+const [subSpecialistId, subSpecialistIdAttrs] = defineField('subSpecialistId')
+const [registerDate, registerDateAttrs] = defineField('registerDate')
+const [paymentType, paymentTypeAttrs] = defineField('paymentType')
+const [patientCategory, patientCategoryAttrs] = defineField('patientCategory')
+const [cardNumber, cardNumberAttrs] = defineField('cardNumber')
+const [sepType, sepTypeAttrs] = defineField('sepType')
+const [sepNumber, sepNumberAttrs] = defineField('sepNumber')
+const [patientName, patientNameAttrs] = defineField('patientName')
+const [nationalIdentity, nationalIdentityAttrs] = defineField('nationalIdentity')
+const [medicalRecordNumber, medicalRecordNumberAttrs] = defineField('medicalRecordNumber')
+const patientId = ref('')
+
+const isLoading = props.isLoading !== undefined ? props.isLoading : false
+const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
+
+// SEP validation state from props
+const isSepValid = computed(() => props.isSepValid || false)
+const isCheckingSep = computed(() => props.isCheckingSep || false)
+
+const doctorOpts = computed(() => {
+  // Add default option
+  const defaultOption = [{ label: 'Pilih', value: '' }]
+  // Add doctors from props
+  const doctors = props.doctor || []
+  return [...defaultOption, ...doctors]
+})
+
+const isJKNPayment = computed(() => paymentType.value === 'jkn')
+
+async function onFetchChildren(parentId: string): Promise<void> {
+  console.log('onFetchChildren', parentId)
+}
+
+// Watch specialist/subspecialist selection to fetch doctors
+watch(subSpecialistId, async (newValue) => {
+  if (newValue) {
+    console.log('SubSpecialist changed:', newValue)
+    // Reset doctor selection
+    doctorId.value = ''
+    // Emit fetch event to parent
+    emit('fetch', { subSpecialistId: newValue })
+  }
+})
+
+// Debounced SEP number watcher: emit change only after user stops typing
+const debouncedSepNumber = refDebounced(sepNumber, 500)
+watch(debouncedSepNumber, (newValue) => {
+  emit('event', 'sep-number-changed', newValue)
+})
+
+// Sync props to form fields
+watch(
+  () => props.objects,
+  (objects) => {
+    if (objects && Object.keys(objects).length > 0) {
+      patientName.value = objects?.patientName || ''
+      nationalIdentity.value = objects?.nationalIdentity || ''
+      medicalRecordNumber.value = objects?.medicalRecordNumber || ''
+      doctorId.value = objects?.doctorId || ''
+      subSpecialistId.value = objects?.subSpecialistId || ''
+      registerDate.value = objects?.registerDate || ''
+      paymentType.value = objects?.paymentType || ''
+      patientCategory.value = objects?.patientCategory || ''
+      cardNumber.value = objects?.cardNumber || ''
+      sepType.value = objects?.sepType || ''
+      sepNumber.value = objects?.sepNumber || ''
+    }
+  },
+  { deep: true, immediate: true },
+)
+
+watch(
+  () => props.patient,
+  (patient) => {
+    if (patient && Object.keys(patient).length > 0) {
+      patientId.value = patient?.id ? String(patient.id) : ''
+      patientName.value = patient?.person?.name || ''
+      nationalIdentity.value = patient?.person?.residentIdentityNumber || ''
+      medicalRecordNumber.value = patient?.number || ''
+    }
+  },
+  { deep: true, immediate: true },
+)
+
+function onAddSep() {
+  const formValues = {
+    patientId: patientId.value || '',
+    doctorCode: doctorId.value,
+    subSpecialistCode: subSpecialistId.value,
+    registerDate: registerDate.value,
+    cardNumber: cardNumber.value,
+    paymentType: paymentType.value,
+    sepType: sepType.value
+  }
+  emit('event', 'add-sep', formValues)
+}
+
+// Submit handler
+const onSubmit = handleSubmit((values) => {
+  console.log('✅ Validated form values:', JSON.stringify(values, null, 2))
+  emit('event', 'save', values)
+})
+
+// Expose submit method for parent component
+const formRef = ref<HTMLFormElement | null>(null)
+
+function submitForm() {
+  console.log('🔵 submitForm called, formRef:', formRef.value)
+  console.log('🔵 Form values:', {
+    doctorId: doctorId.value,
+    subSpecialistId: subSpecialistId.value,
+    registerDate: registerDate.value,
+    paymentType: paymentType.value,
+  })
+  console.log('🔵 Form errors:', errors.value)
+  console.log('🔵 Form meta:', meta.value)
+
+  // Trigger form submit using native form submit
+  // This will trigger validation and onSubmit handler
+  if (formRef.value) {
+    console.log('🔵 Calling formRef.value.requestSubmit()')
+    formRef.value.requestSubmit()
+  } else {
+    console.warn('⚠️ formRef.value is null, cannot submit form')
+    // Fallback: directly call onSubmit handler
+    // Create a mock event object
+    const mockEvent = {
+      preventDefault: () => {},
+      target: formRef.value || {},
+    } as SubmitEvent
+
+    // Call onSubmit directly
+    console.log('🔵 Calling onSubmit with mock event')
+    onSubmit(mockEvent)
+  }
+}
+
+defineExpose({
+  submitForm,
+})
+</script>
+
+<template>
+  <div class="mx-auto w-full">
+    <form
+      ref="formRef"
+      @submit.prevent="onSubmit"
+      class="grid gap-6 p-4"
+    >
+      <!-- Data Pasien -->
+      <div class="flex flex-col gap-2">
+        <h3 class="text-lg font-semibold">Data Pasien</h3>
+        <div class="flex items-center gap-2">
+          <span class="text-sm">sudah pernah terdaftar sebagai pasien?</span>
+          <Button
+            variant="outline"
+            type="button"
+            class="h-[40px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50"
+            @click="emit('event', 'search')"
+          >
+            <Icon
+              name="i-lucide-search"
+              class="h-5 w-5"
+            />
+            Cari Pasien
+          </Button>
+          <span class="text-sm">belum pernah terdaftar sebagai pasien?</span>
+          <Button
+            variant="outline"
+            type="button"
+            class="h-[40px] rounded-md border-orange-400 text-orange-400 hover:bg-green-50"
+            @click="emit('event', 'add')"
+          >
+            <Icon
+              name="i-lucide-plus"
+              class="h-5 w-5"
+            />
+            Tambah Pasien Baru
+          </Button>
+        </div>
+      </div>
+
+      <Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <Cell>
+          <Label height="compact">Nama Pasien</Label>
+          <Field :errMessage="errors.patientName">
+            <Input
+              id="patientName"
+              v-model="patientName"
+              v-bind="patientNameAttrs"
+              :disabled="true"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">NIK</Label>
+          <Field :errMessage="errors.nationalIdentity">
+            <Input
+              id="nationalIdentity"
+              v-model="nationalIdentity"
+              v-bind="nationalIdentityAttrs"
+              :disabled="true"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">No. RM</Label>
+          <Field :errMessage="errors.medicalRecordNumber">
+            <Input
+              id="medicalRecordNumber"
+              v-model="medicalRecordNumber"
+              v-bind="medicalRecordNumberAttrs"
+              :disabled="true"
+            />
+          </Field>
+        </Cell>
+      </Block>
+
+      <hr />
+
+      <!-- Data Kunjungan -->
+      <h3 class="text-lg font-semibold">Data Kunjungan</h3>
+
+      <Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <Cell>
+          <Label height="compact">
+            Dokter
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.doctorId">
+            <Combobox
+              id="doctorId"
+              v-model="doctorId"
+              v-bind="doctorIdAttrs"
+              :items="doctorOpts"
+              :is-disabled="isLoading || isReadonly"
+              placeholder="Pilih Dokter"
+              search-placeholder="Cari Dokter"
+              empty-message="Dokter tidak ditemukan"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">
+            Spesialis / Subspesialis
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.subSpecialistId">
+            <TreeSelect
+              id="subSpecialistId"
+              v-model="subSpecialistId"
+              v-bind="subSpecialistIdAttrs"
+              :data="specialists || []"
+              :on-fetch-children="onFetchChildren"
+            />
+          </Field>
+        </Cell>
+      </Block>
+
+      <Block
+        labelSize="thin"
+        class="!pt-0"
+        :colCount="3"
+        :cellFlex="false"
+      >
+        <Cell>
+          <Label height="compact">
+            Tanggal Daftar
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.registerDate">
+            <DatepickerSingle
+              id="registerDate"
+              v-model="registerDate"
+              v-bind="registerDateAttrs"
+              placeholder="Pilih tanggal"
+            />
+          </Field>
+        </Cell>
+
+        <Cell>
+          <Label height="compact">
+            Jenis Pembayaran
+            <span class="text-red-500">*</span>
+          </Label>
+          <Field :errMessage="errors.paymentType">
+            <Select
+              id="paymentType"
+              v-model="paymentType"
+              v-bind="paymentTypeAttrs"
+              :items="payments"
+              :disabled="isLoading || isReadonly"
+              placeholder="Pilih Jenis Pembayaran"
+            />
+          </Field>
+        </Cell>
+      </Block>
+
+      <!-- BPJS Fields (conditional) -->
+      <template v-if="isJKNPayment">
+        <Block
+          labelSize="thin"
+          class="!pt-0"
+          :colCount="3"
+          :cellFlex="false"
+        >
+          <Cell>
+            <Label height="compact">
+              Kelompok Peserta
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.patientCategory">
+              <Select
+                id="patientCategory"
+                v-model="patientCategory"
+                v-bind="patientCategoryAttrs"
+                :items="participantGroups || []"
+                :disabled="isLoading || isReadonly"
+                placeholder="Pilih Kelompok Peserta"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label height="compact">
+              No. Kartu BPJS
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.cardNumber">
+              <Input
+                id="cardNumber"
+                v-model="cardNumber"
+                v-bind="cardNumberAttrs"
+                :disabled="isLoading || isReadonly"
+                placeholder="Masukkan nomor kartu BPJS"
+              />
+            </Field>
+          </Cell>
+
+          <Cell>
+            <Label height="compact">
+              Jenis SEP
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.sepType">
+              <Select
+                id="sepType"
+                v-model="sepType"
+                v-bind="sepTypeAttrs"
+                :items="seps"
+                :disabled="isLoading || isReadonly"
+                placeholder="Pilih Jenis SEP"
+              />
+            </Field>
+          </Cell>
+        </Block>
+
+        <Block
+          labelSize="thin"
+          class="!pt-0"
+          :colCount="3"
+          :cellFlex="false"
+        >
+          <Cell>
+            <Label height="compact">
+              No. SEP
+              <span class="text-red-500">*</span>
+            </Label>
+            <Field :errMessage="errors.sepNumber">
+              <div class="flex gap-2">
+                <Input
+                  id="sepNumber"
+                  v-model="sepNumber"
+                  v-bind="sepNumberAttrs"
+                  placeholder="Tambah SEP terlebih dahulu"
+                  class="flex-1"
+                  :disabled="isLoading || isReadonly"
+                />
+                <Button
+                  v-if="!isSepValid"
+                  variant="outline"
+                  type="button"
+                  class="bg-primary"
+                  size="sm"
+                  :disabled="isCheckingSep || isLoading || isReadonly"
+                  @click="onAddSep"
+                >
+                  <Icon
+                    v-if="isCheckingSep"
+                    name="i-lucide-loader-2"
+                    class="h-4 w-4 animate-spin"
+                  />
+                   <Icon
+                    v-else
+                    name="i-lucide-plus"
+                    class="h-4 w-4"
+                  />
+                </Button>
+                <Button
+                  v-else
+                  variant="outline"
+                  type="button"
+                  class="bg-green-500 text-white hover:bg-green-600"
+                  size="sm"
+                  disabled
+                >
+                  <Icon
+                    name="i-lucide-check"
+                    class="h-4 w-4"
+                  />
+                </Button>
+              </div>
+            </Field>
+          </Cell>
+
+          <FileUpload
+            field-name="sepFile"
+            label="Dokumen SEP"
+            placeholder="Unggah dokumen SEP"
+            :accept="['pdf', 'jpg', 'png']"
+            :max-size-mb="1"
+          />
+
+          <FileUpload
+            field-name="sippFile"
+            label="Dokumen SIPP"
+            placeholder="Unggah dokumen SIPP"
+            :accept="['pdf', 'jpg', 'png']"
+            :max-size-mb="1"
+          />
+        </Block>
+      </template>
+    </form>
+  </div>
+</template>
diff --git a/app/components/content/encounter/entry.vue b/app/components/content/encounter/entry.vue
index 228d165e..203d781a 100644
--- a/app/components/content/encounter/entry.vue
+++ b/app/components/content/encounter/entry.vue
@@ -8,8 +8,11 @@ import AppViewPatient from '~/components/app/patient/view-patient.vue'
 import { refDebounced } from '@vueuse/core'
 
 // Handlers
+import { getDetail as getDoctorDetail  } from '~/services/doctor.service'
 import { useEncounterEntry } from '~/handlers/encounter-entry.handler'
+import { genDoctor, type Doctor } from '~/models/doctor'
 
+// Props
 const props = defineProps<{
   id: number
   classCode?: 'ambulatory' | 'emergency' | 'inpatient' | 'outpatient'
@@ -54,7 +57,33 @@ const {
 } = useEncounterEntry(props)
 
 const debouncedSepNumber = refDebounced(sepNumber, 500)
+const selectedDoctor = ref<Doctor>(genDoctor())
 
+provide('rec_select_id', recSelectId)
+provide('table_data_loader', isLoading)
+
+watch(debouncedSepNumber, async (newValue) => {
+  await getValidateSepNumber(newValue)
+})
+
+watch(
+  () => formObjects.value?.paymentType,
+  (newValue) => {
+    isSepValid.value = false
+    if (newValue !== 'jkn') {
+      sepNumber.value = ''
+    }
+  },
+)
+
+onMounted(async () => {
+  await handleInit()
+  if (props.id > 0) {
+    await loadEncounterDetail()
+  }
+})
+
+///// Functions
 function handleSavePatient() {
   selectedPatientObject.value = null
   setTimeout(() => {
@@ -100,29 +129,13 @@ async function handleEvent(menu: string, value?: any) {
   }
 }
 
-provide('rec_select_id', recSelectId)
-provide('table_data_loader', isLoading)
-
-watch(debouncedSepNumber, async (newValue) => {
-  await getValidateSepNumber(newValue)
-})
-
-watch(
-  () => formObjects.value?.paymentType,
-  (newValue) => {
-    isSepValid.value = false
-    if (newValue !== 'jkn') {
-      sepNumber.value = ''
-    }
-  },
-)
-
-onMounted(async () => {
-  await handleInit()
-  if (props.id > 0) {
-    await loadEncounterDetail()
+async function getDoctorInfo(value: string) {
+  const resp = await getDoctorDetail(value, { includes: 'unit,specialist,subspecialist'})
+  if (resp.success) {
+    selectedDoctor.value = resp.body.data
+    // console.log(selectedDoctor.value)
   }
-})
+}
 </script>
 
 <template>
@@ -144,9 +157,11 @@ onMounted(async () => {
     :seps="sepsList"
     :participant-groups="participantGroupsList"
     :specialists="specialistsTree"
-    :doctor="doctorsList"
+    :doctorItems="doctorsList"
+    :selectedDoctor="selectedDoctor"
     :patient="selectedPatientObject"
     :objects="formObjects"
+    @on-select-doctor="getDoctorInfo"
     @event="handleEvent"
     @fetch="handleFetch"
   />
diff --git a/app/handlers/encounter-entry.handler.ts b/app/handlers/encounter-entry.handler.ts
index 71594ebf..4d29defb 100644
--- a/app/handlers/encounter-entry.handler.ts
+++ b/app/handlers/encounter-entry.handler.ts
@@ -70,18 +70,18 @@ export function useEncounterEntry(props: {
   })
 
   function getListPath(): string {
-    if (props.classCode === 'ambulatory' && props.subClassCode === 'rehab') {
-      return '/rehab/encounter'
-    }
-    if (props.classCode === 'ambulatory' && props.subClassCode === 'reg') {
-      return '/outpatient/encounter'
-    }
-    if (props.classCode === 'emergency') {
-      return '/emergency/encounter'
-    }
-    if (props.classCode === 'inpatient') {
-      return '/inpatient/encounter'
+    if (props.classCode === 'ambulatory') {
+      return '/ambulatory/encounter'
     }
+    // if (props.classCode === 'ambulatory' && props.subClassCode === 'reg') {
+    //   return '/outpatient/encounter'
+    // }
+    // if (props.classCode === 'emergency') {
+    //   return '/emergency/encounter'
+    // }
+    // if (props.classCode === 'inpatient') {
+    //   return '/inpatient/encounter'
+    // }
     return '/encounter'
   }
 
@@ -257,11 +257,10 @@ export function useEncounterEntry(props: {
 
   async function handleFetchDoctors(subSpecialistId: string | null = null) {
     try {
-      const filterParams: any = { 'page-size': 100, includes: 'employee-Person' }
+      const filterParams: any = { 'page-size': 100, includes: 'employee-Person,unit,specialist,subspecialist' }
 
       if (!subSpecialistId) {
-        const doctors = await getDoctorValueLabelList(filterParams, true)
-        doctorsList.value = doctors
+        doctorsList.value = await getDoctorValueLabelList(filterParams, true)
         return
       }
 
@@ -273,8 +272,7 @@ export function useEncounterEntry(props: {
         filterParams['specialist-id'] = subSpecialistId
       }
 
-      const doctors = await getDoctorValueLabelList(filterParams, true)
-      doctorsList.value = doctors
+      doctorsList.value = await getDoctorValueLabelList(filterParams, true)
     } catch (error) {
       console.error('Error fetching doctors:', error)
       doctorsList.value = []
@@ -497,7 +495,7 @@ export function useEncounterEntry(props: {
       if (paymentMethodCode) {
         payload.paymentMethod_code = paymentMethodCode
       }
-      
+
       if (paymentMethodCode === 'insurance') {
         payload.insuranceCompany_id = formValues.insuranceCompany_id ?? null
         if (memberNumber) payload.member_number = memberNumber
diff --git a/app/models/doctor.ts b/app/models/doctor.ts
index 1b631907..297f9372 100644
--- a/app/models/doctor.ts
+++ b/app/models/doctor.ts
@@ -1,5 +1,6 @@
 import { type Base, genBase } from "./_base"
 import { type Employee, genEmployee } from "./employee"
+import type { Unit } from "./unit"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
 
@@ -9,10 +10,11 @@ export interface Doctor extends Base {
   ihs_number: string
   sip_number: string
   code?: string
-  unit_icode?: number
-  specialist_icode?: number
+  unit_code?: string
+  unit?: Unit
+  specialist_code?: string
   specialist?: Specialist
-  subspecialist_icode?: number
+  subspecialist_code?: string
   subspecialist?: Subspecialist
   bpjs_code?: string
 }
diff --git a/app/models/encounter.ts b/app/models/encounter.ts
index 85a0012d..95bccff0 100644
--- a/app/models/encounter.ts
+++ b/app/models/encounter.ts
@@ -3,6 +3,7 @@ import { type Doctor, genDoctor } from "./doctor"
 import { genEmployee, type Employee } from "./employee"
 import type { EncounterDocument } from "./encounter-document"
 import type { InternalReference } from "./internal-reference"
+import type { Nurse } from "./nurse"
 import { type Patient, genPatient } from "./patient"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
@@ -14,18 +15,20 @@ export interface Encounter {
     patient: Patient
     registeredAt: string
     class_code: string
-    unit_id: number
+    unit_code: string
     unit: Unit
-    specialist_id?: number
+    specialist_code?: string
     specilist?: Specialist
-    subspecialist_id?: number
+    subspecialist_code?: string
     subspecialist?: Subspecialist
     visitDate: string
     adm_employee_id: number
     adm_employee: Employee
-    appointment_doctor_id: number
+    responsible_nurse_code?: string
+    responsible_nurse?: Nurse
+    appointment_doctor_code: string
     appointment_doctor: Doctor
-    responsible_doctor_id?: number
+    responsible_doctor_code?: string
     responsible_doctor?: Doctor
     refSource_name?: string
     appointment_id?: number
@@ -49,12 +52,12 @@ export function genEncounter(): Encounter {
         patient: genPatient(),
         registeredAt: '',
         class_code: '',
-        unit_id: 0,
+        unit_code: 0,
         unit: genUnit(),
         visitDate: '',
         adm_employee_id: 0,
         adm_employee: genEmployee(),
-        appointment_doctor_id: 0,
+        appointment_doctor_code: '',
         appointment_doctor: genDoctor(),
         medicalDischargeEducation: '',
         status_code: '',
diff --git a/app/schemas/integration-encounter.schema.ts b/app/schemas/integration-encounter.schema.ts
index 32327328..b141f912 100644
--- a/app/schemas/integration-encounter.schema.ts
+++ b/app/schemas/integration-encounter.schema.ts
@@ -2,10 +2,12 @@ import { z } from 'zod'
 
 const ERROR_MESSAGES = {
   required: {
-    doctorId: 'Dokter wajib diisi',
+    doctor_code: 'Dokter wajib diisi',
     registerDate: 'Tanggal Daftar wajib diisi',
-    paymentType: 'Jenis Pembayaran wajib diisi',
-    subSpecialistId: 'Subspesialis wajib diisi',
+    paymentMethod_code: 'Jenis Pembayaran wajib diisi',
+    unit_code: 'Spesialis wajib diisi',
+    // specialist_code: 'Spesialis wajib diisi',
+    // subSpecialist_code: 'Subspesialis wajib diisi',
     patientCategory: 'Kelompok Peserta wajib diisi',
     cardNumber: 'No. Kartu BPJS wajib diisi',
     sepType: 'Jenis SEP wajib diisi',
@@ -21,22 +23,22 @@ const IntegrationEncounterSchema = z
     patientName: z.string().optional(),
     nationalIdentity: z.string().optional(),
     medicalRecordNumber: z.string().optional(),
-    
+
     // Visit data
-    doctorId: z
-      .string({ required_error: ERROR_MESSAGES.required.doctorId })
-      .min(1, ERROR_MESSAGES.required.doctorId),
-    subSpecialistId: z
-      .string({ required_error: ERROR_MESSAGES.required.subSpecialistId })
-      .min(1, ERROR_MESSAGES.required.subSpecialistId)
+    doctor_code: z
+      .string({ required_error: ERROR_MESSAGES.required.doctor_code })
+      .min(1, ERROR_MESSAGES.required.doctor_code),
+    unit_code: z
+      .string({ required_error: ERROR_MESSAGES.required.unit_code })
+      .min(1, ERROR_MESSAGES.required.unit_code)
       .optional(),
     registerDate: z
       .string({ required_error: ERROR_MESSAGES.required.registerDate })
       .min(1, ERROR_MESSAGES.required.registerDate),
-    paymentType: z
-      .string({ required_error: ERROR_MESSAGES.required.paymentType })
-      .min(1, ERROR_MESSAGES.required.paymentType),
-    
+    paymentMethod_code: z
+      .string({ required_error: ERROR_MESSAGES.required.paymentMethod_code })
+      .min(1, ERROR_MESSAGES.required.paymentMethod_code),
+
     // BPJS related fields
     patientCategory: z
       .string()
@@ -54,7 +56,7 @@ const IntegrationEncounterSchema = z
       .string()
       .min(1, ERROR_MESSAGES.required.sepNumber)
       .optional(),
-    
+
     // File uploads
     sepFile: z
       .any()
@@ -76,7 +78,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn, then patient category is required
-      if (data.paymentType === 'jkn') {
+      if (data.paymentMethod_code === 'jkn') {
         return data.patientCategory && data.patientCategory.trim() !== ''
       }
       return true
@@ -89,7 +91,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn, then card number is required
-      if (data.paymentType === 'jkn') {
+      if (data.paymentMethod_code === 'jkn') {
         return data.cardNumber && data.cardNumber.trim() !== ''
       }
       return true
@@ -102,7 +104,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn, then SEP type is required
-      if (data.paymentType === 'jkn') {
+      if (data.paymentMethod_code === 'jkn') {
         return data.sepType && data.sepType.trim() !== ''
       }
       return true
@@ -115,7 +117,7 @@ const IntegrationEncounterSchema = z
   .refine(
     (data) => {
       // If payment type is jkn and SEP type is selected, then SEP number is required
-      if (data.paymentType === 'jkn' && data.sepType && data.sepType.trim() !== '') {
+      if (data.paymentMethod_code === 'jkn' && data.sepType && data.sepType.trim() !== '') {
         return data.sepNumber && data.sepNumber.trim() !== ''
       }
       return true
diff --git a/app/services/_crud-base.ts b/app/services/_crud-base.ts
index bf3a89c5..c9a0f013 100644
--- a/app/services/_crud-base.ts
+++ b/app/services/_crud-base.ts
@@ -111,4 +111,4 @@ export async function removeCustom(path: string, data: any, name: string = 'item
     console.error(`Error deleting ${name}:`, error)
     throw new Error(`Failed to delete ${name}`)
   }
-}
\ No newline at end of file
+}
diff --git a/app/services/doctor.service.ts b/app/services/doctor.service.ts
index e6ae0051..5b855715 100644
--- a/app/services/doctor.service.ts
+++ b/app/services/doctor.service.ts
@@ -13,8 +13,8 @@ export function getList(params: any = null) {
   return base.getList(path, params, name)
 }
 
-export function getDetail(id: number | string) {
-  return base.getDetail(path, id, name)
+export function getDetail(id: number | string, params?: any) {
+  return base.getDetail(path, id, name, params)
 }
 
 export function update(id: number | string, data: any) {
@@ -32,7 +32,7 @@ export async function getValueLabelList(params: any = null, useCodeAsValue = fal
     const resultData = result.body?.data || []
     data = resultData.map((item: Doctor) => ({
       value: useCodeAsValue ? item.code
-        : item.id ? Number(item.id) 
+        : item.id ? Number(item.id)
           : item.id,
       label: item.employee?.person?.name || '',
     }))

From e6ac4bbaddac2625d2297df5641175a1e93c62d7 Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Tue, 2 Dec 2025 10:34:30 +0700
Subject: [PATCH 11/13] dev: hotfix, blocking error on build removal

---
 app/components/content/chemotherapy/process.vue       |  4 ++--
 app/components/content/control-letter/list.vue        | 11 ++++++-----
 app/models/role.ts                                    |  2 --
 .../(features)/chemotherapy/encounter/[id]/detail.vue |  4 ++--
 .../chemotherapy/encounter/[id]/process.vue           |  4 ++--
 app/pages/(features)/chemotherapy/encounter/add.vue   |  2 +-
 app/pages/(features)/chemotherapy/encounter/index.vue |  2 +-
 .../(features)/emergency/encounter/[id]/process.vue   |  4 ++--
 .../(features)/inpatient/encounter/[id]/process.vue   |  2 +-
 .../(features)/outpatient/encounter/[id]/detail.vue   |  2 +-
 app/pages/(features)/rehab/encounter/[id]/process.vue |  2 +-
 11 files changed, 19 insertions(+), 20 deletions(-)

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'],

From 9a8ee9d90f669a5395b14107d86d9f788118fa92 Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Tue, 2 Dec 2025 14:50:10 +0700
Subject: [PATCH 12/13] dev: hotfix, consultation

---
 app/components/app/consultation/entry.vue    | 22 ++++++++++----------
 app/components/content/consultation/list.vue |  2 +-
 app/models/consultation.ts                   | 14 ++++++-------
 app/schemas/consultation.schema.ts           |  2 +-
 app/services/unit.service.ts                 | 11 ++++------
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/app/components/app/consultation/entry.vue b/app/components/app/consultation/entry.vue
index bff12bfb..873bfd40 100644
--- a/app/components/app/consultation/entry.vue
+++ b/app/components/app/consultation/entry.vue
@@ -35,24 +35,24 @@ const { defineField, errors, meta } = useForm({
   initialValues: {
     date: props.values.date || today.toISOString().slice(0, 10),
     problem: '',
-    dstUnit_id: 0,
-  } as Partial<ConsultationFormData>,
+    dstUnit_code: '',
+  } as ConsultationFormData,
 })
 
 const [date, dateAttrs] = defineField('date')
-const [unit_id, unitAttrs] = defineField('unit_id')
+const [unit_code, unitAttrs] = defineField('unit_code')
 const [problem, problemAttrs] = defineField('problem')
 
 // Fill fields from props.values if provided
 if (props.values) {
   if (props.values.date !== undefined) date.value = props.values.date.substring(0, 10)
-  if (props.values.dstUnit_id !== undefined) unit_id.value = props.values.dstUnit_id
+  if (props.values.dstUnit_code !== undefined) unit_code.value = props.values.dstUnit_code
   if (props.values.problem !== undefined) problem.value = props.values.problem
 }
 
 const resetForm = () => {
   date.value = date.value ?? today.toISOString().slice(0, 10)
-  unit_id.value = 0
+  unit_code.value = 0
   problem.value = ''
 }
 
@@ -62,7 +62,7 @@ function onSubmitForm(values: any) {
     encounter_id: props.encounter_id,
     date: date.value ? `${date.value}T00:00:00Z` : '',
     problem: problem.value || '',
-    dstUnit_id: unit_id.value || 0,
+    dstUnit_code: unit_code.value || '',
   }
   emit('submit', formData, resetForm)
 }
@@ -89,18 +89,18 @@ function onCancelForm() {
       </DE.Cell>
       <DE.Cell>
         <DE.Label>Unit</DE.Label>
-        <DE.Field :errMessage="errors.unit_id">
-          {{ errors.unit_id }}
+        <DE.Field :errMessage="errors.unit_code">
+          {{ errors.unit_code }}
           <Select
-            id="strUnit_id"
-            v-model.number="unit_id"
+            id="strUnit_code"
+            v-model="unit_code"
             icon-name="i-lucide-chevron-down"
             placeholder="Pilih poliklinik tujuan"
             v-bind="unitAttrs"
             :items="props.units || []"
             :disabled="isLoading || isReadonly"
           />
-          <!-- <Input type="number" id="unit_id" v-model.number="unit_id" v-bind="unitAttrs" :disabled="isLoading || isReadonly" /> -->
+          <!-- <Input type="number" id="unit_code" v-model.number="unit_code" v-bind="unitAttrs" :disabled="isLoading || isReadonly" /> -->
         </DE.Field>
       </DE.Cell>
       <DE.Cell :colSpan="3">
diff --git a/app/components/content/consultation/list.vue b/app/components/content/consultation/list.vue
index cfce5ae3..d581e530 100644
--- a/app/components/content/consultation/list.vue
+++ b/app/components/content/consultation/list.vue
@@ -43,7 +43,7 @@ interface Props {
 }
 const props = defineProps<Props>()
 
-let units = ref<{ value: string; label: string }[]>([])
+const units = ref<{ value: string; label: string }[]>([])
 const encounterId = ref<number>(props?.encounter?.id || 0)
 const title = ref('')
 
diff --git a/app/models/consultation.ts b/app/models/consultation.ts
index 595d628e..59a32c9d 100644
--- a/app/models/consultation.ts
+++ b/app/models/consultation.ts
@@ -2,8 +2,8 @@ export interface Consultation {
   id: number
   encounter_id: number
   date?: string
-  unit_id: number
-  doctor_id?: number
+  unit_code: number
+  doctor_code?: number
   problem: string
   solution?: string
   repliedAt?: string
@@ -13,13 +13,13 @@ export interface CreateDto {
   encounter_id: number
   date: string
   problem: string
-  dstUnit_id: number
+  dstUnit_code: string
 }
 
 export interface UpdateDto {
   id: number
   problem: string
-  unit_id: number
+  unit_code: number
 }
 
 export interface DeleteDto {
@@ -31,7 +31,7 @@ export function genCreateDto(): CreateDto {
     date: '',
     encounter_id: 0,
     problem: '',
-    dstUnit_id: 0,
+    dstUnit_code: '',
   }
 }
 
@@ -39,8 +39,8 @@ export function genConsultation(): Consultation {
   return {
     id: 0,
     encounter_id: 0,
-    unit_id: 0,
-    doctor_id: 0,
+    unit_code: 0,
+    doctor_code: 0,
     problem: '',
     solution: '',
     repliedAt: '',
diff --git a/app/schemas/consultation.schema.ts b/app/schemas/consultation.schema.ts
index b1d306f5..56ac8837 100644
--- a/app/schemas/consultation.schema.ts
+++ b/app/schemas/consultation.schema.ts
@@ -3,7 +3,7 @@ import type { CreateDto } from '~/models/consultation'
 
 const ConsultationSchema = z.object({
   date: z.string({ required_error: 'Tanggal harus diisi' }),
-  dstUnit_id: z.number({ required_error: 'Unit harus diisi' }),
+  dstUnit_code: z.string({ required_error: 'Unit harus diisi' }),
   problem: z.string({ required_error: 'Uraian harus diisi' }).min(20, 'Uraian minimum 20 karakter'),
 })
 
diff --git a/app/services/unit.service.ts b/app/services/unit.service.ts
index 948ac6b6..7d041250 100644
--- a/app/services/unit.service.ts
+++ b/app/services/unit.service.ts
@@ -27,17 +27,14 @@ export function remove(id: number | string) {
   return base.remove(path, id, name)
 }
 
-export async function getValueLabelList(params: any = null, useCodeAsValue = false): Promise<{ value: string; label: string }[]> {
+export async function getValueLabelList(params: any = null, useId = false): Promise<{ value: string; label: string }[]> {
   let data: { value: string; label: string }[] = []
   const result = await getList(params)
   if (result.success) {
     const resultData = result.body?.data || []
-    data = resultData.map((item: Unit) => ({
-      value: useCodeAsValue ? item.code
-        : item.id ? Number(item.id) 
-          : item.code,
-      label: item.name,
-    }))
+    data = !useId ?
+      resultData.map((item: Unit) => ({ value: item.code, label: item.name })) :
+      resultData.map((item: Unit) => ({ value: item.id, label: item.name }))
   }
   return data
 }

From b80ee5a55edb13bb422e939d4a1d3d2e2abc7e69 Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Wed, 3 Dec 2025 09:45:41 +0700
Subject: [PATCH 13/13] dev: hotfix, my-ui/combobox v-model

---
 app/components/pub/my-ui/combobox/combobox.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/components/pub/my-ui/combobox/combobox.vue b/app/components/pub/my-ui/combobox/combobox.vue
index 713edd57..ab625b01 100644
--- a/app/components/pub/my-ui/combobox/combobox.vue
+++ b/app/components/pub/my-ui/combobox/combobox.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { cn } from '~/lib/utils'
-
 import { type Item } from './index'
 
 const props = defineProps<{
@@ -14,6 +13,8 @@ const props = defineProps<{
   isDisabled?: boolean
 }>()
 
+const model = defineModel()
+
 const emit = defineEmits<{
   'update:modelValue': [value: string]
   'update:searchText': [value: string]
@@ -57,6 +58,7 @@ const searchableItems = computed(() => {
 })
 
 function onSelect(item: Item) {
+  model.value = item.value
   emit('update:modelValue', item.value)
   open.value = false
 }