From 1a3edd5a1ec40cd33d534da3c6dc7f7fc5a74e08 Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Fri, 10 Oct 2025 23:58:44 +0700
Subject: [PATCH 1/7] dev: hotfix, moved combobox and datepicker

---
 app/components/app/bed/entry-form.vue         |  2 +-
 app/components/app/chamber/entry-form.vue     |  2 +-
 .../app/division-position/entry-form.vue      |  2 +-
 app/components/app/encounter/entry-form.vue   |  4 +--
 app/components/app/floor/entry-form.vue       |  2 +-
 .../app/installation/entry-form.vue           |  2 +-
 .../app/patient/_common/select-ethnicity.vue  |  2 +-
 .../app/patient/_common/select-job.vue        |  2 +-
 .../_common/select-district.vue               |  2 +-
 .../person-address/_common/select-postal.vue  |  2 +-
 .../_common/select-province.vue               |  2 +-
 .../person-address/_common/select-regency.vue |  2 +-
 .../person-address/_common/select-village.vue |  2 +-
 app/components/app/person/entry-form.vue      |  2 +-
 app/components/app/room/entry-form.vue        |  2 +-
 app/components/app/sep/entry-form.vue         |  2 +-
 app/components/app/sep/small-entry.vue        |  4 +--
 .../app/specialist-intern/entry-form.vue      |  2 +-
 app/components/app/specialist/entry-form.vue  |  2 +-
 .../app/subspecialist/entry-form.vue          |  2 +-
 app/components/app/unit/entry-form.vue        |  2 +-
 app/components/app/warehouse/entry-form.vue   |  2 +-
 .../pub/my-ui/{form => combobox}/combobox.vue | 18 ++++++-------
 app/components/pub/my-ui/combobox/index.ts    | 25 +++++++++++++++++++
 .../datepicker-single.vue                     |  0
 25 files changed, 58 insertions(+), 33 deletions(-)
 rename app/components/pub/my-ui/{form => combobox}/combobox.vue (95%)
 create mode 100644 app/components/pub/my-ui/combobox/index.ts
 rename app/components/pub/my-ui/{form => datepicker}/datepicker-single.vue (100%)

diff --git a/app/components/app/bed/entry-form.vue b/app/components/app/bed/entry-form.vue
index 0b103cd0..f2b0c961 100644
--- a/app/components/app/bed/entry-form.vue
+++ b/app/components/app/bed/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/chamber/entry-form.vue b/app/components/app/chamber/entry-form.vue
index af8da097..f44a6745 100644
--- a/app/components/app/chamber/entry-form.vue
+++ b/app/components/app/chamber/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/division-position/entry-form.vue b/app/components/app/division-position/entry-form.vue
index 9e144e64..2525b49b 100644
--- a/app/components/app/division-position/entry-form.vue
+++ b/app/components/app/division-position/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { DivisionPositionFormData } from '~/schemas/division-position.schema'
diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 6f2ad074..fd6c8da9 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -5,9 +5,9 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 import { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/floor/entry-form.vue b/app/components/app/floor/entry-form.vue
index ec78dacc..a59bfd4c 100644
--- a/app/components/app/floor/entry-form.vue
+++ b/app/components/app/floor/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/installation/entry-form.vue b/app/components/app/installation/entry-form.vue
index 393eb793..c83e5cb1 100644
--- a/app/components/app/installation/entry-form.vue
+++ b/app/components/app/installation/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { InstallationFormData } from '~/schemas/installation.schema'
diff --git a/app/components/app/patient/_common/select-ethnicity.vue b/app/components/app/patient/_common/select-ethnicity.vue
index a4231571..e1ecd08a 100644
--- a/app/components/app/patient/_common/select-ethnicity.vue
+++ b/app/components/app/patient/_common/select-ethnicity.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/patient/_common/select-job.vue b/app/components/app/patient/_common/select-job.vue
index b9804bb5..b14cbb66 100644
--- a/app/components/app/patient/_common/select-job.vue
+++ b/app/components/app/patient/_common/select-job.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-district.vue b/app/components/app/person-address/_common/select-district.vue
index 97b50e4e..91f853f8 100644
--- a/app/components/app/person-address/_common/select-district.vue
+++ b/app/components/app/person-address/_common/select-district.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-postal.vue b/app/components/app/person-address/_common/select-postal.vue
index 84df7b33..83b33786 100644
--- a/app/components/app/person-address/_common/select-postal.vue
+++ b/app/components/app/person-address/_common/select-postal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-province.vue b/app/components/app/person-address/_common/select-province.vue
index bf984154..f8cc5464 100644
--- a/app/components/app/person-address/_common/select-province.vue
+++ b/app/components/app/person-address/_common/select-province.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-regency.vue b/app/components/app/person-address/_common/select-regency.vue
index bb2202d3..9b415b6e 100644
--- a/app/components/app/person-address/_common/select-regency.vue
+++ b/app/components/app/person-address/_common/select-regency.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-village.vue b/app/components/app/person-address/_common/select-village.vue
index 561fa9b6..a3d7725c 100644
--- a/app/components/app/person-address/_common/select-village.vue
+++ b/app/components/app/person-address/_common/select-village.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person/entry-form.vue b/app/components/app/person/entry-form.vue
index a9a9c6cf..0ea3757a 100644
--- a/app/components/app/person/entry-form.vue
+++ b/app/components/app/person/entry-form.vue
@@ -3,7 +3,7 @@ import type { FormErrors } from '~/types/error'
 import { Form } from '~/components/pub/ui/form'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/room/entry-form.vue b/app/components/app/room/entry-form.vue
index 6aca0d77..b460cc2d 100644
--- a/app/components/app/room/entry-form.vue
+++ b/app/components/app/room/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/sep/entry-form.vue b/app/components/app/sep/entry-form.vue
index 9aea7c31..e48d23ec 100644
--- a/app/components/app/sep/entry-form.vue
+++ b/app/components/app/sep/entry-form.vue
@@ -10,7 +10,7 @@ import { Label } from '~/components/pub/ui/label'
 import Select from '~/components/pub/ui/select/Select.vue'
 import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
 import { Textarea } from '~/components/pub/ui/textarea'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 const emit = defineEmits<{
   (e: 'event', value: any): void
diff --git a/app/components/app/sep/small-entry.vue b/app/components/app/sep/small-entry.vue
index b4957aa9..a5372099 100644
--- a/app/components/app/sep/small-entry.vue
+++ b/app/components/app/sep/small-entry.vue
@@ -2,12 +2,12 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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 { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/specialist-intern/entry-form.vue b/app/components/app/specialist-intern/entry-form.vue
index c9719e09..aca8245b 100644
--- a/app/components/app/specialist-intern/entry-form.vue
+++ b/app/components/app/specialist-intern/entry-form.vue
@@ -2,7 +2,7 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/specialist/entry-form.vue b/app/components/app/specialist/entry-form.vue
index ee649391..70c0f294 100644
--- a/app/components/app/specialist/entry-form.vue
+++ b/app/components/app/specialist/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { SpecialistFormData } from '~/schemas/specialist.schema'
diff --git a/app/components/app/subspecialist/entry-form.vue b/app/components/app/subspecialist/entry-form.vue
index 53a74f68..8f176fb1 100644
--- a/app/components/app/subspecialist/entry-form.vue
+++ b/app/components/app/subspecialist/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { SubspecialistFormData } from '~/schemas/subspecialist.schema'
diff --git a/app/components/app/unit/entry-form.vue b/app/components/app/unit/entry-form.vue
index f400967f..1b369695 100644
--- a/app/components/app/unit/entry-form.vue
+++ b/app/components/app/unit/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { UnitFormData } from '~/schemas/unit.schema'
diff --git a/app/components/app/warehouse/entry-form.vue b/app/components/app/warehouse/entry-form.vue
index ad367706..cc3256e0 100644
--- a/app/components/app/warehouse/entry-form.vue
+++ b/app/components/app/warehouse/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/pub/my-ui/form/combobox.vue b/app/components/pub/my-ui/combobox/combobox.vue
similarity index 95%
rename from app/components/pub/my-ui/form/combobox.vue
rename to app/components/pub/my-ui/combobox/combobox.vue
index 475fbb13..38ed99bc 100644
--- a/app/components/pub/my-ui/form/combobox.vue
+++ b/app/components/pub/my-ui/combobox/combobox.vue
@@ -1,16 +1,11 @@
 <script setup lang="ts">
 import { cn } from '~/lib/utils'
 
-interface Item {
-  value: string | number
-  label: string
-  code?: string
-  priority?: number
-}
+import { type Item } from './index'
 
 const props = defineProps<{
-  id: string
-  modelValue?: string | number
+  id?: string
+  modelValue?: string
   items: Item[]
   placeholder?: string
   searchPlaceholder?: string
@@ -20,7 +15,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-  'update:modelValue': [value: string | number]
+  'update:modelValue': [value: string]
 }>()
 
 const open = ref(false)
@@ -28,12 +23,17 @@ const open = ref(false)
 const selectedItem = computed(() => props.items.find((item) => item.value === props.modelValue))
 
 const displayText = computed(() => {
+  console.log(selectedItem);
   if (selectedItem.value?.label) {
     return selectedItem.value.label
   }
   return props.placeholder || 'Pilih item'
 })
 
+watch(props, () => {
+  console.log(props.modelValue);
+})
+
 const searchableItems = computed(() => {
   const itemsWithSearch = props.items.map((item) => ({
     ...item,
diff --git a/app/components/pub/my-ui/combobox/index.ts b/app/components/pub/my-ui/combobox/index.ts
new file mode 100644
index 00000000..ce8325f0
--- /dev/null
+++ b/app/components/pub/my-ui/combobox/index.ts
@@ -0,0 +1,25 @@
+export interface Item {
+  value: string
+  label: string
+  code?: string
+  priority?: number
+}
+
+export function recStrToItem(input: Record<string, string>): Item[] {
+  console.log(input)
+  const items: Item[] = []
+  let idx = 0;
+  for (const key in input) {
+    if (input.hasOwnProperty(key)) {
+      const value = input[key]
+      items.push({
+        value: key || ('unknown-' + idx),
+        label: input[key] || ('unknown-' + idx),
+      })
+    }
+    idx++
+  }
+  return items
+}
+
+export { default as Combobox } from './combobox.vue'
diff --git a/app/components/pub/my-ui/form/datepicker-single.vue b/app/components/pub/my-ui/datepicker/datepicker-single.vue
similarity index 100%
rename from app/components/pub/my-ui/form/datepicker-single.vue
rename to app/components/pub/my-ui/datepicker/datepicker-single.vue

From 3a4b2aa6fb940b9d29bc1d6743f09e7302764c7e Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Sat, 11 Oct 2025 00:25:44 +0700
Subject: [PATCH 2/7] dev: hotfix, moved combobox and datepicker

---
 app/components/app/bed/entry-form.vue         |  2 +-
 app/components/app/chamber/entry-form.vue     |  2 +-
 .../app/division-position/entry-form.vue      |  2 +-
 app/components/app/encounter/entry-form.vue   |  4 +--
 app/components/app/floor/entry-form.vue       |  2 +-
 .../app/installation/entry-form.vue           |  2 +-
 .../app/patient/_common/select-ethnicity.vue  |  2 +-
 .../app/patient/_common/select-job.vue        |  2 +-
 .../_common/select-district.vue               |  2 +-
 .../person-address/_common/select-postal.vue  |  2 +-
 .../_common/select-province.vue               |  2 +-
 .../person-address/_common/select-regency.vue |  2 +-
 .../person-address/_common/select-village.vue |  2 +-
 app/components/app/person/entry-form.vue      |  2 +-
 app/components/app/room/entry-form.vue        |  2 +-
 app/components/app/sep/entry-form.vue         |  2 +-
 app/components/app/sep/small-entry.vue        |  4 +--
 .../app/specialist-intern/entry-form.vue      |  2 +-
 app/components/app/specialist/entry-form.vue  |  2 +-
 .../app/subspecialist/entry-form.vue          |  2 +-
 app/components/app/unit/entry-form.vue        |  2 +-
 app/components/app/warehouse/entry-form.vue   |  2 +-
 .../pub/my-ui/{form => combobox}/combobox.vue | 13 +++-------
 app/components/pub/my-ui/combobox/index.ts    | 25 +++++++++++++++++++
 .../datepicker-single.vue                     |  0
 25 files changed, 53 insertions(+), 33 deletions(-)
 rename app/components/pub/my-ui/{form => combobox}/combobox.vue (96%)
 create mode 100644 app/components/pub/my-ui/combobox/index.ts
 rename app/components/pub/my-ui/{form => datepicker}/datepicker-single.vue (100%)

diff --git a/app/components/app/bed/entry-form.vue b/app/components/app/bed/entry-form.vue
index 0b103cd0..f2b0c961 100644
--- a/app/components/app/bed/entry-form.vue
+++ b/app/components/app/bed/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/chamber/entry-form.vue b/app/components/app/chamber/entry-form.vue
index af8da097..f44a6745 100644
--- a/app/components/app/chamber/entry-form.vue
+++ b/app/components/app/chamber/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/division-position/entry-form.vue b/app/components/app/division-position/entry-form.vue
index 9e144e64..2525b49b 100644
--- a/app/components/app/division-position/entry-form.vue
+++ b/app/components/app/division-position/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { DivisionPositionFormData } from '~/schemas/division-position.schema'
diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 6f2ad074..fd6c8da9 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -5,9 +5,9 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 import { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/floor/entry-form.vue b/app/components/app/floor/entry-form.vue
index ec78dacc..a59bfd4c 100644
--- a/app/components/app/floor/entry-form.vue
+++ b/app/components/app/floor/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/installation/entry-form.vue b/app/components/app/installation/entry-form.vue
index 393eb793..c83e5cb1 100644
--- a/app/components/app/installation/entry-form.vue
+++ b/app/components/app/installation/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { InstallationFormData } from '~/schemas/installation.schema'
diff --git a/app/components/app/patient/_common/select-ethnicity.vue b/app/components/app/patient/_common/select-ethnicity.vue
index a4231571..e1ecd08a 100644
--- a/app/components/app/patient/_common/select-ethnicity.vue
+++ b/app/components/app/patient/_common/select-ethnicity.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/patient/_common/select-job.vue b/app/components/app/patient/_common/select-job.vue
index b9804bb5..b14cbb66 100644
--- a/app/components/app/patient/_common/select-job.vue
+++ b/app/components/app/patient/_common/select-job.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-district.vue b/app/components/app/person-address/_common/select-district.vue
index 97b50e4e..91f853f8 100644
--- a/app/components/app/person-address/_common/select-district.vue
+++ b/app/components/app/person-address/_common/select-district.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-postal.vue b/app/components/app/person-address/_common/select-postal.vue
index 84df7b33..83b33786 100644
--- a/app/components/app/person-address/_common/select-postal.vue
+++ b/app/components/app/person-address/_common/select-postal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-province.vue b/app/components/app/person-address/_common/select-province.vue
index bf984154..f8cc5464 100644
--- a/app/components/app/person-address/_common/select-province.vue
+++ b/app/components/app/person-address/_common/select-province.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-regency.vue b/app/components/app/person-address/_common/select-regency.vue
index bb2202d3..9b415b6e 100644
--- a/app/components/app/person-address/_common/select-regency.vue
+++ b/app/components/app/person-address/_common/select-regency.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person-address/_common/select-village.vue b/app/components/app/person-address/_common/select-village.vue
index 561fa9b6..a3d7725c 100644
--- a/app/components/app/person-address/_common/select-village.vue
+++ b/app/components/app/person-address/_common/select-village.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/person/entry-form.vue b/app/components/app/person/entry-form.vue
index a9a9c6cf..0ea3757a 100644
--- a/app/components/app/person/entry-form.vue
+++ b/app/components/app/person/entry-form.vue
@@ -3,7 +3,7 @@ import type { FormErrors } from '~/types/error'
 import { Form } from '~/components/pub/ui/form'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/room/entry-form.vue b/app/components/app/room/entry-form.vue
index 6aca0d77..b460cc2d 100644
--- a/app/components/app/room/entry-form.vue
+++ b/app/components/app/room/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/app/sep/entry-form.vue b/app/components/app/sep/entry-form.vue
index 9aea7c31..e48d23ec 100644
--- a/app/components/app/sep/entry-form.vue
+++ b/app/components/app/sep/entry-form.vue
@@ -10,7 +10,7 @@ import { Label } from '~/components/pub/ui/label'
 import Select from '~/components/pub/ui/select/Select.vue'
 import { RadioGroup, RadioGroupItem } from '~/components/pub/ui/radio-group'
 import { Textarea } from '~/components/pub/ui/textarea'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 const emit = defineEmits<{
   (e: 'event', value: any): void
diff --git a/app/components/app/sep/small-entry.vue b/app/components/app/sep/small-entry.vue
index b4957aa9..a5372099 100644
--- a/app/components/app/sep/small-entry.vue
+++ b/app/components/app/sep/small-entry.vue
@@ -2,12 +2,12 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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 { Form } from '~/components/pub/ui/form'
-import DatepickerSingle from '~/components/pub/my-ui/form/datepicker-single.vue'
+import DatepickerSingle from '~/components/pub/my-ui/datepicker/datepicker-single.vue'
 
 import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
 import { mapToComboboxOptList } from '~/lib/utils'
diff --git a/app/components/app/specialist-intern/entry-form.vue b/app/components/app/specialist-intern/entry-form.vue
index c9719e09..aca8245b 100644
--- a/app/components/app/specialist-intern/entry-form.vue
+++ b/app/components/app/specialist-intern/entry-form.vue
@@ -2,7 +2,7 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import Block from '~/components/pub/my-ui/form/block.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 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'
diff --git a/app/components/app/specialist/entry-form.vue b/app/components/app/specialist/entry-form.vue
index ee649391..70c0f294 100644
--- a/app/components/app/specialist/entry-form.vue
+++ b/app/components/app/specialist/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { SpecialistFormData } from '~/schemas/specialist.schema'
diff --git a/app/components/app/subspecialist/entry-form.vue b/app/components/app/subspecialist/entry-form.vue
index 53a74f68..8f176fb1 100644
--- a/app/components/app/subspecialist/entry-form.vue
+++ b/app/components/app/subspecialist/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { SubspecialistFormData } from '~/schemas/subspecialist.schema'
diff --git a/app/components/app/unit/entry-form.vue b/app/components/app/unit/entry-form.vue
index f400967f..1b369695 100644
--- a/app/components/app/unit/entry-form.vue
+++ b/app/components/app/unit/entry-form.vue
@@ -4,7 +4,7 @@ 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 Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Types
 import type { UnitFormData } from '~/schemas/unit.schema'
diff --git a/app/components/app/warehouse/entry-form.vue b/app/components/app/warehouse/entry-form.vue
index ad367706..cc3256e0 100644
--- a/app/components/app/warehouse/entry-form.vue
+++ b/app/components/app/warehouse/entry-form.vue
@@ -5,7 +5,7 @@ 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/Button.vue'
-import Combobox from '~/components/pub/my-ui/form/combobox.vue'
+import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
 
 // Constants
 import { infraGroupCodesKeys } from '~/lib/constants'
diff --git a/app/components/pub/my-ui/form/combobox.vue b/app/components/pub/my-ui/combobox/combobox.vue
similarity index 96%
rename from app/components/pub/my-ui/form/combobox.vue
rename to app/components/pub/my-ui/combobox/combobox.vue
index 475fbb13..fbb241e0 100644
--- a/app/components/pub/my-ui/form/combobox.vue
+++ b/app/components/pub/my-ui/combobox/combobox.vue
@@ -1,16 +1,11 @@
 <script setup lang="ts">
 import { cn } from '~/lib/utils'
 
-interface Item {
-  value: string | number
-  label: string
-  code?: string
-  priority?: number
-}
+import { type Item } from './index'
 
 const props = defineProps<{
-  id: string
-  modelValue?: string | number
+  id?: string
+  modelValue?: string
   items: Item[]
   placeholder?: string
   searchPlaceholder?: string
@@ -20,7 +15,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-  'update:modelValue': [value: string | number]
+  'update:modelValue': [value: string]
 }>()
 
 const open = ref(false)
diff --git a/app/components/pub/my-ui/combobox/index.ts b/app/components/pub/my-ui/combobox/index.ts
new file mode 100644
index 00000000..ce8325f0
--- /dev/null
+++ b/app/components/pub/my-ui/combobox/index.ts
@@ -0,0 +1,25 @@
+export interface Item {
+  value: string
+  label: string
+  code?: string
+  priority?: number
+}
+
+export function recStrToItem(input: Record<string, string>): Item[] {
+  console.log(input)
+  const items: Item[] = []
+  let idx = 0;
+  for (const key in input) {
+    if (input.hasOwnProperty(key)) {
+      const value = input[key]
+      items.push({
+        value: key || ('unknown-' + idx),
+        label: input[key] || ('unknown-' + idx),
+      })
+    }
+    idx++
+  }
+  return items
+}
+
+export { default as Combobox } from './combobox.vue'
diff --git a/app/components/pub/my-ui/form/datepicker-single.vue b/app/components/pub/my-ui/datepicker/datepicker-single.vue
similarity index 100%
rename from app/components/pub/my-ui/form/datepicker-single.vue
rename to app/components/pub/my-ui/datepicker/datepicker-single.vue

From 0d1e469ece38471ed5496f0d424473cac643461b Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Sun, 12 Oct 2025 11:40:53 +0700
Subject: [PATCH 3/7] dev: hotfix, text-size standardization

---
 app/components/pub/ui/button/index.ts            | 4 ++--
 app/components/pub/ui/checkbox/Checkbox.vue      | 2 +-
 app/components/pub/ui/form/FormDescription.vue   | 2 +-
 app/components/pub/ui/label/Label.vue            | 2 +-
 app/components/pub/ui/table/Table.vue            | 2 +-
 app/components/pub/ui/table/TableCaption.vue     | 2 +-
 app/components/pub/ui/table/TableEmpty.vue       | 2 +-
 app/components/pub/ui/tabs/TabsTrigger.vue       | 2 +-
 app/components/pub/ui/textarea/Textarea.vue      | 2 +-
 app/components/pub/ui/toast/ToastAction.vue      | 2 +-
 app/components/pub/ui/toast/ToastDescription.vue | 2 +-
 app/components/pub/ui/toast/ToastTitle.vue       | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/components/pub/ui/button/index.ts b/app/components/pub/ui/button/index.ts
index c16fb713..34b82cf6 100644
--- a/app/components/pub/ui/button/index.ts
+++ b/app/components/pub/ui/button/index.ts
@@ -4,7 +4,7 @@ import { cva } from 'class-variance-authority'
 export { default as Button } from './Button.vue'
 
 export const buttonVariants = cva(
-  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md md:tex-xs xl:text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md md:tex-xs 2xl:text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
   {
     variants: {
       variant: {
@@ -19,7 +19,7 @@ export const buttonVariants = cva(
         link: 'text-primary underline-offset-4 hover:underline',
       },
       size: {
-        default: 'md:h8 xl:h-9 px-4 py-2',
+        default: 'md:h8 2xl:h-9 px-4 py-2',
         xs: 'h-7 rounded px-2',
         sm: 'h-8 rounded-md px-3 text-xs',
         lg: 'h-10 rounded-md px-8',
diff --git a/app/components/pub/ui/checkbox/Checkbox.vue b/app/components/pub/ui/checkbox/Checkbox.vue
index f8b25c7a..1e01933d 100644
--- a/app/components/pub/ui/checkbox/Checkbox.vue
+++ b/app/components/pub/ui/checkbox/Checkbox.vue
@@ -21,7 +21,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
   <CheckboxRoot
     v-bind="forwarded"
     :class="
-      cn('peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
+      cn('peer h-6 w-6 md:h-5 md:w-5 2xl:h-6 2xl:w-6 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
          props.class)"
   >
     <CheckboxIndicator class="h-full w-full flex items-center justify-center text-current">
diff --git a/app/components/pub/ui/form/FormDescription.vue b/app/components/pub/ui/form/FormDescription.vue
index 60bc8767..b8508491 100644
--- a/app/components/pub/ui/form/FormDescription.vue
+++ b/app/components/pub/ui/form/FormDescription.vue
@@ -14,7 +14,7 @@ const { formDescriptionId } = useFormField()
 <template>
   <p
     :id="formDescriptionId"
-    :class="cn('text-sm text-muted-foreground', props.class)"
+    :class="cn('md:text-xs 2xl:text-sm text-muted-foreground', props.class)"
   >
     <slot />
   </p>
diff --git a/app/components/pub/ui/label/Label.vue b/app/components/pub/ui/label/Label.vue
index 46a01863..c3c34a8b 100644
--- a/app/components/pub/ui/label/Label.vue
+++ b/app/components/pub/ui/label/Label.vue
@@ -19,7 +19,7 @@ const delegatedProps = computed(() => {
     v-bind="delegatedProps"
     :class="
       cn(
-        'md:!text-xs xl:text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',
+        'md:!text-xs 2xl:text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',
         props.class,
       )
     "
diff --git a/app/components/pub/ui/table/Table.vue b/app/components/pub/ui/table/Table.vue
index e7c79d4c..fb8a5e04 100644
--- a/app/components/pub/ui/table/Table.vue
+++ b/app/components/pub/ui/table/Table.vue
@@ -9,7 +9,7 @@ const props = defineProps<{
 
 <template>
   <div class="relative w-full overflow-x-auto">
-    <table :class="cn('min-w-full table-fixed caption-bottom text-sm', props.class)">
+    <table :class="cn('min-w-full table-fixed caption-bottom md:text-xs 2xl:text-sm', props.class)">
       <slot />
     </table>
   </div>
diff --git a/app/components/pub/ui/table/TableCaption.vue b/app/components/pub/ui/table/TableCaption.vue
index f2a6c194..eeb57252 100644
--- a/app/components/pub/ui/table/TableCaption.vue
+++ b/app/components/pub/ui/table/TableCaption.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
 </script>
 
 <template>
-  <caption :class="cn('mt-4 text-sm text-muted-foreground', props.class)">
+  <caption :class="cn('mt-4 md:text-xs 2xl:text-sm text-muted-foreground', props.class)">
     <slot />
   </caption>
 </template>
diff --git a/app/components/pub/ui/table/TableEmpty.vue b/app/components/pub/ui/table/TableEmpty.vue
index ff2f887e..96fafe2d 100644
--- a/app/components/pub/ui/table/TableEmpty.vue
+++ b/app/components/pub/ui/table/TableEmpty.vue
@@ -25,7 +25,7 @@ const delegatedProps = computed(() => {
     <TableCell
       :class="
         cn(
-          'p-4 whitespace-nowrap align-middle text-sm text-foreground',
+          'p-4 whitespace-nowrap align-middle md:text-xs 2xl:text-sm text-foreground',
           props.class,
         )
       "
diff --git a/app/components/pub/ui/tabs/TabsTrigger.vue b/app/components/pub/ui/tabs/TabsTrigger.vue
index 784f5b36..af9ddeb5 100644
--- a/app/components/pub/ui/tabs/TabsTrigger.vue
+++ b/app/components/pub/ui/tabs/TabsTrigger.vue
@@ -20,7 +20,7 @@ const forwardedProps = useForwardProps(delegatedProps)
   <TabsTrigger
     v-bind="forwardedProps"
     :class="cn(
-      'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm',
+      'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 md:text-xs 2xl:text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm',
       props.class,
     )"
   >
diff --git a/app/components/pub/ui/textarea/Textarea.vue b/app/components/pub/ui/textarea/Textarea.vue
index a946b49a..a29bb1b7 100644
--- a/app/components/pub/ui/textarea/Textarea.vue
+++ b/app/components/pub/ui/textarea/Textarea.vue
@@ -20,5 +20,5 @@ const modelValue = useVModel(props, 'modelValue', emits, {
 </script>
 
 <template>
-  <textarea v-model="modelValue" :class="cn('flex min-h-20 w-full rounded-md border border-slate-400 bg-white dark:bg-slate-950 px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class)" />
+  <textarea v-model="modelValue" :class="cn('flex min-h-20 w-full rounded-md border border-slate-400 bg-white dark:bg-slate-950 px-3 py-2 md:text-xs 2xl:text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class)" />
 </template>
diff --git a/app/components/pub/ui/toast/ToastAction.vue b/app/components/pub/ui/toast/ToastAction.vue
index 0a4bacc6..577b1f65 100644
--- a/app/components/pub/ui/toast/ToastAction.vue
+++ b/app/components/pub/ui/toast/ToastAction.vue
@@ -15,7 +15,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-  <ToastAction v-bind="delegatedProps" :class="cn('inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive', props.class)">
+  <ToastAction v-bind="delegatedProps" :class="cn('inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 md:text-xs 2xl:text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive', props.class)">
     <slot />
   </ToastAction>
 </template>
diff --git a/app/components/pub/ui/toast/ToastDescription.vue b/app/components/pub/ui/toast/ToastDescription.vue
index 66d36e2b..23b80db3 100644
--- a/app/components/pub/ui/toast/ToastDescription.vue
+++ b/app/components/pub/ui/toast/ToastDescription.vue
@@ -15,7 +15,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-  <ToastDescription :class="cn('text-sm opacity-90', props.class)" v-bind="delegatedProps">
+  <ToastDescription :class="cn('md:text-xs 2xl:text-sm opacity-90', props.class)" v-bind="delegatedProps">
     <slot />
   </ToastDescription>
 </template>
diff --git a/app/components/pub/ui/toast/ToastTitle.vue b/app/components/pub/ui/toast/ToastTitle.vue
index c3eb3ffc..fc62fd61 100644
--- a/app/components/pub/ui/toast/ToastTitle.vue
+++ b/app/components/pub/ui/toast/ToastTitle.vue
@@ -15,7 +15,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-  <ToastTitle v-bind="delegatedProps" :class="cn('text-sm font-semibold [&+div]:text-xs', props.class)">
+  <ToastTitle v-bind="delegatedProps" :class="cn('md:text-xs 2xl:text-sm font-semibold [&+div]:text-xs', props.class)">
     <slot />
   </ToastTitle>
 </template>

From 18e00bf89aaedd7a4211ef9cc3dee975bc87d3db Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Sun, 12 Oct 2025 11:40:53 +0700
Subject: [PATCH 4/7] dev: hotfix, text-size standardization

---
 app/components/pub/ui/button/index.ts            | 4 ++--
 app/components/pub/ui/checkbox/Checkbox.vue      | 2 +-
 app/components/pub/ui/form/FormDescription.vue   | 2 +-
 app/components/pub/ui/label/Label.vue            | 2 +-
 app/components/pub/ui/table/Table.vue            | 2 +-
 app/components/pub/ui/table/TableCaption.vue     | 2 +-
 app/components/pub/ui/table/TableEmpty.vue       | 2 +-
 app/components/pub/ui/tabs/TabsTrigger.vue       | 2 +-
 app/components/pub/ui/textarea/Textarea.vue      | 2 +-
 app/components/pub/ui/toast/ToastAction.vue      | 2 +-
 app/components/pub/ui/toast/ToastDescription.vue | 2 +-
 app/components/pub/ui/toast/ToastTitle.vue       | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/components/pub/ui/button/index.ts b/app/components/pub/ui/button/index.ts
index c16fb713..c1aa89a8 100644
--- a/app/components/pub/ui/button/index.ts
+++ b/app/components/pub/ui/button/index.ts
@@ -4,7 +4,7 @@ import { cva } from 'class-variance-authority'
 export { default as Button } from './Button.vue'
 
 export const buttonVariants = cva(
-  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md md:tex-xs xl:text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md md:text-xs 2xl:text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
   {
     variants: {
       variant: {
@@ -19,7 +19,7 @@ export const buttonVariants = cva(
         link: 'text-primary underline-offset-4 hover:underline',
       },
       size: {
-        default: 'md:h8 xl:h-9 px-4 py-2',
+        default: 'md:h8 2xl:h-9 px-4 py-2',
         xs: 'h-7 rounded px-2',
         sm: 'h-8 rounded-md px-3 text-xs',
         lg: 'h-10 rounded-md px-8',
diff --git a/app/components/pub/ui/checkbox/Checkbox.vue b/app/components/pub/ui/checkbox/Checkbox.vue
index f8b25c7a..1e01933d 100644
--- a/app/components/pub/ui/checkbox/Checkbox.vue
+++ b/app/components/pub/ui/checkbox/Checkbox.vue
@@ -21,7 +21,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
   <CheckboxRoot
     v-bind="forwarded"
     :class="
-      cn('peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
+      cn('peer h-6 w-6 md:h-5 md:w-5 2xl:h-6 2xl:w-6 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
          props.class)"
   >
     <CheckboxIndicator class="h-full w-full flex items-center justify-center text-current">
diff --git a/app/components/pub/ui/form/FormDescription.vue b/app/components/pub/ui/form/FormDescription.vue
index 60bc8767..b8508491 100644
--- a/app/components/pub/ui/form/FormDescription.vue
+++ b/app/components/pub/ui/form/FormDescription.vue
@@ -14,7 +14,7 @@ const { formDescriptionId } = useFormField()
 <template>
   <p
     :id="formDescriptionId"
-    :class="cn('text-sm text-muted-foreground', props.class)"
+    :class="cn('md:text-xs 2xl:text-sm text-muted-foreground', props.class)"
   >
     <slot />
   </p>
diff --git a/app/components/pub/ui/label/Label.vue b/app/components/pub/ui/label/Label.vue
index 46a01863..c3c34a8b 100644
--- a/app/components/pub/ui/label/Label.vue
+++ b/app/components/pub/ui/label/Label.vue
@@ -19,7 +19,7 @@ const delegatedProps = computed(() => {
     v-bind="delegatedProps"
     :class="
       cn(
-        'md:!text-xs xl:text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',
+        'md:!text-xs 2xl:text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',
         props.class,
       )
     "
diff --git a/app/components/pub/ui/table/Table.vue b/app/components/pub/ui/table/Table.vue
index e7c79d4c..fb8a5e04 100644
--- a/app/components/pub/ui/table/Table.vue
+++ b/app/components/pub/ui/table/Table.vue
@@ -9,7 +9,7 @@ const props = defineProps<{
 
 <template>
   <div class="relative w-full overflow-x-auto">
-    <table :class="cn('min-w-full table-fixed caption-bottom text-sm', props.class)">
+    <table :class="cn('min-w-full table-fixed caption-bottom md:text-xs 2xl:text-sm', props.class)">
       <slot />
     </table>
   </div>
diff --git a/app/components/pub/ui/table/TableCaption.vue b/app/components/pub/ui/table/TableCaption.vue
index f2a6c194..eeb57252 100644
--- a/app/components/pub/ui/table/TableCaption.vue
+++ b/app/components/pub/ui/table/TableCaption.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
 </script>
 
 <template>
-  <caption :class="cn('mt-4 text-sm text-muted-foreground', props.class)">
+  <caption :class="cn('mt-4 md:text-xs 2xl:text-sm text-muted-foreground', props.class)">
     <slot />
   </caption>
 </template>
diff --git a/app/components/pub/ui/table/TableEmpty.vue b/app/components/pub/ui/table/TableEmpty.vue
index ff2f887e..96fafe2d 100644
--- a/app/components/pub/ui/table/TableEmpty.vue
+++ b/app/components/pub/ui/table/TableEmpty.vue
@@ -25,7 +25,7 @@ const delegatedProps = computed(() => {
     <TableCell
       :class="
         cn(
-          'p-4 whitespace-nowrap align-middle text-sm text-foreground',
+          'p-4 whitespace-nowrap align-middle md:text-xs 2xl:text-sm text-foreground',
           props.class,
         )
       "
diff --git a/app/components/pub/ui/tabs/TabsTrigger.vue b/app/components/pub/ui/tabs/TabsTrigger.vue
index 784f5b36..af9ddeb5 100644
--- a/app/components/pub/ui/tabs/TabsTrigger.vue
+++ b/app/components/pub/ui/tabs/TabsTrigger.vue
@@ -20,7 +20,7 @@ const forwardedProps = useForwardProps(delegatedProps)
   <TabsTrigger
     v-bind="forwardedProps"
     :class="cn(
-      'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm',
+      'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 md:text-xs 2xl:text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm',
       props.class,
     )"
   >
diff --git a/app/components/pub/ui/textarea/Textarea.vue b/app/components/pub/ui/textarea/Textarea.vue
index a946b49a..a29bb1b7 100644
--- a/app/components/pub/ui/textarea/Textarea.vue
+++ b/app/components/pub/ui/textarea/Textarea.vue
@@ -20,5 +20,5 @@ const modelValue = useVModel(props, 'modelValue', emits, {
 </script>
 
 <template>
-  <textarea v-model="modelValue" :class="cn('flex min-h-20 w-full rounded-md border border-slate-400 bg-white dark:bg-slate-950 px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class)" />
+  <textarea v-model="modelValue" :class="cn('flex min-h-20 w-full rounded-md border border-slate-400 bg-white dark:bg-slate-950 px-3 py-2 md:text-xs 2xl:text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class)" />
 </template>
diff --git a/app/components/pub/ui/toast/ToastAction.vue b/app/components/pub/ui/toast/ToastAction.vue
index 0a4bacc6..577b1f65 100644
--- a/app/components/pub/ui/toast/ToastAction.vue
+++ b/app/components/pub/ui/toast/ToastAction.vue
@@ -15,7 +15,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-  <ToastAction v-bind="delegatedProps" :class="cn('inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive', props.class)">
+  <ToastAction v-bind="delegatedProps" :class="cn('inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 md:text-xs 2xl:text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive', props.class)">
     <slot />
   </ToastAction>
 </template>
diff --git a/app/components/pub/ui/toast/ToastDescription.vue b/app/components/pub/ui/toast/ToastDescription.vue
index 66d36e2b..23b80db3 100644
--- a/app/components/pub/ui/toast/ToastDescription.vue
+++ b/app/components/pub/ui/toast/ToastDescription.vue
@@ -15,7 +15,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-  <ToastDescription :class="cn('text-sm opacity-90', props.class)" v-bind="delegatedProps">
+  <ToastDescription :class="cn('md:text-xs 2xl:text-sm opacity-90', props.class)" v-bind="delegatedProps">
     <slot />
   </ToastDescription>
 </template>
diff --git a/app/components/pub/ui/toast/ToastTitle.vue b/app/components/pub/ui/toast/ToastTitle.vue
index c3eb3ffc..fc62fd61 100644
--- a/app/components/pub/ui/toast/ToastTitle.vue
+++ b/app/components/pub/ui/toast/ToastTitle.vue
@@ -15,7 +15,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-  <ToastTitle v-bind="delegatedProps" :class="cn('text-sm font-semibold [&+div]:text-xs', props.class)">
+  <ToastTitle v-bind="delegatedProps" :class="cn('md:text-xs 2xl:text-sm font-semibold [&+div]:text-xs', props.class)">
     <slot />
   </ToastTitle>
 </template>

From 89b051b883dbd4a647dc4a516ea94c78264bbe1f Mon Sep 17 00:00:00 2001
From: Andrian Roshandy <andrianovsky95@gmail.com>
Date: Sun, 12 Oct 2025 13:18:46 +0700
Subject: [PATCH 5/7] feat/encounter-status-107: wip

---
 .../app/encounter/checkin-entry.vue           |  85 ++++++++++++
 .../app/encounter/checkout-entry.vue          | 125 ++++++++++++++++++
 app/components/app/encounter/status.vue       |  40 +++++-
 app/components/content/encounter/status.vue   |  78 +++++++++++
 app/lib/constants.ts                          |  14 +-
 app/schemas/encounter.schema.ts               |  23 ++++
 6 files changed, 362 insertions(+), 3 deletions(-)
 create mode 100644 app/components/app/encounter/checkin-entry.vue
 create mode 100644 app/components/app/encounter/checkout-entry.vue
 create mode 100644 app/components/content/encounter/status.vue
 create mode 100644 app/schemas/encounter.schema.ts

diff --git a/app/components/app/encounter/checkin-entry.vue b/app/components/app/encounter/checkin-entry.vue
new file mode 100644
index 00000000..0fa69b01
--- /dev/null
+++ b/app/components/app/encounter/checkin-entry.vue
@@ -0,0 +1,85 @@
+<script lang="ts" setup>
+//
+import { useForm } from 'vee-validate'
+import { toTypedSchema } from '@vee-validate/zod'
+
+//
+import { getValueLabelList } from '~/services/doctor.service'
+
+// Components
+import type z from 'zod'
+import * as CB from '~/components/pub/my-ui/combobox'
+import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { CheckInFormData } from '~/schemas/encounter.schema'
+import type { Encounter } from '~/models/encounter'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  values: any
+  encounter: Encounter
+  isLoading?: boolean
+  isReadonly?: boolean
+}
+const props = defineProps<Props>()
+
+let doctors = await getValueLabelList()
+
+const emit = defineEmits<{
+  submit: [values: CheckInFormData]
+  cancel: [resetForm: () => void]
+}>()
+
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    responsibleDoctor_id: 0,
+    adm_employee_id: 0,
+    registeredAt: '',
+  } as Partial<CheckInFormData>,
+})
+
+const [responsibleDoctor_id, responsibleDoctor_idAttrs] = defineField('responsibleDoctor_id')
+const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
+const [unit_id, unit_idAttrs] = defineField('unit_id')
+
+</script>
+
+<template>
+  <DE.Block>
+    <DE.Cell>
+      <DE.Label>Dokter</DE.Label>
+      <DE.Field>
+        <ComboBox
+          id="doctor"
+          v-model="responsibleDoctor_id"
+          v-bind="responsibleDoctor_idAttrs"
+          :items="doctors"
+          :disabled="isLoading || isReadonly"
+          placeholder="Pilih Dokter DPJP"
+          search-placeholder="Cari Dokter DPJP"
+          empty-message="Dokter DPJP tidak ditemukan"
+        />
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label>PJ Berkas</DE.Label>
+      <DE.Field>
+        <Input :value="encounter?.adm_employee?.person?.name" />
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label>Waktu Masuk</DE.Label>
+      <DE.Field>
+        <Input :value="encounter?.registeredAt" />
+      </DE.Field>
+    </DE.Cell>
+  </DE.Block>
+  <div class="text-center">
+    <Button>Simpan</Button>
+  </div>
+</template>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/components/app/encounter/checkout-entry.vue b/app/components/app/encounter/checkout-entry.vue
new file mode 100644
index 00000000..60e5c982
--- /dev/null
+++ b/app/components/app/encounter/checkout-entry.vue
@@ -0,0 +1,125 @@
+<script lang="ts" setup>
+//
+import { useForm } from 'vee-validate'
+import { toTypedSchema } from '@vee-validate/zod'
+
+//
+import type z from 'zod'
+import * as CB from '~/components/pub/my-ui/combobox'
+import { dischargeMethodCodes } from '~/lib/constants';
+import type { CheckOutFormData } from '~/schemas/encounter.schema'
+
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  units: any[]
+  doctors: any[]
+  values: any
+  isLoading?: boolean
+  isReadonly?: boolean
+}
+const props = defineProps<Props>()
+
+const dischargeMethodItems = CB.recStrToItem(dischargeMethodCodes)
+
+const emit = defineEmits<{
+  submit: [values: CheckOutFormData]
+  cancel: [resetForm: () => void]
+}>()
+
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    dischargeMethod_code: '',
+    unit_id: 0,
+    responsible_doctor_id: 0,
+  } as Partial<CheckOutFormData>,
+})
+
+const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
+const [unit_id, unit_idAttrs] = defineField('unit_id')
+const [responsible_doctor_id, responsible_doctor_idAttrs] = defineField('responsible_doctor_id')
+
+function onSubmitForm(values: any) {
+  const formData: CheckOutFormData = {
+    dischargeMethod_code: '',
+    unit_id: 0,
+    responsible_doctor_id: 0,
+  }
+  emit('submit', formData)
+}
+
+const resetForm = () => {
+  dischargeMethod_code.value = ''
+  unit_id.value = ''
+  responsible_doctor_id.value = ''
+}
+
+</script>
+
+<template>
+  <DE.Block>
+    <DE.Cell>
+      <DE.Label>Cara Keluar</DE.Label>
+      <DE.Field>
+        <CB.Combobox
+          id="dischargeMethodItems"
+          v-model="dischargeMethod_code"
+          v-bind="dischargeMethod_codeAttrs"
+          :items="dischargeMethodItems"
+          :disabled="isLoading || isReadonly"
+          placeholder="Pilih Cara Keluar"
+          search-placeholder="Cari Cara Keluar"
+          empty-message="Cara Keluar tidak ditemukan"
+        />
+        {{ dischargeMethod_code }}
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label>Klinik</DE.Label>
+      <DE.Field>
+        <CB.Combobox
+          id="dischargeMethodItems"
+          v-model="unit_id"
+          v-bind="unit_idAttrs"
+          :items="units"
+          :disabled="isLoading || isReadonly"
+          placeholder="Pilih Klinik"
+          search-placeholder="Cari Klinik"
+          empty-message="Klinik tidak ditemukan"
+        />
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label>DPJP</DE.Label>
+      <DE.Field>
+        <CB.Combobox
+          id="dischargeMethodItems"
+          v-model="responsible_doctor_id"
+          v-bind="responsible_doctor_idAttrs"
+          :items="doctors"
+          :disabled="isLoading || isReadonly"
+          placeholder="Pilih Dokter"
+          search-placeholder="Cari Dokter"
+          empty-message="Dokter tidak ditemukan"
+        />
+      </DE.Field>
+    </DE.Cell>
+  </DE.Block>
+  <div class="text-center">
+    <Button
+       v-if="!isReadonly"
+        type="button"
+        class="w-[120px]"
+        :disabled="isLoading || !meta.valid"
+        @click="onSubmitForm"
+    >
+      Simpan
+    </Button>
+  </div>
+</template>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/components/app/encounter/status.vue b/app/components/app/encounter/status.vue
index e45c0a78..1dcd2ea6 100644
--- a/app/components/app/encounter/status.vue
+++ b/app/components/app/encounter/status.vue
@@ -1,6 +1,44 @@
 <script setup lang="ts">
+// Type Const Var
+import { dischargeMethodCodes } from '~/lib/constants'
+import { type Item, recStrToItem } from '~/components/pub/my-ui/combobox'
+
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+
+// Components
+// import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
+import ComboBox from '~/components/pub/my-ui/form/combobox.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+
+const dischargeMethodItems = recStrToItem(dischargeMethodCodes)
+let selectedItemLabel = 'test'
+let selectedItem = ref<Item>({ label: '', value: '' })
+
+const selectDischargeMethod = (item: Item) => {
+  selectedItem.value = item
+}
 </script>
 
 <template>
-  <div class="p-10 text-center">Hello World!!!</div>
+  <div class="lg:grid grid-cols-2">
+    <div class="border-r lg:pe-4 xl:pe-5">
+      <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
+    </div>
+    <div class="lg:ps-4 xl:ps-5">
+      <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
+      <DE.Block>
+        <DE.Cell>
+          <DE.Label>Cara Keluar</DE.Label>
+          <DE.Field>
+            <ComboBox id="sumpeh_lu" :items="dischargeMethodItems" :modelValue="selectedItemLabel" />
+            <!-- {{ selectedItem.value }} - 
+            {{ selectedItem.label }} -->
+          </DE.Field>
+        </DE.Cell>
+      </DE.Block>
+    </div>
+  </div>
 </template>
\ No newline at end of file
diff --git a/app/components/content/encounter/status.vue b/app/components/content/encounter/status.vue
new file mode 100644
index 00000000..e280d03e
--- /dev/null
+++ b/app/components/content/encounter/status.vue
@@ -0,0 +1,78 @@
+<script setup lang="ts">
+//
+import { getValueLabelList as getDoctorValueLabelList } from '~/services/doctor.service'
+import { getValueLabelList as getUnitValueLabelList } from '~/services/unit.service'
+import type { CheckInFormData, CheckOutFormData } from '~/schemas/encounter.schema'
+import { CheckInSchema, CheckOutSchema } from '~/schemas/encounter.schema'
+
+//
+import Checkin from '~/components/app/encounter/checkin-entry.vue'
+import Checkout from '~/components/app/encounter/checkout-entry.vue'
+import type { Encounter } from '~/models/encounter'
+
+//
+const props = defineProps<{
+  encounter: Encounter
+}>()
+
+// doctors
+const doctors = await getDoctorValueLabelList()
+
+// units
+const units = await getUnitValueLabelList()
+
+// check in
+const checkInValues = ref<any>({
+  dischargeMethod_code: '',
+  unit_id: 0,
+  responsibleDoctor_id: 0,
+})
+const checkInIsLoading = ref(false)
+const checkInIsReadonly = ref(false)
+
+// check out
+const checkOutValues = ref<any>({
+  dischargeMethod_code: '',
+  unit_id: 0,
+  responsibleDoctor_id: 0,
+})
+const checkOutIsLoading = ref(false)
+const checkOutIsReadonly = ref(false)
+
+function checkInSubmit(values: CheckInFormData) {
+  console.log(values)
+}
+
+function checkOutSubmit(values: CheckOutFormData) {
+  console.log(values)
+}
+</script>
+
+<template>
+  <div class="lg:grid grid-cols-2">
+    <div class="border-r lg:pe-4 xl:pe-5">
+      <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
+      <Checkin
+        :schema="CheckInSchema"
+        :doctors="doctors"
+        :encounter="encounter"
+        :values="checkInValues"
+        :is-loading="checkOutIsLoading"
+        :is-readonly="checkOutIsReadonly"
+        @submit="checkInSubmit"
+      />
+    </div>
+    <div class="lg:ps-4 xl:ps-5">
+      <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
+      <Checkout
+        :schema="CheckOutSchema"
+        :doctors="doctors"
+        :units="units"
+        :values="checkOutValues"
+        :is-loading="checkOutIsLoading"
+        :is-readonly="checkOutIsReadonly"
+        @submit="checkOutSubmit"
+      />
+    </div>
+  </div>
+</template>
\ No newline at end of file
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index 05213784..e2a49ef9 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -67,8 +67,18 @@ export const timeUnitCodes: Record<string, string> = {
 }
 
 export const dischargeMethodCodes: Record<string, string> = {
-  home: 'Home',
-  'home-request': 'Home Request',
+  home: "Pulang",
+  "home-request": "Pulang Atas Permintaan Sendiri",
+  "consul-back": "Konsultasi Balik / Lanjutan",
+  "consul-poly": "Konsultasi Poliklinik Lain",
+  "consul-executive": "Konsultasi Antar Dokter Eksekutif",
+  "consul-ch-day": "Konsultasi Hari Lain",
+  emergency: "Rujuk IGD",
+  "emergency-covid": "Rujuk IGD Covid",
+  inpatient: "Rujuk Rawat Inap",
+  external: "Rujuk Faskes Lain",
+  death: "Meninggal",
+  "death-on-arrival": "Meninggal Saat Tiba"
 }
 
 export const genderCodes: Record<string, string> = {
diff --git a/app/schemas/encounter.schema.ts b/app/schemas/encounter.schema.ts
new file mode 100644
index 00000000..96302993
--- /dev/null
+++ b/app/schemas/encounter.schema.ts
@@ -0,0 +1,23 @@
+import { z } from 'zod'
+
+// Check In
+const CheckInSchema = z.object({
+  registeredAt: z.string({ required_error: 'Tanggal masuk harus diisi' }),
+  responsible_doctor_id: z.number({ required_error: 'Dokter harus diisi' }).gt(0, 'Dokter harus diisi'),
+  adm_employee_id: z.number({ required_error: 'PJA harus diisi' }).gt(0, 'PJA harus diisi'),
+})
+type CheckInFormData = z.infer<typeof CheckInSchema>
+
+export { CheckInSchema }
+export type { CheckInFormData }
+
+// Check Out
+const CheckOutSchema = z.object({
+  dischargeMethod_code: z.string({ required_error: 'Metode pulang harus diisi' }),
+  unit_id: z.number(),
+  responsible_doctor_id: z.number(),
+})
+type CheckOutFormData = z.infer<typeof CheckOutSchema>
+
+export { CheckOutSchema }
+export type { CheckOutFormData }

From 6bdee66cc6fa8d05315eea10c6a034680f0b8049 Mon Sep 17 00:00:00 2001
From: Andrian Roshandy <andrianovsky95@gmail.com>
Date: Mon, 13 Oct 2025 06:26:30 +0700
Subject: [PATCH 6/7] feat/encounter: wip

---
 .../app/encounter/checkin-entry.vue           |  6 +-
 .../app/encounter/checkout-entry.vue          | 74 ++++++++++++++++---
 app/components/app/encounter/status.vue       | 44 -----------
 app/components/content/encounter/process.vue  | 10 +--
 app/components/content/encounter/status.vue   |  7 +-
 app/schemas/encounter.schema.ts               | 24 ++++--
 app/services/doctor.service.ts                | 39 ++++++++++
 7 files changed, 130 insertions(+), 74 deletions(-)
 delete mode 100644 app/components/app/encounter/status.vue
 create mode 100644 app/services/doctor.service.ts

diff --git a/app/components/app/encounter/checkin-entry.vue b/app/components/app/encounter/checkin-entry.vue
index 0fa69b01..b70b277c 100644
--- a/app/components/app/encounter/checkin-entry.vue
+++ b/app/components/app/encounter/checkin-entry.vue
@@ -40,13 +40,13 @@ const { defineField, errors, meta } = useForm({
 })
 
 const [responsibleDoctor_id, responsibleDoctor_idAttrs] = defineField('responsibleDoctor_id')
-const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
-const [unit_id, unit_idAttrs] = defineField('unit_id')
+// const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
+// const [unit_id, unit_idAttrs] = defineField('unit_id')
 
 </script>
 
 <template>
-  <DE.Block>
+  <DE.Block :cell-flex="false">
     <DE.Cell>
       <DE.Label>Dokter</DE.Label>
       <DE.Field>
diff --git a/app/components/app/encounter/checkout-entry.vue b/app/components/app/encounter/checkout-entry.vue
index 60e5c982..fa75911b 100644
--- a/app/components/app/encounter/checkout-entry.vue
+++ b/app/components/app/encounter/checkout-entry.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup>
 //
-import { useForm } from 'vee-validate'
+import { useForm, useFieldArray } from 'vee-validate'
 import { toTypedSchema } from '@vee-validate/zod'
 
 //
 import type z from 'zod'
 import * as CB from '~/components/pub/my-ui/combobox'
 import { dischargeMethodCodes } from '~/lib/constants';
-import type { CheckOutFormData } from '~/schemas/encounter.schema'
+import type { CheckOutFormData, ConsulPoliesFormData } from '~/schemas/encounter.schema'
 
+import * as Table from '~/components/pub/ui/table'
 import * as DE from '~/components/pub/my-ui/doc-entry'
 
 interface Props {
@@ -32,34 +33,36 @@ const { defineField, errors, meta } = useForm({
   validationSchema: toTypedSchema(props.schema),
   initialValues: {
     dischargeMethod_code: '',
-    unit_id: 0,
     responsible_doctor_id: 0,
+    consulPolies: [],
   } as Partial<CheckOutFormData>,
 })
+const { fields, push, remove } = useFieldArray('consulPolies');
 
 const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
-const [unit_id, unit_idAttrs] = defineField('unit_id')
+// const [consulPolies, consulPoliesAttrs] = defineField<ConsulPoliesFormData[]>([])
 const [responsible_doctor_id, responsible_doctor_idAttrs] = defineField('responsible_doctor_id')
 
 function onSubmitForm(values: any) {
   const formData: CheckOutFormData = {
     dischargeMethod_code: '',
-    unit_id: 0,
+    // unit_id: 0,
     responsible_doctor_id: 0,
+    consulPolies: [],
   }
   emit('submit', formData)
 }
 
 const resetForm = () => {
   dischargeMethod_code.value = ''
-  unit_id.value = ''
+  // unit_id.value = ''
   responsible_doctor_id.value = ''
 }
 
 </script>
 
 <template>
-  <DE.Block>
+  <DE.Block :cellFlex="false">
     <DE.Cell>
       <DE.Label>Cara Keluar</DE.Label>
       <DE.Field>
@@ -73,10 +76,9 @@ const resetForm = () => {
           search-placeholder="Cari Cara Keluar"
           empty-message="Cara Keluar tidak ditemukan"
         />
-        {{ dischargeMethod_code }}
       </DE.Field>
     </DE.Cell>
-    <DE.Cell>
+    <!-- <DE.Cell>
       <DE.Label>Klinik</DE.Label>
       <DE.Field>
         <CB.Combobox
@@ -90,8 +92,9 @@ const resetForm = () => {
           empty-message="Klinik tidak ditemukan"
         />
       </DE.Field>
-    </DE.Cell>
-    <DE.Cell>
+    </DE.Cell> -->
+
+    <DE.Cell v-if="['emergency', 'emergency-covid'].includes(dischargeMethod_code)">
       <DE.Label>DPJP</DE.Label>
       <DE.Field>
         <CB.Combobox
@@ -106,6 +109,55 @@ const resetForm = () => {
         />
       </DE.Field>
     </DE.Cell>
+
+    <DE.Cell>
+      <DE.Label>Tujuan</DE.Label>
+      <DE.Field>
+        <Table.Table class="border mb-3">
+          <Table.TableHeader class="bg-neutral-100 dark:bg-slate-800">
+            <Table.TableCell class="text-center">Poly</Table.TableCell>
+            <Table.TableCell class="text-center">DPJP</Table.TableCell>
+            <Table.TableCell class="text-center !w-10"></Table.TableCell>
+          </Table.TableHeader>
+          <Table.TableBody>
+            <Table.TableRow v-for="(item, index) in fields" :key="index">
+              <Table.TableCell class="!p-0.5">
+                <CB.Combobox
+                  id="dischargeMethodItems"
+                  v-model="item.value.unit_id"
+                  v-bind="unit_idAttrs"
+                  :items="units"
+                  :disabled="isLoading || isReadonly"
+                  placeholder="Pilih Poly"
+                  search-placeholder="Cari Poly"
+                  empty-message="Poly tidak ditemukan"
+                />
+              </Table.TableCell>
+              <Table.TableCell class="!p-0.5">
+                <CB.Combobox
+                  id="dischargeMethodItems"
+                  v-model="responsible_doctor_id"
+                  v-bind="responsible_doctor_idAttrs"
+                  :items="units"
+                  :disabled="isLoading || isReadonly"
+                  placeholder="Pilih Dokter"
+                  search-placeholder="Cari Dokter"
+                  empty-message="Dokter tidak ditemukan"
+                />
+              </Table.TableCell>
+              <Table.TableCell>
+                <Button variant="destructive" size="xs" @click="remove(index)" class="w-6 h-6 rounded-full">
+                  X
+                </Button>
+              </Table.TableCell>
+            </Table.TableRow>
+          </Table.TableBody>
+        </Table.Table>
+        <div>
+          <Button @click="push({ unit_id: '', responsible_doctor_id: '' })">Tambah</Button>
+        </div>
+      </DE.Field>
+    </DE.Cell>
   </DE.Block>
   <div class="text-center">
     <Button
diff --git a/app/components/app/encounter/status.vue b/app/components/app/encounter/status.vue
deleted file mode 100644
index 1dcd2ea6..00000000
--- a/app/components/app/encounter/status.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-// Type Const Var
-import { dischargeMethodCodes } from '~/lib/constants'
-import { type Item, recStrToItem } from '~/components/pub/my-ui/combobox'
-
-// Helpers
-import type z from 'zod'
-import { toTypedSchema } from '@vee-validate/zod'
-import { useForm } from 'vee-validate'
-
-// Components
-// import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
-import ComboBox from '~/components/pub/my-ui/form/combobox.vue'
-import * as DE from '~/components/pub/my-ui/doc-entry'
-
-const dischargeMethodItems = recStrToItem(dischargeMethodCodes)
-let selectedItemLabel = 'test'
-let selectedItem = ref<Item>({ label: '', value: '' })
-
-const selectDischargeMethod = (item: Item) => {
-  selectedItem.value = item
-}
-</script>
-
-<template>
-  <div class="lg:grid grid-cols-2">
-    <div class="border-r lg:pe-4 xl:pe-5">
-      <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
-    </div>
-    <div class="lg:ps-4 xl:ps-5">
-      <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
-      <DE.Block>
-        <DE.Cell>
-          <DE.Label>Cara Keluar</DE.Label>
-          <DE.Field>
-            <ComboBox id="sumpeh_lu" :items="dischargeMethodItems" :modelValue="selectedItemLabel" />
-            <!-- {{ selectedItem.value }} - 
-            {{ selectedItem.label }} -->
-          </DE.Field>
-        </DE.Cell>
-      </DE.Block>
-    </div>
-  </div>
-</template>
\ No newline at end of file
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 67e71ddd..def99f93 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -9,13 +9,13 @@ import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
 
 import { getDetail } from '~/services/encounter.service'
 
-import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
-import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
-import PrescriptionList from '~/components/content/prescription/list.vue'
 import type { Encounter } from '~/models/encounter'
-import Status from '~/components/app/encounter/status.vue'
-// import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
+
+import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
+import Status from '~/components/content/encounter/status.vue'
+import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
 import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
+import PrescriptionList from '~/components/content/prescription/list.vue'
 
 const route = useRoute()
 const router = useRouter()
diff --git a/app/components/content/encounter/status.vue b/app/components/content/encounter/status.vue
index e280d03e..9b68fcb0 100644
--- a/app/components/content/encounter/status.vue
+++ b/app/components/content/encounter/status.vue
@@ -50,19 +50,20 @@ function checkOutSubmit(values: CheckOutFormData) {
 
 <template>
   <div class="lg:grid grid-cols-2">
-    <div class="border-r lg:pe-4 xl:pe-5">
+    <div class="border-r lg:pe-4 xl:pe-5 mb-10">
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
       <Checkin
         :schema="CheckInSchema"
         :doctors="doctors"
         :encounter="encounter"
         :values="checkInValues"
-        :is-loading="checkOutIsLoading"
-        :is-readonly="checkOutIsReadonly"
+        :is-loading="checkInIsLoading"
+        :is-readonly="checkInIsReadonly"
         @submit="checkInSubmit"
       />
     </div>
     <div class="lg:ps-4 xl:ps-5">
+      <Separator class="lg:hidden my-4 xl:my-5" />
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
       <Checkout
         :schema="CheckOutSchema"
diff --git a/app/schemas/encounter.schema.ts b/app/schemas/encounter.schema.ts
index 96302993..49636222 100644
--- a/app/schemas/encounter.schema.ts
+++ b/app/schemas/encounter.schema.ts
@@ -8,16 +8,24 @@ const CheckInSchema = z.object({
 })
 type CheckInFormData = z.infer<typeof CheckInSchema>
 
-export { CheckInSchema }
-export type { CheckInFormData }
-
-// Check Out
-const CheckOutSchema = z.object({
-  dischargeMethod_code: z.string({ required_error: 'Metode pulang harus diisi' }),
+// Check Out Consul Polis
+const ConsulPoliesSchema = z.object({
   unit_id: z.number(),
   responsible_doctor_id: z.number(),
+
+})
+type ConsulPoliesFormData = z.infer<typeof ConsulPoliesSchema>
+
+// Checkout
+const CheckOutSchema = z.object({
+  dischargeMethod_code: z.string({ required_error: 'Metode pulang harus diisi' }),
+  // unit_id: z.number(),
+  consulPolies: z.array(ConsulPoliesSchema),
+  responsible_doctor_id: z.number(),
+
 })
 type CheckOutFormData = z.infer<typeof CheckOutSchema>
 
-export { CheckOutSchema }
-export type { CheckOutFormData }
+// Exports
+export { CheckInSchema, CheckOutSchema }
+export type { CheckInFormData, CheckOutFormData, ConsulPoliesFormData }
diff --git a/app/services/doctor.service.ts b/app/services/doctor.service.ts
new file mode 100644
index 00000000..34f21f1a
--- /dev/null
+++ b/app/services/doctor.service.ts
@@ -0,0 +1,39 @@
+// Base
+import * as base from './_crud-base'
+import type { Doctor } from "~/models/doctor";
+
+const path = '/api/v1/device'
+const name = 'device'
+
+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) {
+  return base.getDetail(path, id, name)
+}
+
+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)
+}
+
+export async function getValueLabelList(params: any = null): 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: Doctor) => ({
+      value: item.id,
+      label: item.employee.person.name,
+    }))
+  }
+  return data
+}

From 3f77d927b62827433d8a41be02be1bbe11a7c56c Mon Sep 17 00:00:00 2001
From: Andrian Roshandy <andrianovsky95@gmail.com>
Date: Tue, 21 Oct 2025 22:48:34 +0700
Subject: [PATCH 7/7] feat/encounter: done

---
 .../app/encounter/check-in-entry.vue          | 107 +++++++++++++
 .../app/encounter/check-in-view.vue           |  56 +++++++
 ...checkout-entry.vue => check-out-entry.vue} | 146 ++++++++++--------
 .../app/encounter/check-out-view.vue          |  90 +++++++++++
 .../app/encounter/checkin-entry.vue           |  85 ----------
 app/components/content/encounter/status.vue   |  90 ++++++++---
 app/models/death-cause.ts                     |   6 +
 app/models/encounter.ts                       |   7 +-
 app/models/internal-reference.ts              |  12 ++
 app/schemas/encounter.schema.ts               |  49 ++++--
 app/schemas/internal-reference.schema.ts      |  12 ++
 app/services/doctor.service.ts                |   2 +-
 app/services/employee.service.ts              |   2 +-
 app/services/encounter.service.ts             |  14 ++
 14 files changed, 484 insertions(+), 194 deletions(-)
 create mode 100644 app/components/app/encounter/check-in-entry.vue
 create mode 100644 app/components/app/encounter/check-in-view.vue
 rename app/components/app/encounter/{checkout-entry.vue => check-out-entry.vue} (53%)
 create mode 100644 app/components/app/encounter/check-out-view.vue
 delete mode 100644 app/components/app/encounter/checkin-entry.vue
 create mode 100644 app/models/death-cause.ts
 create mode 100644 app/models/internal-reference.ts
 create mode 100644 app/schemas/internal-reference.schema.ts

diff --git a/app/components/app/encounter/check-in-entry.vue b/app/components/app/encounter/check-in-entry.vue
new file mode 100644
index 00000000..ad7de5d6
--- /dev/null
+++ b/app/components/app/encounter/check-in-entry.vue
@@ -0,0 +1,107 @@
+<script lang="ts" setup>
+//
+import { LucideCheck } from 'lucide-vue-next';
+import { useForm } from 'vee-validate'
+import { toTypedSchema } from '@vee-validate/zod'
+
+// Components
+import type z from 'zod'
+import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { CheckInFormData } from '~/schemas/encounter.schema'
+import type { Encounter } from '~/models/encounter'
+
+interface Props {
+  schema: z.ZodSchema<any>
+  values: any
+  doctors: { value: string; label: string }[]
+  employees: { value: string; label: string }[]
+  encounter: Encounter
+  isLoading?: boolean
+  isReadonly?: boolean
+}
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  submit: [values: CheckInFormData]
+  cancel: [resetForm: () => void]
+}>()
+
+const { defineField, errors, meta } = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: {
+    responsible_doctor_id: 0,
+    adm_employee_id: 0,
+    registeredAt: props.values.values?.registeredAt || '',
+  } as Partial<CheckInFormData>,
+})
+
+const [responsible_doctor_id, responsible_doctor_idAttrs] = defineField('responsible_doctor_id')
+const [adm_employee_id, adm_employee_idAttrs] = defineField('discharge_method_code')
+const [registeredAt, registeredAtAttrs] = defineField('registeredAt')
+
+function submitForm() {
+  const formData: CheckInFormData = {
+    responsible_doctor_id: responsible_doctor_id.value,
+    adm_employee_id: adm_employee_id.value,
+    // registeredAt: registeredAt.value || '',
+  }
+  emit('submit', formData)
+}
+</script>
+
+<template>
+  <DE.Block :cell-flex="false">
+    <DE.Cell>
+      <DE.Label>Dokter</DE.Label>
+      <DE.Field>
+        <ComboBox
+          id="doctor"
+          v-model="responsible_doctor_id"
+          v-bind="responsible_doctor_idAttrs"
+          :items="doctors"
+          :disabled="isLoading || isReadonly"
+          placeholder="Pilih Dokter DPJP"
+          search-placeholder="Pilih DPJP"
+          empty-message="DPJP tidak ditemukan"
+        />
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label>PJ Berkas</DE.Label>
+      <DE.Field>
+        <ComboBox
+          id="doctor"
+          v-model="adm_employee_id"
+          v-bind="adm_employee_idAttrs"
+          :items="employees"
+          :disabled="isLoading || isReadonly"
+          placeholder="Pilih Dokter DPJP"
+          search-placeholder="Pilih petugas"
+          empty-message="Petugas tidak ditemukan"
+        />
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label>Waktu Masuk</DE.Label>
+      <DE.Field>
+        <Input
+            id="name"
+            v-model="registeredAt"
+            v-bind="registeredAtAttrs"
+            :disabled="isLoading || isReadonly"
+          />
+      </DE.Field>
+    </DE.Cell>
+  </DE.Block>
+  <div class="text-center">
+    <Button @click="submitForm">
+      <LucideCheck />
+      Simpan
+    </Button>
+  </div>
+</template>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/components/app/encounter/check-in-view.vue b/app/components/app/encounter/check-in-view.vue
new file mode 100644
index 00000000..a3b6ab53
--- /dev/null
+++ b/app/components/app/encounter/check-in-view.vue
@@ -0,0 +1,56 @@
+<script lang="ts" setup>
+// Components
+import { LucidePen } from 'lucide-vue-next';
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import Input from '~/components/pub/ui/input/Input.vue';
+import type { Encounter } from '~/models/encounter'
+
+interface Props {
+  encounter: Encounter
+}
+const props = defineProps<Props>()
+const doctor = ref('-belum dipilih-')
+const adm = ref('-belum dipilih-')
+
+const emit = defineEmits<{
+  edit: []
+}>()
+
+watch(props.encounter, () => {
+  doctor.value = props.encounter.responsible_doctor?.employee?.person?.name ?? props.encounter.appointment_doctor?.employee?.person?.name ?? '-belum dipilih-'
+  adm.value = props.encounter.adm_employee?.person?.name ?? '-belum dipilih-'
+})
+</script>
+
+<template>
+  <DE.Block :cell-flex="false">
+    <DE.Cell>
+      <DE.Label class="font-semibold">Dokter</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ doctor }}</div>
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label class="font-semibold">PJ Berkas</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ adm }}</div>
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label class="font-semibold">Waktu Masuk</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter?.registeredAt || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
+  </DE.Block>
+  <div class="text-center">
+    <Button @click="() => emit('edit')">
+      <LucidePen />
+      Edit
+    </Button>
+  </div>
+</template>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/components/app/encounter/checkout-entry.vue b/app/components/app/encounter/check-out-entry.vue
similarity index 53%
rename from app/components/app/encounter/checkout-entry.vue
rename to app/components/app/encounter/check-out-entry.vue
index fa75911b..fb8b4333 100644
--- a/app/components/app/encounter/checkout-entry.vue
+++ b/app/components/app/encounter/check-out-entry.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 //
+import { LucideCheck } from 'lucide-vue-next';
 import { useForm, useFieldArray } from 'vee-validate'
 import { toTypedSchema } from '@vee-validate/zod'
 
@@ -7,16 +8,21 @@ import { toTypedSchema } from '@vee-validate/zod'
 import type z from 'zod'
 import * as CB from '~/components/pub/my-ui/combobox'
 import { dischargeMethodCodes } from '~/lib/constants';
-import type { CheckOutFormData, ConsulPoliesFormData } from '~/schemas/encounter.schema'
+import type {
+  CheckOutFormData,
+  CheckOutDeathFormData,
+  CheckOutInternalReferenceFormData
+} from '~/schemas/encounter.schema'
 
 import * as Table from '~/components/pub/ui/table'
 import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { InternalReference, CreateDto as InternalReferenceCreateDto } from '~/models/internal-reference';
 
 interface Props {
   schema: z.ZodSchema<any>
+  values: any
   units: any[]
   doctors: any[]
-  values: any
   isLoading?: boolean
   isReadonly?: boolean
 }
@@ -32,44 +38,55 @@ const emit = defineEmits<{
 const { defineField, errors, meta } = useForm({
   validationSchema: toTypedSchema(props.schema),
   initialValues: {
-    dischargeMethod_code: '',
-    responsible_doctor_id: 0,
-    consulPolies: [],
+    discharge_method_code: '',
+    discharge_date: '',
+    internalReferences: [{ unit_id: 0, doctor_id: 0 }],
+    deathCauses: [""],
   } as Partial<CheckOutFormData>,
 })
-const { fields, push, remove } = useFieldArray('consulPolies');
+const [ discharge_method_code, discharge_method_codeAttrs ] = defineField('discharge_method_code')
+const [ discharge_date, discharge_dateAttrs ] = defineField('discharge_date') 
+const { fields, push, remove } = useFieldArray<InternalReferenceCreateDto>('internalReferences');
 
-const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
-// const [consulPolies, consulPoliesAttrs] = defineField<ConsulPoliesFormData[]>([])
-const [responsible_doctor_id, responsible_doctor_idAttrs] = defineField('responsible_doctor_id')
-
-function onSubmitForm(values: any) {
-  const formData: CheckOutFormData = {
-    dischargeMethod_code: '',
-    // unit_id: 0,
-    responsible_doctor_id: 0,
-    consulPolies: [],
+function submitForm(values: any) {
+  if (['consul-poly', 'consul-executive'].includes(discharge_method_code.value)) {
+    const formData: CheckOutInternalReferenceFormData = {
+      discharge_method_code: discharge_method_code.value,
+      discharge_date: discharge_date.value,
+      internalReferences: [{ unit_id: 0, doctor_id: 0 }],
+    }
+    emit('submit', formData)
+  } else if (discharge_method_code.value === 'death') {
+    const formData: CheckOutDeathFormData = {
+      discharge_method_code: discharge_method_code.value,
+      discharge_date: discharge_date.value,
+      death_cause: [""],
+    }
+    emit('submit', formData)
+  } else {
+    const formData: CheckOutFormData = {
+      discharge_method_code: discharge_method_code.value,
+      discharge_date: discharge_date.value,
+    }
+    emit('submit', formData)
   }
-  emit('submit', formData)
 }
 
 const resetForm = () => {
-  dischargeMethod_code.value = ''
-  // unit_id.value = ''
-  responsible_doctor_id.value = ''
+  discharge_method_code.value = ''
+  discharge_date.value = ''
 }
-
 </script>
 
 <template>
   <DE.Block :cellFlex="false">
     <DE.Cell>
-      <DE.Label>Cara Keluar</DE.Label>
+      <DE.Label>Alasan Keluar</DE.Label>
       <DE.Field>
         <CB.Combobox
           id="dischargeMethodItems"
-          v-model="dischargeMethod_code"
-          v-bind="dischargeMethod_codeAttrs"
+          v-model="discharge_method_code"
+          v-bind="discharge_method_codeAttrs"
           :items="dischargeMethodItems"
           :disabled="isLoading || isReadonly"
           placeholder="Pilih Cara Keluar"
@@ -78,39 +95,39 @@ const resetForm = () => {
         />
       </DE.Field>
     </DE.Cell>
-    <!-- <DE.Cell>
-      <DE.Label>Klinik</DE.Label>
-      <DE.Field>
-        <CB.Combobox
-          id="dischargeMethodItems"
-          v-model="unit_id"
-          v-bind="unit_idAttrs"
-          :items="units"
-          :disabled="isLoading || isReadonly"
-          placeholder="Pilih Klinik"
-          search-placeholder="Cari Klinik"
-          empty-message="Klinik tidak ditemukan"
-        />
-      </DE.Field>
-    </DE.Cell> -->
-
-    <DE.Cell v-if="['emergency', 'emergency-covid'].includes(dischargeMethod_code)">
-      <DE.Label>DPJP</DE.Label>
-      <DE.Field>
-        <CB.Combobox
-          id="dischargeMethodItems"
-          v-model="responsible_doctor_id"
-          v-bind="responsible_doctor_idAttrs"
-          :items="doctors"
-          :disabled="isLoading || isReadonly"
-          placeholder="Pilih Dokter"
-          search-placeholder="Cari Dokter"
-          empty-message="Dokter tidak ditemukan"
-        />
-      </DE.Field>
-    </DE.Cell>
 
     <DE.Cell>
+      <DE.Label>Waktu Keluar</DE.Label>
+      <DE.Cell>
+        <Input
+          id="discharge_date"
+          v-model="discharge_date"
+          v-bind="discharge_dateAttrs"
+          :disabled="isLoading || isReadonly"
+        />
+      </DE.Cell>
+    </DE.Cell>
+
+    <DE.Cell v-if="'death' == discharge_method_code">
+      <DE.Label>Sebab Meninggal</DE.Label>
+      <DE.Cell>
+        <div class="mb-3">
+          <Input />
+        </div>
+        <div>
+          <Button
+            v-if="!isReadonly"
+              type="button"
+              :disabled="isLoading || !meta.valid"
+              @click="submitForm"
+          >
+            Tambah Sebab meninggal
+          </Button>
+        </div>
+      </DE.Cell>
+    </DE.Cell>
+
+    <DE.Cell v-if="['consul-poly', 'consul-executive'].includes(discharge_method_code)">
       <DE.Label>Tujuan</DE.Label>
       <DE.Field>
         <Table.Table class="border mb-3">
@@ -124,8 +141,7 @@ const resetForm = () => {
               <Table.TableCell class="!p-0.5">
                 <CB.Combobox
                   id="dischargeMethodItems"
-                  v-model="item.value.unit_id"
-                  v-bind="unit_idAttrs"
+                  :v-model.number="item.value.unit_id"
                   :items="units"
                   :disabled="isLoading || isReadonly"
                   placeholder="Pilih Poly"
@@ -136,12 +152,11 @@ const resetForm = () => {
               <Table.TableCell class="!p-0.5">
                 <CB.Combobox
                   id="dischargeMethodItems"
-                  v-model="responsible_doctor_id"
-                  v-bind="responsible_doctor_idAttrs"
+                  :v-model.number="item.value.doctor_id"
                   :items="units"
                   :disabled="isLoading || isReadonly"
                   placeholder="Pilih Dokter"
-                  search-placeholder="Cari Dokter"
+                  search-placeholder="Pilih Dokter"
                   empty-message="Dokter tidak ditemukan"
                 />
               </Table.TableCell>
@@ -154,19 +169,14 @@ const resetForm = () => {
           </Table.TableBody>
         </Table.Table>
         <div>
-          <Button @click="push({ unit_id: '', responsible_doctor_id: '' })">Tambah</Button>
+          <Button @click="push({ encounter_id: 0, unit_id: 0, doctor_id: 0 })">Tambah</Button>
         </div>
       </DE.Field>
     </DE.Cell>
   </DE.Block>
   <div class="text-center">
-    <Button
-       v-if="!isReadonly"
-        type="button"
-        class="w-[120px]"
-        :disabled="isLoading || !meta.valid"
-        @click="onSubmitForm"
-    >
+    <Button @click="submitForm">>
+      <LucideCheck />
       Simpan
     </Button>
   </div>
diff --git a/app/components/app/encounter/check-out-view.vue b/app/components/app/encounter/check-out-view.vue
new file mode 100644
index 00000000..37cd2bbe
--- /dev/null
+++ b/app/components/app/encounter/check-out-view.vue
@@ -0,0 +1,90 @@
+<script lang="ts" setup>
+//
+import { LucidePen, LucideCheck } from 'lucide-vue-next';
+
+//
+import * as CB from '~/components/pub/my-ui/combobox'
+import { dischargeMethodCodes } from '~/lib/constants';
+
+import * as Table from '~/components/pub/ui/table'
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Encounter } from '~/models/encounter';
+
+interface Props {
+  encounter: Encounter
+  isLoading?: boolean
+  isReadonly?: boolean
+}
+const props = defineProps<Props>()
+
+const dischargeMethodItems = CB.recStrToItem(dischargeMethodCodes)
+
+const emit = defineEmits<{
+  edit: [],
+  finish: []
+}>()
+</script>
+
+<template>
+  <DE.Block :cellFlex="false">
+    <DE.Cell>
+      <DE.Label class="font-semibold">Alasan Keluar</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter.discharge_method_code || '-belum ditentukan-' }}</div>
+      </DE.Field>
+    </DE.Cell>
+
+    <DE.Cell>
+      <DE.Label class="font-semibold">Waktu Keluar</DE.Label>
+      <DE.Cell>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter.discharge_date || '-belum ditentukan-' }}</div>
+      </DE.Cell>
+    </DE.Cell>
+
+    <DE.Cell v-if="'death' == encounter.discharge_method_code">
+      <DE.Label class="font-semibold">Sebab Meninggal</DE.Label>
+      <DE.Cell>
+        <div class="mb-3">
+          <div class="py-2 border-b border-b-slate-300">{{ encounter.discharge_date }}</div>
+        </div>
+      </DE.Cell>
+    </DE.Cell>
+
+    <DE.Cell v-if="['consul-poly', 'consul-executive'].includes(encounter.discharge_method_code || '')">
+      <DE.Label class="font-semibold">Tujuan</DE.Label>
+      <DE.Field>
+        <Table.Table class="border mb-3">
+          <Table.TableHeader class="bg-neutral-100 dark:bg-slate-800">
+            <Table.TableCell class="text-center">Poly</Table.TableCell>
+            <Table.TableCell class="text-center">DPJP</Table.TableCell>
+            <Table.TableCell class="text-center !w-10"></Table.TableCell>
+          </Table.TableHeader>
+          <Table.TableBody>
+            <Table.TableRow v-for="(item, index) in encounter.internalReferences" :key="index">
+              <Table.TableCell class="!p-0.5">
+              </Table.TableCell>
+              <Table.TableCell class="!p-0.5">
+              </Table.TableCell>
+              <Table.TableCell>
+              </Table.TableCell>
+            </Table.TableRow>
+          </Table.TableBody>
+        </Table.Table>
+      </DE.Field>
+    </DE.Cell>
+  </DE.Block>
+  <div class="text-center [&>*]:mx-1">
+    <Button @click="() => emit('edit')">
+      <LucidePen />
+      Edit
+    </Button>
+    <Button @click="() => emit('finish')">
+      <LucideCheck />
+      Selesai
+    </Button>
+  </div>
+</template>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/components/app/encounter/checkin-entry.vue b/app/components/app/encounter/checkin-entry.vue
deleted file mode 100644
index b70b277c..00000000
--- a/app/components/app/encounter/checkin-entry.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<script lang="ts" setup>
-//
-import { useForm } from 'vee-validate'
-import { toTypedSchema } from '@vee-validate/zod'
-
-//
-import { getValueLabelList } from '~/services/doctor.service'
-
-// Components
-import type z from 'zod'
-import * as CB from '~/components/pub/my-ui/combobox'
-import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
-import * as DE from '~/components/pub/my-ui/doc-entry'
-import type { CheckInFormData } from '~/schemas/encounter.schema'
-import type { Encounter } from '~/models/encounter'
-
-interface Props {
-  schema: z.ZodSchema<any>
-  values: any
-  encounter: Encounter
-  isLoading?: boolean
-  isReadonly?: boolean
-}
-const props = defineProps<Props>()
-
-let doctors = await getValueLabelList()
-
-const emit = defineEmits<{
-  submit: [values: CheckInFormData]
-  cancel: [resetForm: () => void]
-}>()
-
-const { defineField, errors, meta } = useForm({
-  validationSchema: toTypedSchema(props.schema),
-  initialValues: {
-    responsibleDoctor_id: 0,
-    adm_employee_id: 0,
-    registeredAt: '',
-  } as Partial<CheckInFormData>,
-})
-
-const [responsibleDoctor_id, responsibleDoctor_idAttrs] = defineField('responsibleDoctor_id')
-// const [dischargeMethod_code, dischargeMethod_codeAttrs] = defineField('dischargeMethod_code')
-// const [unit_id, unit_idAttrs] = defineField('unit_id')
-
-</script>
-
-<template>
-  <DE.Block :cell-flex="false">
-    <DE.Cell>
-      <DE.Label>Dokter</DE.Label>
-      <DE.Field>
-        <ComboBox
-          id="doctor"
-          v-model="responsibleDoctor_id"
-          v-bind="responsibleDoctor_idAttrs"
-          :items="doctors"
-          :disabled="isLoading || isReadonly"
-          placeholder="Pilih Dokter DPJP"
-          search-placeholder="Cari Dokter DPJP"
-          empty-message="Dokter DPJP tidak ditemukan"
-        />
-      </DE.Field>
-    </DE.Cell>
-    <DE.Cell>
-      <DE.Label>PJ Berkas</DE.Label>
-      <DE.Field>
-        <Input :value="encounter?.adm_employee?.person?.name" />
-      </DE.Field>
-    </DE.Cell>
-    <DE.Cell>
-      <DE.Label>Waktu Masuk</DE.Label>
-      <DE.Field>
-        <Input :value="encounter?.registeredAt" />
-      </DE.Field>
-    </DE.Cell>
-  </DE.Block>
-  <div class="text-center">
-    <Button>Simpan</Button>
-  </div>
-</template>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/app/components/content/encounter/status.vue b/app/components/content/encounter/status.vue
index 9b68fcb0..513a7ab5 100644
--- a/app/components/content/encounter/status.vue
+++ b/app/components/content/encounter/status.vue
@@ -1,14 +1,19 @@
 <script setup lang="ts">
 //
 import { getValueLabelList as getDoctorValueLabelList } from '~/services/doctor.service'
+import { getValueLabelList as getEmployeeValueLabelList } from '~/services/employee.service'
 import { getValueLabelList as getUnitValueLabelList } from '~/services/unit.service'
 import type { CheckInFormData, CheckOutFormData } from '~/schemas/encounter.schema'
 import { CheckInSchema, CheckOutSchema } from '~/schemas/encounter.schema'
 
 //
-import Checkin from '~/components/app/encounter/checkin-entry.vue'
-import Checkout from '~/components/app/encounter/checkout-entry.vue'
+import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import CheckInView from '~/components/app/encounter/check-in-view.vue'
+import CheckInEntry from '~/components/app/encounter/check-in-entry.vue'
+import CheckOutView from '~/components/app/encounter/check-out-view.vue'
+import CheckOutEntry from '~/components/app/encounter/check-out-entry.vue'
 import type { Encounter } from '~/models/encounter'
+import { checkIn } from '~/services/encounter.service'
 
 //
 const props = defineProps<{
@@ -16,19 +21,19 @@ const props = defineProps<{
 }>()
 
 // doctors
-const doctors = await getDoctorValueLabelList()
-
-// units
+const doctors = await getDoctorValueLabelList({'includes': 'employee,employee-person'})
+const employees = await getEmployeeValueLabelList({'includes': 'person', 'position-code': 'reg'})
 const units = await getUnitValueLabelList()
 
 // check in
 const checkInValues = ref<any>({
-  dischargeMethod_code: '',
-  unit_id: 0,
-  responsibleDoctor_id: 0,
+  discharge_method_code: '',
+  responsible_doctor_id: 0,
+  // registeredAt: '',
 })
 const checkInIsLoading = ref(false)
 const checkInIsReadonly = ref(false)
+const checkInDialogOpen = ref(false)
 
 // check out
 const checkOutValues = ref<any>({
@@ -38,12 +43,21 @@ const checkOutValues = ref<any>({
 })
 const checkOutIsLoading = ref(false)
 const checkOutIsReadonly = ref(false)
+const checkOutDialogOpen = ref(false)
 
-function checkInSubmit(values: CheckInFormData) {
-  console.log(values)
+function editCheckIn() {
+  checkInDialogOpen.value = true
 }
 
-function checkOutSubmit(values: CheckOutFormData) {
+function submitCheckIn(values: CheckInFormData) {
+  checkIn(props.encounter.id, values)
+}
+
+function editCheckOut() {
+  checkOutDialogOpen.value = true
+}
+
+function submitCheckOut(values: CheckOutFormData) {
   console.log(values)
 }
 </script>
@@ -52,28 +66,60 @@ function checkOutSubmit(values: CheckOutFormData) {
   <div class="lg:grid grid-cols-2">
     <div class="border-r lg:pe-4 xl:pe-5 mb-10">
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
-      <Checkin
-        :schema="CheckInSchema"
-        :doctors="doctors"
+      <CheckInView
         :encounter="encounter"
-        :values="checkInValues"
         :is-loading="checkInIsLoading"
         :is-readonly="checkInIsReadonly"
-        @submit="checkInSubmit"
+        @edit="editCheckIn"
       />
     </div>
     <div class="lg:ps-4 xl:ps-5">
       <Separator class="lg:hidden my-4 xl:my-5" />
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
-      <Checkout
-        :schema="CheckOutSchema"
-        :doctors="doctors"
-        :units="units"
-        :values="checkOutValues"
+      <CheckOutView
+        :encounter="encounter"
         :is-loading="checkOutIsLoading"
         :is-readonly="checkOutIsReadonly"
-        @submit="checkOutSubmit"
+        @edit="editCheckOut"
       />
     </div>
   </div>
+
+  <Dialog
+    v-model:open="checkInDialogOpen"
+    title="Ubah Informasi Masuk"
+    size="md"
+    prevent-outside
+  >
+    <CheckInEntry
+      :schema="CheckInSchema"
+      :values="checkInValues"
+      :encounter="encounter"
+      :doctors="doctors"
+      :employees="employees"
+      :is-loading="checkInIsLoading"
+      :is-readonly="checkInIsReadonly"
+      @submit="submitCheckIn"
+      @cancel="checkInDialogOpen = false"
+    />
+  </Dialog>
+
+  <Dialog
+    v-model:open="checkOutDialogOpen"
+    title="Ubah Informasi Keluar"
+    size="lg"
+    prevent-outside
+  >
+    <CheckOutEntry
+      :schema="CheckOutSchema"
+      :values="checkOutValues"
+      :encounter="encounter"
+      :units="units"
+      :doctors="doctors"
+      :is-loading="checkInIsLoading"
+      :is-readonly="checkInIsReadonly"
+      @submit="submitCheckOut"
+      @cancel="checkInDialogOpen = false"
+    />
+  </Dialog>
 </template>
\ No newline at end of file
diff --git a/app/models/death-cause.ts b/app/models/death-cause.ts
new file mode 100644
index 00000000..0f04609a
--- /dev/null
+++ b/app/models/death-cause.ts
@@ -0,0 +1,6 @@
+export interface DeathCause {
+  id: bigint;
+  encounter_id: bigint;
+  value: any; // json mapped to 'any' type
+}
+  
\ No newline at end of file
diff --git a/app/models/encounter.ts b/app/models/encounter.ts
index 681a2ac9..fb2c0b04 100644
--- a/app/models/encounter.ts
+++ b/app/models/encounter.ts
@@ -1,5 +1,7 @@
+import type { DeathCause } from "./death-cause"
 import { type Doctor, genDoctor } from "./doctor"
 import { genEmployee, type Employee } from "./employee"
+import type { InternalReference } from "./internal-reference"
 import { type Patient, genPatient } from "./patient"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
@@ -29,8 +31,11 @@ export interface Encounter {
     earlyEducation?: string
     medicalDischargeEducation: string
     admDischargeEducation?: string
-    dischargeMethod_code?: string
+    discharge_method_code?: string
     discharge_reason?: string
+    discharge_date?: string
+    internalReferences?: InternalReference[]
+    deathCause?: DeathCause
     status_code: string
 }
 
diff --git a/app/models/internal-reference.ts b/app/models/internal-reference.ts
new file mode 100644
index 00000000..8af315a8
--- /dev/null
+++ b/app/models/internal-reference.ts
@@ -0,0 +1,12 @@
+export interface InternalReference {
+  id: number;
+  encounter_id: number;
+  unit_id: number;     // smallint mapped to number
+  doctor_id: number;   // int mapped to number
+}
+
+export interface CreateDto {
+  encounter_id: number;
+  unit_id: number;     // smallint mapped to number
+  doctor_id: number;   // int mapped to number
+}
\ No newline at end of file
diff --git a/app/schemas/encounter.schema.ts b/app/schemas/encounter.schema.ts
index 49636222..e3c9affc 100644
--- a/app/schemas/encounter.schema.ts
+++ b/app/schemas/encounter.schema.ts
@@ -1,31 +1,48 @@
 import { z } from 'zod'
+import { InternalReferenceSchema } from './internal-reference.schema'
 
 // Check In
 const CheckInSchema = z.object({
-  registeredAt: z.string({ required_error: 'Tanggal masuk harus diisi' }),
+  // registeredAt: z.string({ required_error: 'Tanggal masuk harus diisi' }),
   responsible_doctor_id: z.number({ required_error: 'Dokter harus diisi' }).gt(0, 'Dokter harus diisi'),
   adm_employee_id: z.number({ required_error: 'PJA harus diisi' }).gt(0, 'PJA harus diisi'),
 })
 type CheckInFormData = z.infer<typeof CheckInSchema>
 
-// Check Out Consul Polis
-const ConsulPoliesSchema = z.object({
-  unit_id: z.number(),
-  responsible_doctor_id: z.number(),
-
-})
-type ConsulPoliesFormData = z.infer<typeof ConsulPoliesSchema>
-
 // Checkout
 const CheckOutSchema = z.object({
-  dischargeMethod_code: z.string({ required_error: 'Metode pulang harus diisi' }),
-  // unit_id: z.number(),
-  consulPolies: z.array(ConsulPoliesSchema),
-  responsible_doctor_id: z.number(),
-
+  discharge_method_code: z.string({ required_error: 'Metode pulang harus diisi' }),
+  discharge_date: z.string({ required_error: 'Tanggal pulang harus diisi' }),
 })
 type CheckOutFormData = z.infer<typeof CheckOutSchema>
 
+// CheckoutDeath
+const CheckOutDeathSchema = z.object({
+  discharge_method_code: z.string({ required_error: 'Metode pulang harus diisi' }),
+  discharge_date: z.string({ required_error: 'Tanggal pulang harus diisi' }),
+  death_cause: z.array(z.string()).nonempty(),
+})
+type CheckOutDeathFormData = z.infer<typeof CheckOutDeathSchema>
+
+// CheckoutDeath
+const CheckOutInternalReferenceSchema = z.object({
+  discharge_method_code: z.string({ required_error: 'Metode pulang harus diisi' }),
+  discharge_date: z.string({ required_error: 'Tanggal pulang harus diisi' }),
+  internalReferences: z.array(InternalReferenceSchema).nonempty(),
+})
+type CheckOutInternalReferenceFormData = z.infer<typeof CheckOutInternalReferenceSchema>
+
+
 // Exports
-export { CheckInSchema, CheckOutSchema }
-export type { CheckInFormData, CheckOutFormData, ConsulPoliesFormData }
+export {
+  CheckInSchema,
+  CheckOutSchema,
+  CheckOutDeathSchema,
+  CheckOutInternalReferenceSchema
+}
+export type {
+  CheckInFormData,
+  CheckOutFormData,
+  CheckOutDeathFormData,
+  CheckOutInternalReferenceFormData
+}
diff --git a/app/schemas/internal-reference.schema.ts b/app/schemas/internal-reference.schema.ts
new file mode 100644
index 00000000..eae75319
--- /dev/null
+++ b/app/schemas/internal-reference.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+import type { InternalReference } from '~/models/internal-reference'
+
+const InternalReferenceSchema = z.object({
+  'unit_id': z.number({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
+  'doctor_id': z.number({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
+})
+
+type InternalReferenceFormData = z.infer<typeof InternalReferenceSchema> & Partial<InternalReference>
+
+export { InternalReferenceSchema }
+export type { InternalReferenceFormData }
diff --git a/app/services/doctor.service.ts b/app/services/doctor.service.ts
index 34f21f1a..64ab22e9 100644
--- a/app/services/doctor.service.ts
+++ b/app/services/doctor.service.ts
@@ -2,7 +2,7 @@
 import * as base from './_crud-base'
 import type { Doctor } from "~/models/doctor";
 
-const path = '/api/v1/device'
+const path = '/api/v1/doctor'
 const name = 'device'
 
 export function create(data: any) {
diff --git a/app/services/employee.service.ts b/app/services/employee.service.ts
index d3691c83..366ef71e 100644
--- a/app/services/employee.service.ts
+++ b/app/services/employee.service.ts
@@ -31,7 +31,7 @@ export async function getValueLabelList(params: any = null): Promise<{ value: st
     const resultData = result.body?.data || []
     data = resultData.map((item: any) => ({
       value: item.id ? Number(item.id) : item.code,
-      label: item.name,
+      label: item.person.name,
     }))
   }
   return data
diff --git a/app/services/encounter.service.ts b/app/services/encounter.service.ts
index cd7c28ed..6e42fd41 100644
--- a/app/services/encounter.service.ts
+++ b/app/services/encounter.service.ts
@@ -1,4 +1,5 @@
 // Base
+import type { CheckInFormData } from '~/schemas/encounter.schema'
 import * as base from './_crud-base'
 
 // Constants
@@ -46,3 +47,16 @@ export function getValueLabelListConstants() {
     .filter(([key]) => allowed.includes(key))
     .map(([key, value]) => ({ value: key, label: value }))
 }
+
+export async function checkIn(id: number, data: CheckInFormData) {
+  try {
+    const resp = await xfetch(`${path}/${id}/check-in`, 'PATCH', data)
+    const result: any = {}
+    result.success = resp.success
+    result.body = (resp.body as Record<string, any>) || {}
+    return result
+  } catch (error) {
+    console.error(`Error putting ${name}:`, error)
+    throw new Error(`Failed to put ${name}`)
+  }
+}
\ No newline at end of file