From cb0d73acf47d449219aa75c50776e869ca37b1f5 Mon Sep 17 00:00:00 2001
From: Abizrh <abizarah857@gmail.com>
Date: Mon, 20 Oct 2025 17:33:05 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20feat=20(soapi):=20integrate=20e?=
 =?UTF-8?q?arly,rehab,function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/app/employee/entry-form.vue    |  18 +-
 app/components/app/soapi/early-entry.vue      | 201 ++++++++++---
 .../app/soapi/early-rehab-entry.vue           | 256 ++++++++++++++---
 app/components/app/soapi/entry.vue            |  33 ++-
 app/components/app/soapi/function-entry.vue   | 270 ++++++++++++++----
 app/components/content/encounter/list.vue     |  14 +-
 app/components/content/encounter/process.vue  |   5 +-
 app/components/content/soapi/entry.vue        |   2 +-
 .../content/soapi/form-function.vue           |  68 ++++-
 app/components/content/soapi/form-rehab.vue   |  73 ++++-
 app/components/content/soapi/form.vue         |  55 +++-
 app/handlers/soapi-early.handler.ts           |  24 ++
 app/models/soapi.ts                           | 174 ++++++++++-
 app/schemas/soapi.schema.ts                   | 190 ++++++++++++
 app/services/soapi-early.service.ts           |  28 ++
 15 files changed, 1252 insertions(+), 159 deletions(-)
 create mode 100644 app/handlers/soapi-early.handler.ts
 create mode 100644 app/schemas/soapi.schema.ts
 create mode 100644 app/services/soapi-early.service.ts

diff --git a/app/components/app/employee/entry-form.vue b/app/components/app/employee/entry-form.vue
index 8ccf0916..006f8eff 100644
--- a/app/components/app/employee/entry-form.vue
+++ b/app/components/app/employee/entry-form.vue
@@ -27,19 +27,31 @@ const data = computed({
           <FieldGroup :column="2">
             <Label>Status</Label>
             <Field>
-              <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
+              <Select
+                v-model="data.type"
+                :items="items"
+                placeholder="Pilih jenis"
+              />
             </Field>
           </FieldGroup>
           <FieldGroup :column="2">
             <Label>Position</Label>
             <Field>
-              <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
+              <Select
+                v-model="data.type"
+                :items="items"
+                placeholder="Pilih jenis"
+              />
             </Field>
           </FieldGroup>
           <FieldGroup :column="2">
             <Label>Divisi</Label>
             <Field>
-              <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
+              <Select
+                v-model="data.type"
+                :items="items"
+                placeholder="Pilih jenis"
+              />
             </Field>
           </FieldGroup>
         </Block>
diff --git a/app/components/app/soapi/early-entry.vue b/app/components/app/soapi/early-entry.vue
index c5697a7a..146a25d4 100644
--- a/app/components/app/soapi/early-entry.vue
+++ b/app/components/app/soapi/early-entry.vue
@@ -4,29 +4,72 @@ 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'
 
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+import { genBase } from '~/models/_base'
+
 const props = defineProps<{
+  modelValue: any
+  schema: z.ZodSchema<any>
   excludeFields?: string[]
+  isReadonly?: boolean
 }>()
 
-const emits = defineEmits(['click'])
+const emit = defineEmits<{
+  (e: 'update:modelValue', val: any): void
+  (e: 'submit', val: any): void
+}>()
 
-const subject = ref({
-  'prim-compl': '',
-  'sec-compl': '',
-  'cur-disea-hist': '',
-  'pas-disea-hist': '',
-  'fam-disea-hist': '',
-  'alg-hist': '',
-  'alg-react': '',
-  'med-hist': '',
-  'blood-type': '',
+// Setup form
+const {
+  validate: _validate,
+  defineField,
+  handleSubmit,
+  errors,
+  values,
+} = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: props.modelValue,
 })
 
+watch(values, (val) => emit('update:modelValue', val), { deep: true })
+
+const [primaryComplaint, primaryComplaintAttrs] = defineField('prim-compl')
+const [curDiseaseHistory, curDiseaseHistoryAttrs] = defineField('cur-disea-hist')
+const [systolic, systolicAttrs] = defineField('syst-bp')
+const [diastolic, diastolicAttrs] = defineField('diast-bp')
+const [pulse, pulseAttrs] = defineField('pulse')
+const [respiratoryRate, respiratoryRateAttrs] = defineField('resp-rate')
+const [temperature, temperatureAttrs] = defineField('temp')
+const [weight, weightAttrs] = defineField('weight')
+const [height, heightAttrs] = defineField('height')
+const [bloodGroup, bloodGroupAttrs] = defineField('reflect-fisio')
+const [physicalExamination, physicalExaminationAttrs] = defineField('reflect-pato')
+const [diagnosisMedical, diagnosisMedicalAttrs] = defineField('autonom-neuron')
+const [medicalPlan, medicalPlanAttrs] = defineField('medical-act')
+const [therapy, therapyAttrs] = defineField('therapy')
+
+const validate = async () => {
+  const result = await _validate()
+  console.log('Component validate() result:', result)
+
+  return {
+    valid: true,
+    data: result.values,
+    errors: result.errors,
+  }
+}
+
+defineExpose({ validate })
+
 const isExcluded = (key: string) => props.excludeFields?.includes(key)
 </script>
 
 <template>
   <form id="entry-form">
+    {{ errors }}
     <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
       <Block>
         <Cell>
@@ -34,11 +77,17 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Field>
             <RadioGroup class="flex gap-4">
               <div class="flex items-center space-x-2">
-                <RadioGroupItem id="vaksin-yes" value="yes" />
+                <RadioGroupItem
+                  id="vaksin-yes"
+                  value="yes"
+                />
                 <Label for="vaksin-yes">Sudah</Label>
               </div>
               <div class="flex items-center space-x-2">
-                <RadioGroupItem id="vaksin-no" value="no" />
+                <RadioGroupItem
+                  id="vaksin-no"
+                  value="no"
+                />
                 <Label for="vaksin-no">Belum</Label>
               </div>
             </RadioGroup>
@@ -50,11 +99,17 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Field>
             <RadioGroup class="flex gap-4">
               <div class="flex items-center space-x-2">
-                <RadioGroupItem id="kasus-baru" value="baru" />
+                <RadioGroupItem
+                  id="kasus-baru"
+                  value="baru"
+                />
                 <Label for="kasus-baru">Baru</Label>
               </div>
               <div class="flex items-center space-x-2">
-                <RadioGroupItem id="kasus-lama" value="lama" />
+                <RadioGroupItem
+                  id="kasus-lama"
+                  value="lama"
+                />
                 <Label for="kasus-lama">Lama</Label>
               </div>
             </RadioGroup>
@@ -66,11 +121,17 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Field>
             <RadioGroup class="flex gap-4">
               <div class="flex items-center space-x-2">
-                <RadioGroupItem id="kunjungan-baru" value="baru" />
+                <RadioGroupItem
+                  id="kunjungan-baru"
+                  value="baru"
+                />
                 <Label for="kunjungan-baru">Baru</Label>
               </div>
               <div class="flex items-center space-x-2">
-                <RadioGroupItem id="kunjungan-lama" value="lama" />
+                <RadioGroupItem
+                  id="kunjungan-lama"
+                  value="lama"
+                />
                 <Label for="kunjungan-lama">Lama</Label>
               </div>
             </RadioGroup>
@@ -79,88 +140,141 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
       </Block>
 
       <Block :colCount="2">
-        <!-- Riwayat Penyakit -->
         <Cell>
           <Label dynamic>Keluhan Utama</Label>
-          <Field>
-            <Textarea placeholder="Masukkan anamnesa pasien" />
+          <Field :errMessage="errors['prim-compl']">
+            <Textarea
+              placeholder="Masukkan anamnesa pasien"
+              v-model="primaryComplaint"
+              v-bind="primaryComplaintAttrs"
+            />
           </Field>
         </Cell>
         <Cell>
           <Label dynamic>Riwayat Penyakit</Label>
           <Field>
             <Textarea
-              placeholder="Masukkan anamnesa pasien (Riwayat Penyakit Sekarang, Dahulu, Pengobatan, Keluarga, dll)"
+              placeholder=".."
+              v-model="curDiseaseHistory"
+              v-bind="curDiseaseHistoryAttrs"
             />
           </Field>
         </Cell>
         <Cell>
           <Label dynamic>SpO₂</Label>
           <Field>
-            <Input type="number" placeholder="%" />
+            <Input
+              type="number"
+              placeholder="%"
+              v-model="spo2"
+              v-bind="spo2Attrs"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Tekanan Darah Sistol</Label>
           <Field>
-            <Input type="number" placeholder="mmHg" />
+            <Input
+              type="number"
+              placeholder="mmHg"
+              v-model="systolic"
+              v-bind="systolicAttrs"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Tekanan Darah Diastol</Label>
           <Field>
-            <Input type="number" placeholder="mmHg" />
+            <Input
+              v-model="diastolic"
+              v-bind="diastolicAttrs"
+              type="number"
+              placeholder="mmHg"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Respirasi</Label>
           <Field>
-            <Input type="number" placeholder="kali/menit" />
+            <Input
+              v-model="respiratoryRate"
+              v-bind="respiratoryRateAttrs"
+              type="number"
+              placeholder="kali/menit"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Nadi</Label>
           <Field>
-            <Input type="number" placeholder="kali/menit" />
+            <Input
+              v-model="pulse"
+              v-bind="pulseAttrs"
+              type="number"
+              placeholder="kali/menit"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Temperatur</Label>
           <Field>
-            <Input type="number" placeholder="℃" />
+            <Input
+              v-model="temperature"
+              v-bind="temperatureAttrs"
+              type="number"
+              placeholder="℃"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Berat Badan</Label>
           <Field>
-            <Input type="number" placeholder="Kg" />
+            <Input
+              v-model="weight"
+              v-bind="weightAttrs"
+              type="number"
+              placeholder="Kg"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Tinggi Badan</Label>
           <Field>
-            <Input type="number" placeholder="Cm" />
+            <Input
+              v-model="height"
+              v-bind="heightAttrs"
+              type="number"
+              placeholder="Cm"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Golongan Darah</Label>
           <Field>
-            <Select :options="bloodGroups" />
+            <Select
+              :options="bloodGroups"
+              v-model="bloodGroup"
+              v-bind="bloodGroupAttrs"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Pemeriksaan Fisik (Yang Mendukung)</Label>
           <Field>
-            <Textarea placeholder="Masukkan pemeriksaan fisik" />
+            <Textarea
+              placeholder="Masukkan pemeriksaan fisik"
+              v-model="physicalExamination"
+              v-bind="physicalExaminationAttrs"
+            />
           </Field>
         </Cell>
 
@@ -171,9 +285,10 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
             <Button
               class="rounded bg-orange-100 px-3 py-1 text-orange-600"
               type="button"
-              @click="emits('click', 'diagnosa')"
-              >+ Pilih Diagnosa</Button
+              @click="emits('modal', 'diagnosa')"
             >
+              + Pilih Diagnosa
+            </Button>
           </Field>
         </Cell>
         <!-- Diagnosa -->
@@ -183,9 +298,10 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
             <Button
               class="rounded bg-orange-100 px-3 py-1 text-orange-600"
               type="button"
-              @click="emits('click', 'prosedur')"
-              >+ Pilih Prosedur</Button
+              @click="emits('modal', 'prosedur')"
             >
+              + Pilih Prosedur
+            </Button>
           </Field>
         </Cell>
       </Block>
@@ -199,21 +315,30 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
         <Cell>
           <Label dynamic>Diagnosa Medis</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="diagnosisMedical"
+              v-bind="diagnosisMedicalAttrs"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Rencana Awal Medis</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="medicalPlan"
+              v-bind="medicalPlanAttrs"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Terapi</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="therapy"
+              v-bind="therapyAttrs"
+            />
           </Field>
         </Cell>
       </Block>
diff --git a/app/components/app/soapi/early-rehab-entry.vue b/app/components/app/soapi/early-rehab-entry.vue
index 61beb0f3..2cafbcac 100644
--- a/app/components/app/soapi/early-rehab-entry.vue
+++ b/app/components/app/soapi/early-rehab-entry.vue
@@ -4,24 +4,88 @@ 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'
 
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+import { genBase } from '~/models/_base'
+
 const props = defineProps<{
+  modelValue: any
+  schema: z.ZodSchema<any>
   excludeFields?: string[]
+  isReadonly?: boolean
 }>()
 
-const emits = defineEmits(['click'])
+const emit = defineEmits<{
+  (e: 'update:modelValue', val: any): void
+  (e: 'submit', val: any): void
+}>()
 
-const subject = ref({
-  'prim-compl': '',
-  'sec-compl': '',
-  'cur-disea-hist': '',
-  'pas-disea-hist': '',
-  'fam-disea-hist': '',
-  'alg-hist': '',
-  'alg-react': '',
-  'med-hist': '',
-  'blood-type': '',
+// Setup form
+const {
+  validate: _validate,
+  defineField,
+  handleSubmit,
+  errors,
+  values,
+} = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: props.modelValue,
 })
 
+watch(values, (val) => emit('update:modelValue', val), { deep: true })
+
+const [primaryComplaint, primaryComplaintAttrs] = defineField('prim-compl')
+const [medicalPlan, medicalPlanAttrs] = defineField('medical-plan')
+const [diagnosisMedical, diagnosisMedicalAttrs] = defineField('diagnosis-medical')
+const [rehabTrouble, rehabTroubleAttrs] = defineField('rehab-trouble')
+const [medicalTrouble, medicalTroubleAttrs] = defineField('medical-trouble')
+const [physicModal, physicModalAttrs] = defineField('physic-modal')
+const [exercise, exerciseAttrs] = defineField('exercise')
+const [orthoPesa, orthoPesaAttrs] = defineField('ortho-pesa')
+const [education, educationAttrs] = defineField('education')
+const [other, otherAttrs] = defineField('other')
+const [cranialis, cranialisAttrs] = defineField('cranialis')
+const [sensoris, sensorisAttrs] = defineField('sensoris')
+const [reflectFisio, reflectFisioAttrs] = defineField('reflect-fisio')
+const [reflectPato, reflectPatoAttrs] = defineField('reflect-pato')
+const [otonom, otonomAttrs] = defineField('otonom')
+const [localis, localisAttrs] = defineField('localis')
+const [medicalTrial, medicalTrialAttrs] = defineField('medical-trial')
+const [therapy, therapyAttrs] = defineField('therapy')
+const [systolic, systolicAttrs] = defineField('syst-bp')
+const [diastolic, diastolicAttrs] = defineField('diast-bp')
+const [pulse, pulseAttrs] = defineField('pulse')
+const [gcs, gcsAttrs] = defineField('gcs')
+const [respiratoryRate, respiratoryRateAttrs] = defineField('respiratory-rate')
+const [temperature, temperatureAttrs] = defineField('temperature')
+const [weight, weightAttrs] = defineField('weight')
+const [height, heightAttrs] = defineField('height')
+const [ambulance, ambulanceAttrs] = defineField('ambulance')
+const [gait, gaitAttrs] = defineField('gait')
+const [neckRom, neckRomAttrs] = defineField('neck-rom')
+const [bodyRom, bodyRomAttrs] = defineField('body-rom')
+const [agaRom, agaRomAttrs] = defineField('aga-rom')
+const [agbRom, agbRomAttrs] = defineField('agb-rom')
+const [neckMmt, neckMmtAttrs] = defineField('neck-mmt')
+const [bodyMmt, bodyMmtAttrs] = defineField('body-mmt')
+const [agaMmt, agaMmtAttrs] = defineField('aga-mmt')
+const [agbMmt, agbMmtAttrs] = defineField('agb-mmt')
+
+const validate = async () => {
+  const result = await _validate()
+  console.log('Component validate() result:', result)
+
+  return {
+    valid: true,
+    data: result.values,
+    errors: result.errors,
+  }
+}
+
+defineExpose({ validate })
+
 const isExcluded = (key: string) => props.excludeFields?.includes(key)
 </script>
 
@@ -36,8 +100,11 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
         <Block>
           <Cell>
             <Label dynamic>Keluhan Utama</Label>
-            <Field>
-              <Textarea />
+            <Field :errMessage="errors['prim-compl']">
+              <Textarea
+                v-model="primaryComplaint"
+                v-bind="primaryComplaintAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -46,21 +113,30 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Diagnosa Medis</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="diagnosisMedical"
+                v-bind="diagnosisMedicalAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Rencana Awal Medis</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="medicalPlan"
+                v-bind="medicalPlanAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Terapi</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="therapy"
+                v-bind="therapyAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -77,22 +153,36 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Tekanan Darah</Label>
             <Field>
-              <Input placeholder="Sistolik" />
-              <Input placeholder="Diastolik" />
+              <Input
+                placeholder="Sistolik"
+                v-model="systolic"
+                v-bind="systolicAttrs"
+              />
+              <Input
+                placeholder="Diastolik"
+                v-model="diastolic"
+                v-bind="diastolicAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Nadi</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="pulse"
+                v-bind="pulseAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>GCS</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="gcs"
+                v-bind="gcsAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -100,14 +190,21 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>RR</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="respiratoryRate"
+                v-bind="respiratoryRateAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Ambulasi</Label>
             <Field>
-              <RadioGroup class="flex gap-4">
+              <RadioGroup
+                class="flex gap-4"
+                v-model="ambulance"
+                v-bind="ambulanceAttrs"
+              >
                 <div class="flex items-center space-x-2">
                   <RadioGroupItem
                     id="vaksin-yes"
@@ -129,7 +226,10 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Gait</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="gait"
+                v-bind="gaitAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -144,21 +244,30 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>N. Cranialis</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="cranialis"
+                v-bind="cranialisAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Sensoris</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="sensoris"
+                v-bind="sensorisAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Reflek Fisilogis</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="reflectFisio"
+                v-bind="reflectFisioAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -166,13 +275,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Reflek Patologis</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="reflectPato"
+                v-bind="reflectPatoAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Saraf Otonom</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="otonom"
+                v-bind="otonomAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -187,13 +302,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Leher</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="neckRom"
+                v-bind="neckRomAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Batang Tubuh</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="bodyRom"
+                v-bind="bodyRomAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -201,13 +322,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>AGA</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="agaRom"
+                v-bind="agaRomAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>AGB</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="agbRom"
+                v-bind="agbRomAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -222,13 +349,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Leher</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="neckMmt"
+                v-bind="neckMmtAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Batang Tubuh</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="bodyMmt"
+                v-bind="bodyMmtAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -236,13 +369,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>AGA</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="agaMmt"
+                v-bind="agaMmtAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>AGB</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="agbMmt"
+                v-bind="agbMmtAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -256,7 +395,10 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
         <Cell>
           <Label dynamic>Deskripsi Temuan Fisik</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="localis"
+              v-bind="localisAttrs"
+            />
           </Field>
         </Cell>
       </Block>
@@ -271,7 +413,10 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
         <Cell>
           <Label dynamic>Catatan Pemeriksaan Penunjang</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="medicalTrial"
+              v-bind="medicalTrialAttrs"
+            />
           </Field>
         </Cell>
       </Block>
@@ -286,13 +431,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
         <Cell>
           <Label dynamic>Masalah Medik</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="medicalTrouble"
+              v-bind="medicalTroubleAttrs"
+            />
           </Field>
         </Cell>
         <Cell>
           <Label dynamic>Masalah Rehabilitasi Medik</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="rehabTrouble"
+              v-bind="rehabTroubleAttrs"
+            />
           </Field>
         </Cell>
       </Block>
@@ -316,21 +467,30 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Modalitas Fisik</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="physicModal"
+                v-bind="physicModalAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Latihan</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="exercise"
+                v-bind="exerciseAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Ortesa Protesa</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="orthoPesa"
+                v-bind="orthoPesaAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -338,13 +498,19 @@ const isExcluded = (key: string) => props.excludeFields?.includes(key)
           <Cell>
             <Label dynamic>Edukasi</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="education"
+                v-bind="educationAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Lain-Lain</Label>
             <Field>
-              <Textarea />
+              <Textarea
+                v-model="other"
+                v-bind="otherAttrs"
+              />
             </Field>
           </Cell>
         </Block>
diff --git a/app/components/app/soapi/entry.vue b/app/components/app/soapi/entry.vue
index ced3e3d8..2ee2cefb 100644
--- a/app/components/app/soapi/entry.vue
+++ b/app/components/app/soapi/entry.vue
@@ -1,28 +1,47 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { ref, computed } from 'vue'
 import EarlyEntry from './early-entry.vue'
 import EarlyRehabEntry from './early-rehab-entry.vue'
 import FunctionEntry from './function-entry.vue'
 
-/**
- * Props:
- * - excludeFields: daftar nama field yang ingin disembunyikan
- */
 const props = defineProps<{
   type: 'early' | 'early-rehab' | 'function'
   excludeFields?: string[]
 }>()
 
+const emits = defineEmits(['click', 'submit', 'cancel'])
+
 const componentMap = {
   early: EarlyEntry,
   'early-rehab': EarlyRehabEntry,
   function: FunctionEntry,
 }
 
-// Komponen aktif berdasarkan type
 const ActiveComponent = computed(() => componentMap[props.type])
+
+const childRef = ref()
+
+const validate = async () => {
+  if (childRef.value?.validate) {
+    const result = await childRef.value.validate()
+    console.log('[Wrapper] Result from child validate:', result)
+    return result
+  } else {
+    console.warn('validate() not found in child component')
+    return { valid: false, data: null, errors: {} }
+  }
+}
+
+defineExpose({ validate })
 </script>
 
 <template>
-  <component :is="ActiveComponent" :exclude-fields="excludeFields" />
+  <component
+    ref="childRef"
+    :is="ActiveComponent"
+    :exclude-fields="excludeFields"
+    @click="$emit('click', $event)"
+    @submit="$emit('submit', $event)"
+    @cancel="$emit('cancel', $event)"
+  />
 </template>
diff --git a/app/components/app/soapi/function-entry.vue b/app/components/app/soapi/function-entry.vue
index 98d35663..3e192c47 100644
--- a/app/components/app/soapi/function-entry.vue
+++ b/app/components/app/soapi/function-entry.vue
@@ -4,24 +4,88 @@ 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'
 
+// Helpers
+import type z from 'zod'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+import { genBase } from '~/models/_base'
+
 const props = defineProps<{
+  modelValue: any
+  schema: z.ZodSchema<any>
   excludeFields?: string[]
+  isReadonly?: boolean
 }>()
 
-const emits = defineEmits(['click'])
+const emit = defineEmits<{
+  (e: 'update:modelValue', val: any): void
+  (e: 'submit', val: any): void
+}>()
 
-const subject = ref({
-  'prim-compl': '',
-  'sec-compl': '',
-  'cur-disea-hist': '',
-  'pas-disea-hist': '',
-  'fam-disea-hist': '',
-  'alg-hist': '',
-  'alg-react': '',
-  'med-hist': '',
-  'blood-type': '',
+// Setup form
+const {
+  validate: _validate,
+  defineField,
+  handleSubmit,
+  errors,
+  values,
+} = useForm({
+  validationSchema: toTypedSchema(props.schema),
+  initialValues: props.modelValue,
 })
 
+watch(values, (val) => emit('update:modelValue', val), { deep: true })
+
+const [primaryComplaint, primaryComplaintAttrs] = defineField('prim-compl')
+const [pastDisease, pastDiseaseAttrs] = defineField('past-disease')
+const [currentDisease, currentDiseaseAttrs] = defineField('current-disease')
+const [gcs, gcsAttrs] = defineField('gcs')
+const [respiratoryRate, respiratoryRateAttrs] = defineField('respiratory-rate')
+const [respiratoryRateType, respiratoryRateTypeAttrs] = defineField('respiratory-rate-type')
+const [pulse, pulseAttrs] = defineField('pulse')
+const [pulseType, pulseTypeAttrs] = defineField('pulse-type')
+const [rightArmBp, rightArmBpAttrs] = defineField('right-arm-bp')
+const [leftArmBp, leftArmBpAttrs] = defineField('left-arm-bp')
+const [axillaryTemp, axillaryTempAttrs] = defineField('axillary-temp')
+const [rektalTemp, rektalTempAttrs] = defineField('rektal-temp')
+const [skin, skinAttrs] = defineField('skin')
+const [head, headAttrs] = defineField('head')
+const [ear, earAttrs] = defineField('ear')
+const [nose, noseAttrs] = defineField('nose')
+const [oralCavity, oralCavityAttrs] = defineField('oral-cavity')
+const [eye, eyeAttrs] = defineField('eye')
+const [otherBodyPart, otherBodyPartAttrs] = defineField('other-body-part')
+const [neck, neckAttrs] = defineField('neck')
+const [thyroid, thyroidAttrs] = defineField('thyroid')
+const [thorax, thoraxAttrs] = defineField('thorax')
+const [heart, heartAttrs] = defineField('heart')
+const [lung, lungAttrs] = defineField('lung')
+const [abdomen, abdomenAttrs] = defineField('abdomen')
+const [heart2, heart2Attrs] = defineField('heart2')
+const [lien, lienAttrs] = defineField('lien')
+const [back, backAttrs] = defineField('back')
+const [extremity, extremityAttrs] = defineField('extremity')
+const [gender, genderAttrs] = defineField('gender')
+const [rectum, rectumAttrs] = defineField('rectum')
+const [systemSyaraf, systemSyarafAttrs] = defineField('system-syaraf')
+const [nervousSystem, nervousSystemAttrs] = defineField('nervous-system')
+const [cardioRespiratory, cardioRespiratoryAttrs] = defineField('cardio-respiratory')
+const [imaging, imagingAttrs] = defineField('imaging')
+const [laboratory, laboratoryAttrs] = defineField('laboratory')
+
+const validate = async () => {
+  const result = await _validate()
+  console.log('Component validate() result:', result)
+
+  return {
+    valid: true,
+    data: result.values,
+    errors: result.errors,
+  }
+}
+
+defineExpose({ validate })
+
 const isExcluded = (key: string) => props.excludeFields?.includes(key)
 const disorders = ref<string[]>([])
 const therapies = ref<string[]>([])
@@ -55,8 +119,11 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
       <Block>
         <Cell>
           <Label dynamic>Keluhan Utama</Label>
-          <Field>
-            <Textarea />
+          <Field :errMessage="errors['prim-compl']">
+            <Textarea
+              v-model="primaryComplaint"
+              v-bind="primaryComplaintAttrs"
+            />
           </Field>
         </Cell>
       </Block>
@@ -65,14 +132,20 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
         <Cell>
           <Label dynamic>Riwayat Penyakit Dahulu</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="pastDisease"
+              v-bind="pastDiseaseAttrs"
+            />
           </Field>
         </Cell>
 
         <Cell>
           <Label dynamic>Riwayat Penyakit Sekarang</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="currentDisease"
+              v-bind="currentDiseaseAttrs"
+            />
           </Field>
         </Cell>
       </Block>
@@ -86,7 +159,7 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
         <Cell>
           <Label dynamic>Umum</Label>
           <Field>
-            <Input placeholder="Sistolik" />
+            <Input placeholder="" />
           </Field>
         </Cell>
       </Block>
@@ -100,7 +173,10 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Kesadaran (GCS)</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="gcs"
+                v-bind="gcsAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -108,14 +184,20 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Pernapasan</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="respiratoryRate"
+                v-bind="respiratoryRateAttrs"
+              />
             </Field>
           </Cell>
 
           <Cell>
             <Label dynamic>Jenis</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="respiratoryRateType"
+                v-bind="respiratoryRateTypeAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -123,13 +205,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Nadi</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="pulse"
+                v-bind="pulseAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Jenis</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="pulseType"
+                v-bind="pulseTypeAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -137,13 +225,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Tekanan Darah Lengan Kanan</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="rightArmBp"
+                v-bind="rightArmBpAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Tekanan Darah Lengan Kiri</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="leftArmBp"
+                v-bind="leftArmBpAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -151,13 +245,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Suhu Aksila</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="axillaryTemp"
+                v-bind="axillaryTempAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Suhu Rektal</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="rektalTemp"
+                v-bind="rektalTempAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -172,7 +272,10 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Kulit</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="skin"
+                v-bind="skinAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -183,19 +286,28 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Kepala</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="head"
+                v-bind="headAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Telinga</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="ear"
+                v-bind="earAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Hidung</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="nose"
+                v-bind="noseAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -204,19 +316,28 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Rongga Mulut/Tenggorokan</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="oralCavity"
+                v-bind="oralCavityAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Mata</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="eye"
+                v-bind="eyeAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Lain-Lain</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="otherBodyPart"
+                v-bind="otherBodyPartAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -227,13 +348,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Leher</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="neck"
+                v-bind="neckAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Kelenjar Tiroid</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="thyroid"
+                v-bind="thyroidAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
@@ -250,19 +377,28 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Thorax</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="thorax"
+                v-bind="thoraxAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Jantung</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="heart"
+                v-bind="heartAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Paru-Paru</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="lung"
+                v-bind="lungAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -281,19 +417,28 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Abdomen</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="abdomen"
+                v-bind="abdomenAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Hati</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="heart2"
+                v-bind="heart2Attrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Lien</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="lien"
+                v-bind="lienAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -312,19 +457,28 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Punggung</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="back"
+                v-bind="backAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Ekstremitas</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="extremity"
+                v-bind="extremityAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>Kelamin</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="gender"
+                v-bind="genderAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -332,13 +486,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
           <Cell>
             <Label dynamic>Rectum</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="rectum"
+                v-bind="rectumAttrs"
+              />
             </Field>
           </Cell>
           <Cell>
             <Label dynamic>System Syaraf</Label>
             <Field>
-              <Input />
+              <Input
+                v-model="nervousSystem"
+                v-bind="nervousSystemAttrs"
+              />
             </Field>
           </Cell>
         </Block>
@@ -348,13 +508,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
         <Cell>
           <Label dynamic>Neuromoskuloskeletal</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="neuromoskuloskeletal"
+              v-bind="neuromoskuloskeletalAttrs"
+            />
           </Field>
         </Cell>
         <Cell>
           <Label dynamic>Kardiorespirasi</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="cardioRespiratory"
+              v-bind="cardioRespiratoryAttrs"
+            />
           </Field>
         </Cell>
       </Block>
@@ -369,13 +535,19 @@ const therapyOptions = ['Terapi Latihan', 'Modalitas Fisik', 'Protesa/Ortosa', '
         <Cell>
           <Label dynamic>Pencitraan</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="imaging"
+              v-bind="imagingAttrs"
+            />
           </Field>
         </Cell>
         <Cell>
           <Label dynamic>Laboratorium</Label>
           <Field>
-            <Textarea />
+            <Textarea
+              v-model="laboratory"
+              v-bind="laboratoryAttrs"
+            />
           </Field>
         </Cell>
       </Block>
diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index f218444a..fe229e7c 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -49,7 +49,7 @@ const refSearchNav: RefSearchNav = {
 
 async function getPatientList() {
   isLoading.isTableLoading = true
-  const resp = await xfetch('/api/v1/encounter')
+  const resp = await xfetch('/api/v1/patient')
   if (resp.success) {
     data.value = (resp.body as Record<string, any>).data
   }
@@ -95,14 +95,22 @@ provide('table_data_loader', isLoading)
 </script>
 
 <template>
-  <Header :prep="{ ...hreaderPrep }" :ref-search-nav="refSearchNav" />
+  <Header
+    :prep="{ ...hreaderPrep }"
+    :ref-search-nav="refSearchNav"
+  />
   <Separator class="my-4 xl:my-5" />
   <Filter :ref-search-nav="refSearchNav" />
   <div class="my-4 flex flex-1 flex-col gap-4 md:gap-8">
     <AppEncounterList :data="data" />
   </div>
 
-  <Dialog v-model:open="isFormEntryDialogOpen" title="Filter" size="lg" prevent-outside>
+  <Dialog
+    v-model:open="isFormEntryDialogOpen"
+    title="Filter"
+    size="lg"
+    prevent-outside
+  >
     <AppEncounterFilter />
   </Dialog>
   <!-- <Pagination :pagination-meta="paginationMeta" @page-change="handlePageChange" /> -->
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 67e71ddd..98382d5d 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -9,13 +9,12 @@ 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 AssesmentFunctionList from '~/components/content/soapi/entry.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'
 import type { Encounter } from '~/models/encounter'
 import Status from '~/components/app/encounter/status.vue'
-// import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
-import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
 
 const route = useRoute()
 const router = useRouter()
diff --git a/app/components/content/soapi/entry.vue b/app/components/content/soapi/entry.vue
index 42800d8f..7b4ab9d4 100644
--- a/app/components/content/soapi/entry.vue
+++ b/app/components/content/soapi/entry.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
-import { useQueryMode } from '@/composables/useQueryMode' // asumsikan ini ada
+import { useQueryMode } from '@/composables/useQueryMode'
 
 import SoapiList from './list.vue'
 import EarlyForm from './form.vue'
diff --git a/app/components/content/soapi/form-function.vue b/app/components/content/soapi/form-function.vue
index d76e192f..d9ef1d65 100644
--- a/app/components/content/soapi/form-function.vue
+++ b/app/components/content/soapi/form-function.vue
@@ -1,9 +1,54 @@
 <script setup lang="ts">
+import { z } from 'zod'
 import Entry from '~/components/app/soapi/entry.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { FunctionSoapiSchema } from '~/schemas/soapi.schema'
+import { toast } from '~/components/pub/ui/toast'
+import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
 const isOpen = ref(false)
 const data = ref([])
+const schema = FunctionSoapiSchema
+const model = ref({
+  'prim-compl': '',
+  'past-disease': '',
+  'current-disease': '',
+  gcs: '',
+  'respiratory-rate': '',
+  'respiratory-rate-type': '',
+  pulse: '',
+  'pulse-type': '',
+  'right-arm-bp': '',
+  'left-arm-bp': '',
+  'axillary-temp': '',
+  'rektal-temp': '',
+  skin: '',
+  head: '',
+  ear: '',
+  nose: '',
+  'oral-cavity': '',
+  eye: '',
+  'other-body-part': '',
+  neck: '',
+  thyroid: '',
+  thorax: '',
+  heart: '',
+  lung: '',
+  abdomen: '',
+  heart2: '',
+  lien: '',
+  back: '',
+  extremity: '',
+  gender: '',
+  rectum: '',
+  'system-syaraf': '',
+  'nervous-system': '',
+  'cardio-respiratory': '',
+  imaging: '',
+  laboratory: '',
+})
+
 const isLoading = reactive<DataTableLoader>({
   isTableLoading: false,
 })
@@ -21,19 +66,36 @@ onMounted(() => {
   getPatientList()
 })
 
-function handleClick(type: string) {
+function handleOpen(type: string) {
   console.log(type)
   isOpen.value = true
 }
 
+const entryRehabRef = ref()
+async function actionHandler(type: string) {
+  console.log(type)
+  const result = await entryRehabRef.value?.validate()
+  if (result?.valid) {
+    console.log('✅ Valid data:', result.data)
+    handleActionSave(result.data, {}, toast)
+  } else {
+    console.log('❌ Ada error di form', result)
+  }
+}
+
 provide('table_data_loader', isLoading)
 </script>
 <template>
   <Entry
+    ref="entryRehabRef"
+    v-model="model"
+    :schema="schema"
     type="function"
-    :exclude-fields="['prim-compl', 'sec-compl']"
-    @click="handleClick"
+    @modal="handleOpen"
   />
+  <div class="my-2 flex justify-end py-2">
+    <Action @click="actionHandler" />
+  </div>
   <Dialog
     v-model:open="isOpen"
     title="Pilih Prosedur"
diff --git a/app/components/content/soapi/form-rehab.vue b/app/components/content/soapi/form-rehab.vue
index f0255022..6681e64c 100644
--- a/app/components/content/soapi/form-rehab.vue
+++ b/app/components/content/soapi/form-rehab.vue
@@ -1,9 +1,59 @@
 <script setup lang="ts">
+import { z } from 'zod'
 import Entry from '~/components/app/soapi/entry.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { EarlyRehabSchema } from '~/schemas/soapi.schema'
+import { toast } from '~/components/pub/ui/toast'
+import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
 const isOpen = ref(false)
 const data = ref([])
+const schema = EarlyRehabSchema
+const model = ref({
+  'prim-compl': '',
+  'medical-plan': '',
+  'diagnosis-medical': '',
+  'rehab-trouble': '',
+  'medical-trouble': '',
+  'physic-modal': '',
+  exercise: '',
+  'ortho-pesa': '',
+  education: '',
+  other: '',
+  cranialis: '',
+  sensoris: '',
+  'reflect-fisio': '',
+  'reflect-pato': '',
+  otonom: '',
+  localis: '',
+  'medical-trial': '',
+  therapy: '',
+  'syst-bp': '',
+  'diast-bp': '',
+  pulse: '',
+  gcs: '',
+  'respiratory-rate': '',
+  temperature: '',
+  ambulance: '',
+  gait: '',
+  'neck-rom': '',
+  'body-rom': '',
+  'aga-rom': '',
+  'agb-rom': '',
+  'neck-mmt': '',
+  'body-mmt': '',
+  'aga-mmt': '',
+  'agb-mmt': '',
+  localis: '',
+  'medical-trouble': '',
+  'rehab-trouble': '',
+  temp: '',
+  spo2: '',
+  weight: '',
+  height: '',
+})
+
 const isLoading = reactive<DataTableLoader>({
   isTableLoading: false,
 })
@@ -21,19 +71,36 @@ onMounted(() => {
   getPatientList()
 })
 
-function handleClick(type: string) {
+function handleOpen(type: string) {
   console.log(type)
   isOpen.value = true
 }
 
+const entryRehabRef = ref()
+async function actionHandler(type: string) {
+  console.log(type)
+  const result = await entryRehabRef.value?.validate()
+  if (result?.valid) {
+    console.log('✅ Valid data:', result.data)
+    handleActionSave(result.data, {}, toast)
+  } else {
+    console.log('❌ Ada error di form', result)
+  }
+}
+
 provide('table_data_loader', isLoading)
 </script>
 <template>
   <Entry
+    ref="entryRehabRef"
+    v-model="model"
+    :schema="schema"
     type="early-rehab"
-    :exclude-fields="['prim-compl', 'sec-compl']"
-    @click="handleClick"
+    @modal="handleOpen"
   />
+  <div class="my-2 flex justify-end py-2">
+    <Action @click="actionHandler" />
+  </div>
   <Dialog
     v-model:open="isOpen"
     title="Pilih Prosedur"
diff --git a/app/components/content/soapi/form.vue b/app/components/content/soapi/form.vue
index 916f22d6..f1857de6 100644
--- a/app/components/content/soapi/form.vue
+++ b/app/components/content/soapi/form.vue
@@ -1,9 +1,32 @@
 <script setup lang="ts">
+import { z } from 'zod'
 import Entry from '~/components/app/soapi/entry.vue'
+import Action from '~/components/pub/my-ui/nav-footer/ba-dr-su.vue'
 import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
+import { EarlySchema } from '~/schemas/soapi.schema'
+import { toast } from '~/components/pub/ui/toast'
+import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
 const isOpen = ref(false)
 const data = ref([])
+const schema = EarlySchema
+
+const model = ref({
+  'prim-compl': '',
+  'cur-disea-hist': '',
+  'syst-bp': '',
+  'diast-bp': '',
+  pulse: '',
+  'resp-rate': '',
+  temp: '',
+  weight: '',
+  height: '',
+  'reflect-fisio': '',
+  'reflect-pato': '',
+  'autonom-neuron': '',
+  'medical-act': '',
+  therapy: '',
+})
 const isLoading = reactive<DataTableLoader>({
   isTableLoading: false,
 })
@@ -21,16 +44,42 @@ onMounted(() => {
   getPatientList()
 })
 
-function handleClick(type: string) {
+function handleOpen(type: string) {
   console.log(type)
   isOpen.value = true
 }
 
+const entryRef = ref()
+async function actionHandler(type: string) {
+  console.log(type)
+  const result = await entryRef.value?.validate()
+  if (result?.valid) {
+    console.log('✅ Valid data:', result.data)
+    handleActionSave(result.data, {}, toast)
+  } else {
+    console.log('❌ Ada error di form', result)
+  }
+}
+
 provide('table_data_loader', isLoading)
 </script>
 <template>
-  <Entry type="early" :exclude-fields="['prim-compl', 'sec-compl']" @click="handleClick" />
-  <Dialog v-model:open="isOpen" title="Pilih Prosedur" size="xl" prevent-outside>
+  <Entry
+    ref="entryRef"
+    v-model="model"
+    :schema="schema"
+    type="early"
+    @modal="handleOpen"
+  />
+  <div class="my-2 flex justify-end py-2">
+    <Action @click="actionHandler" />
+  </div>
+  <Dialog
+    v-model:open="isOpen"
+    title="Pilih Prosedur"
+    size="xl"
+    prevent-outside
+  >
     <AppIcdMultiselectPicker :data="data" />
   </Dialog>
 </template>
diff --git a/app/handlers/soapi-early.handler.ts b/app/handlers/soapi-early.handler.ts
new file mode 100644
index 00000000..3a07108e
--- /dev/null
+++ b/app/handlers/soapi-early.handler.ts
@@ -0,0 +1,24 @@
+// Handlers
+import { genCrudHandler } from '~/handlers/_handler'
+
+// Services
+import { create, update, remove } from '~/services/soapi-early.service'
+
+export const {
+  recId,
+  recAction,
+  recItem,
+  isReadonly,
+  isProcessing,
+  isFormEntryDialogOpen,
+  isRecordConfirmationOpen,
+  onResetState,
+  handleActionSave,
+  handleActionEdit,
+  handleActionRemove,
+  handleCancelForm,
+} = genCrudHandler({
+  create,
+  update,
+  remove,
+})
diff --git a/app/models/soapi.ts b/app/models/soapi.ts
index 0289b342..02b4dcd5 100644
--- a/app/models/soapi.ts
+++ b/app/models/soapi.ts
@@ -1,4 +1,4 @@
-import { type Base, genBase } from "./_base"
+import { type Base, genBase } from './_base'
 
 export interface Soapi extends Base {
   encounter_id: number
@@ -16,3 +16,175 @@ export function genSoapi(): Soapi {
     value: '',
   }
 }
+
+export interface DiagnosisCode {
+  code: string
+  name: string
+}
+
+export interface AssessmentSection {
+  note: string
+  codes: DiagnosisCode[]
+}
+
+export interface Subject {
+  note: string
+  'prim-compl': string
+  'sec-compl': string
+  'pri-complain': string
+  'sec-complain': string
+  'cur-disea-hist': string
+  'pas-disea-hist': string
+  'fam-disea-hist': string
+  'alg-hist': string
+  'alg-react': string
+  'med-hist': string
+  'blood-type': string
+}
+
+export interface ObjectSection {
+  note: string
+  'consc-level': string
+  'consc-level-det': string
+  'syst-bp': string
+  'diast-bp': string
+  pulse: string
+  'resp-rate': string
+  'hear-rt': string
+  'neuro-cranialis': string
+  sensoris: string
+  'reflect-fisio': string
+  'reflect-pato': string
+  'autonom-neuron': string
+  'neck-rom': string
+  'body-rom': string
+  'aga-rom': string
+  'agb-rom': string
+  'neck-mmt': string
+  'body-mmt': string
+  'aga-mmt': string
+  'agb-mmt': string
+  localis: string
+  'medical-trouble': string
+  'rehab-medic-trouble': string
+  temp: string
+  spo2: string
+  weight: string
+  height: string
+  'head-to-toe': Record<string, string>
+}
+
+export interface Assessment {
+  'early-diag': AssessmentSection
+  'late-diag': AssessmentSection
+  'sec-diag': AssessmentSection
+}
+
+export interface InstructionCodeGroup {
+  note: string
+  codes: DiagnosisCode[]
+}
+
+export interface Instruction {
+  detail: string
+  'medical-act': InstructionCodeGroup
+  'supporting-exam': DiagnosisCode[]
+  therapy: string
+  medication: DiagnosisCode[]
+  material: DiagnosisCode[]
+  'rehab-program': string
+  'physic-modal': string
+  exercise: string
+  'ortes-protesa': string
+  education: string
+  other: string
+}
+
+export interface Soap extends Base {
+  subject: Subject
+  object: ObjectSection
+  assessment: Assessment
+  plan: string
+  instruction: Instruction
+}
+
+// ---- Generators ----
+
+function genDiagnosisCode(): DiagnosisCode {
+  return { code: '', name: '' }
+}
+
+function genAssessmentSection(): AssessmentSection {
+  return { note: '', codes: [genDiagnosisCode()] }
+}
+
+export function genSoap(): Soap {
+  return {
+    ...genBase(),
+    subject: {
+      note: '',
+      'prim-compl': '',
+      'sec-compl': '',
+      'pri-complain': '',
+      'sec-complain': '',
+      'cur-disea-hist': '',
+      'pas-disea-hist': '',
+      'fam-disea-hist': '',
+      'alg-hist': '',
+      'alg-react': '',
+      'med-hist': '',
+      'blood-type': '',
+    },
+    object: {
+      note: '',
+      'consc-level': '',
+      'consc-level-det': '',
+      'syst-bp': '',
+      'diast-bp': '',
+      pulse: '',
+      'resp-rate': '',
+      'hear-rt': '',
+      'neuro-cranialis': '',
+      sensoris: '',
+      'reflect-fisio': '',
+      'reflect-pato': '',
+      'autonom-neuron': '',
+      'neck-rom': '',
+      'body-rom': '',
+      'aga-rom': '',
+      'agb-rom': '',
+      'neck-mmt': '',
+      'body-mmt': '',
+      'aga-mmt': '',
+      'agb-mmt': '',
+      localis: '',
+      'medical-trouble': '',
+      'rehab-medic-trouble': '',
+      temp: '',
+      spo2: '',
+      weight: '',
+      height: '',
+      'head-to-toe': {},
+    },
+    assessment: {
+      'early-diag': genAssessmentSection(),
+      'late-diag': genAssessmentSection(),
+      'sec-diag': genAssessmentSection(),
+    },
+    plan: '',
+    instruction: {
+      detail: '',
+      'medical-act': { note: '', codes: [genDiagnosisCode()] },
+      'supporting-exam': [genDiagnosisCode()],
+      therapy: '',
+      medication: [genDiagnosisCode()],
+      material: [genDiagnosisCode()],
+      'rehab-program': '',
+      'physic-modal': '',
+      exercise: '',
+      'ortes-protesa': '',
+      education: '',
+      other: '',
+    },
+  }
+}
diff --git a/app/schemas/soapi.schema.ts b/app/schemas/soapi.schema.ts
new file mode 100644
index 00000000..50ade93e
--- /dev/null
+++ b/app/schemas/soapi.schema.ts
@@ -0,0 +1,190 @@
+import { z } from 'zod'
+import type { Soap } from '~/models/soapi'
+
+const DiagnosisCodeSchema = z.object({
+  code: z.string().default(''),
+  name: z.string().default(''),
+})
+
+const AssessmentSectionSchema = z.object({
+  note: z.string().default(''),
+  codes: z.array(DiagnosisCodeSchema).default([]),
+})
+
+export const EarlySchema = z.object({
+  'prim-compl': z.string({ required_error: 'Keluhan utama harus diisi' }).min(1, 'Keluhan utama harus diisi'),
+  'cur-disea-hist': z.string().default(''),
+  'syst-bp': z.string().default(''),
+  'diast-bp': z.string().default(''),
+  pulse: z.string().default(''),
+  'resp-rate': z.string().default(''),
+  temp: z.string().default(''),
+  weight: z.string().default(''),
+  height: z.string().default(''),
+  'reflect-fisio': z.string().default(''),
+  'reflect-pato': z.string().default(''),
+  'autonom-neuron': z.string().default(''),
+  'medical-act': z.string().default(''),
+  therapy: z.string().default(''),
+})
+
+export const EarlyRehabSchema = z.object({
+  'prim-compl': z.string({ required_error: 'Keluhan utama harus diisi' }).min(1, 'Keluhan utama harus diisi'),
+  'medical-plan': z.string().default(''),
+  'diagnosis-medical': z.string().default(''),
+  'rehab-trouble': z.string().default(''),
+  'medical-trouble': z.string().default(''),
+  'physic-modal': z.string().default(''),
+  exercise: z.string().default(''),
+  'ortho-pesa': z.string().default(''),
+  education: z.string().default(''),
+  other: z.string().default(''),
+  cranialis: z.string().default(''),
+  sensoris: z.string().default(''),
+  'reflect-fisio': z.string().default(''),
+  'reflect-pato': z.string().default(''),
+  otonom: z.string().default(''),
+  localis: z.string().default(''),
+  'medical-trial': z.string().default(''),
+  therapy: z.string().default(''),
+  'syst-bp': z.string().default(''),
+  'diast-bp': z.string().default(''),
+  pulse: z.string().default(''),
+  gcs: z.string().default(''),
+  'respiratory-rate': z.string().default(''),
+  temp: z.string().default(''),
+  weight: z.string().default(''),
+  height: z.string().default(''),
+  ambulance: z.string().default(''),
+  gait: z.string().default(''),
+  'neck-rom': z.string().default(''),
+  'body-rom': z.string().default(''),
+  'aga-rom': z.string().default(''),
+  'agb-rom': z.string().default(''),
+  'neck-mmt': z.string().default(''),
+  'body-mmt': z.string().default(''),
+  'aga-mmt': z.string().default(''),
+  'agb-mmt': z.string().default(''),
+})
+
+export const FunctionSoapiSchema = z.object({
+  'prim-compl': z.string({ required_error: 'Keluhan utama harus diisi' }).min(1, 'Keluhan utama harus diisi'),
+  'past-disease': z.string().default(''),
+  'current-disease': z.string().default(''),
+  gcs: z.string().default(''),
+  'respiratory-rate': z.string().default(''),
+  'respiratory-rate-type': z.string().default(''),
+  pulse: z.string().default(''),
+  'pulse-type': z.string().default(''),
+  'right-arm-bp': z.string().default(''),
+  'left-arm-bp': z.string().default(''),
+  'axillary-temp': z.string().default(''),
+  'rektal-temp': z.string().default(''),
+  skin: z.string().default(''),
+  head: z.string().default(''),
+  ear: z.string().default(''),
+  nose: z.string().default(''),
+  'oral-cavity': z.string().default(''),
+  eye: z.string().default(''),
+  'other-body-part': z.string().default(''),
+  neck: z.string().default(''),
+  thyroid: z.string().default(''),
+  thorax: z.string().default(''),
+  heart: z.string().default(''),
+  lung: z.string().default(''),
+  abdomen: z.string().default(''),
+  heart2: z.string().default(''),
+  lien: z.string().default(''),
+  back: z.string().default(''),
+  extremity: z.string().default(''),
+  gender: z.string().default(''),
+  rectum: z.string().default(''),
+  'system-syaraf': z.string().default(''),
+  'nervous-system': z.string().default(''),
+  'cardio-respiratory': z.string().default(''),
+  imaging: z.string().default(''),
+  laboratory: z.string().default(''),
+})
+
+export const SubjectSchema = z.object({
+  note: z.string().default(''),
+  'prim-compl': z.string({ required_error: 'Keluhan utama harus diisi' }).min(1, 'Keluhan utama harus diisi'),
+  'sec-compl': z.string().default(''),
+  'pri-complain': z.string().default(''),
+  'sec-complain': z.string().default(''),
+  'cur-disea-hist': z.string().default(''),
+  'pas-disea-hist': z.string().default(''),
+  'fam-disea-hist': z.string().default(''),
+  'alg-hist': z.string().default(''),
+  'alg-react': z.string().default(''),
+  'med-hist': z.string().default(''),
+  'blood-type': z.string().default(''),
+})
+
+export const ObjectSchema = z.object({
+  note: z.string().default(''),
+  'consc-level': z.string().default(''),
+  'consc-level-det': z.string().default(''),
+  'syst-bp': z.string().default(''),
+  'diast-bp': z.string().default(''),
+  pulse: z.string().default(''),
+  'resp-rate': z.string().default(''),
+  'hear-rt': z.string().default(''),
+  'neuro-cranialis': z.string().default(''),
+  sensoris: z.string().default(''),
+  'reflect-fisio': z.string().default(''),
+  'reflect-pato': z.string().default(''),
+  'autonom-neuron': z.string().default(''),
+  'neck-rom': z.string().default(''),
+  'body-rom': z.string().default(''),
+  'aga-rom': z.string().default(''),
+  'agb-rom': z.string().default(''),
+  'neck-mmt': z.string().default(''),
+  'body-mmt': z.string().default(''),
+  'aga-mmt': z.string().default(''),
+  'agb-mmt': z.string().default(''),
+  localis: z.string().default(''),
+  'medical-trouble': z.string().default(''),
+  'rehab-medic-trouble': z.string().default(''),
+  temp: z.string().default(''),
+  spo2: z.string().default(''),
+  weight: z.string().default(''),
+  height: z.string().default(''),
+  'head-to-toe': z.record(z.string()).default({}),
+})
+
+const AssessmentSchema = z.object({
+  'early-diag': AssessmentSectionSchema,
+  'late-diag': AssessmentSectionSchema,
+  'sec-diag': AssessmentSectionSchema,
+})
+
+const InstructionCodeGroupSchema = z.object({
+  note: z.string().default(''),
+  codes: z.array(DiagnosisCodeSchema).default([]),
+})
+
+const InstructionSchema = z.object({
+  detail: z.string().default(''),
+  'medical-act': InstructionCodeGroupSchema,
+  'supporting-exam': z.array(DiagnosisCodeSchema).default([]),
+  therapy: z.string().default(''),
+  medication: z.array(DiagnosisCodeSchema).default([]),
+  material: z.array(DiagnosisCodeSchema).default([]),
+  'rehab-program': z.string().default(''),
+  'physic-modal': z.string().default(''),
+  exercise: z.string().default(''),
+  'ortes-protesa': z.string().default(''),
+  education: z.string().default(''),
+  other: z.string().default(''),
+})
+
+export const SoapSchema = z.object({
+  subject: SubjectSchema,
+  object: ObjectSchema,
+  assessment: AssessmentSchema,
+  plan: z.string().default(''),
+  instruction: InstructionSchema,
+})
+
+export type SoapiFormData = z.infer<typeof SoapSchema> & Partial<Soap>
diff --git a/app/services/soapi-early.service.ts b/app/services/soapi-early.service.ts
new file mode 100644
index 00000000..7c55c979
--- /dev/null
+++ b/app/services/soapi-early.service.ts
@@ -0,0 +1,28 @@
+// Base
+import * as base from './_crud-base'
+
+// Types
+import type { Soapi } from '~/models/soapi'
+
+const path = '/api/v1/soapi'
+const name = 'soapi'
+
+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)
+}

From a6f1abb20f8d96b5531cb7bb95bff32d56cfa022 Mon Sep 17 00:00:00 2001
From: Abizrh <abizarah857@gmail.com>
Date: Mon, 20 Oct 2025 20:26:01 +0700
Subject: [PATCH 2/5] =?UTF-8?q?=E2=9A=A1=20enhance=20(soapi):=20update=20p?=
 =?UTF-8?q?ayload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/app/encounter/quick-info.vue   | 39 +++++++++++++------
 .../content/soapi/form-function.vue           | 22 +++++++++--
 app/components/content/soapi/form-rehab.vue   | 22 +++++++++--
 app/components/content/soapi/form.vue         | 22 +++++++++--
 4 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/app/components/app/encounter/quick-info.vue b/app/components/app/encounter/quick-info.vue
index 37ed817f..4b223917 100644
--- a/app/components/app/encounter/quick-info.vue
+++ b/app/components/app/encounter/quick-info.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import * as DE from '~/components/pub/my-ui/doc-entry';
-import type { Encounter } from '~/models/encounter';
+import * as DE from '~/components/pub/my-ui/doc-entry'
+import type { Encounter } from '~/models/encounter'
 
 const props = defineProps<{
   data: Encounter
@@ -8,27 +8,31 @@ const props = defineProps<{
 
 let address = ''
 if (props.data.patient.person.addresses) {
-  address = props.data.patient.person.addresses.map(a => a.address).join(', ')
+  address = props.data.patient.person.addresses.map((a) => a.address).join(', ')
 }
 
-let dpjp = '';
+let dpjp = ''
 if (props.data.responsible_doctor) {
   const dp = props.data.responsible_doctor.employee.person
   dpjp = `${dp.frontTitle} ${dp.name} ${dp.endTitle}`
 } else if (props.data.appointment_doctor) {
   dpjp = props.data.appointment_doctor.employee.person.name
 }
-
 </script>
 
 <template>
-  <div class="w-full rounded-md border bg-white dark:bg-neutral-950 p-4 shadow-sm">
+  <div class="w-full rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
     <!-- Data Pasien -->
-    <h2 class="mb-2 md:text-base 2xl:text-lg font-semibold">{{ data.patient.person.name }} - {{ data.patient.number }}</h2>
+    <h2 class="mb-2 font-semibold md:text-base 2xl:text-lg">
+      {{ data.patient.person.name }} - {{ data.patient.number }}
+    </h2>
 
-    <div class="grid grid-cols-3" >
+    <div class="grid grid-cols-3">
       <div>
-        <DE.Block mode="preview" labelSize="large">
+        <DE.Block
+          mode="preview"
+          labelSize="large"
+        >
           <DE.Cell>
             <DE.Label class="font-semibold">No. RM</DE.Label>
             <DE.Field>
@@ -50,7 +54,10 @@ if (props.data.responsible_doctor) {
         </DE.Block>
       </div>
       <div>
-        <DE.Block mode="preview" labelSize="large">
+        <DE.Block
+          mode="preview"
+          labelSize="large"
+        >
           <DE.Cell>
             <DE.Label class="font-semibold">Tgl. Kunjungan</DE.Label>
             <DE.Field>
@@ -72,9 +79,17 @@ if (props.data.responsible_doctor) {
         </DE.Block>
       </div>
       <div>
-        <DE.Block mode="preview" labelSize="large">
+        <DE.Block
+          mode="preview"
+          labelSize="large"
+        >
           <DE.Cell>
-            <DE.Label position="dynamic" class="!text-base 2xl:!text-lg font-semibold">Billing</DE.Label>
+            <DE.Label
+              position="dynamic"
+              class="!text-base font-semibold 2xl:!text-lg"
+            >
+              Billing
+            </DE.Label>
             <DE.Field class="text-base 2xl:text-lg">
               Rp. 000.000
               <!-- {{ data }} -->
diff --git a/app/components/content/soapi/form-function.vue b/app/components/content/soapi/form-function.vue
index d9ef1d65..ade9e4d1 100644
--- a/app/components/content/soapi/form-function.vue
+++ b/app/components/content/soapi/form-function.vue
@@ -7,9 +7,16 @@ import { FunctionSoapiSchema } from '~/schemas/soapi.schema'
 import { toast } from '~/components/pub/ui/toast'
 import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
+const route = useRoute()
 const isOpen = ref(false)
 const data = ref([])
 const schema = FunctionSoapiSchema
+const payload = ref({
+  encounter_id: 0,
+  time: '',
+  typeCode: 'function',
+  value: '',
+})
 const model = ref({
   'prim-compl': '',
   'past-disease': '',
@@ -76,10 +83,19 @@ async function actionHandler(type: string) {
   console.log(type)
   const result = await entryRehabRef.value?.validate()
   if (result?.valid) {
-    console.log('✅ Valid data:', result.data)
-    handleActionSave(result.data, {}, toast)
+    console.log('data', result.data)
+    handleActionSave(
+      {
+        ...payload.value,
+        value: JSON.stringify(result.data),
+        encounter_id: +route.params.id,
+        time: new Date().toISOString(),
+      },
+      {},
+      toast,
+    )
   } else {
-    console.log('❌ Ada error di form', result)
+    console.log('Ada error di form', result)
   }
 }
 
diff --git a/app/components/content/soapi/form-rehab.vue b/app/components/content/soapi/form-rehab.vue
index 6681e64c..655063f9 100644
--- a/app/components/content/soapi/form-rehab.vue
+++ b/app/components/content/soapi/form-rehab.vue
@@ -7,9 +7,16 @@ import { EarlyRehabSchema } from '~/schemas/soapi.schema'
 import { toast } from '~/components/pub/ui/toast'
 import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
+const route = useRoute()
 const isOpen = ref(false)
 const data = ref([])
 const schema = EarlyRehabSchema
+const payload = ref({
+  encounter_id: 0,
+  time: '',
+  typeCode: 'early-rehab',
+  value: '',
+})
 const model = ref({
   'prim-compl': '',
   'medical-plan': '',
@@ -81,10 +88,19 @@ async function actionHandler(type: string) {
   console.log(type)
   const result = await entryRehabRef.value?.validate()
   if (result?.valid) {
-    console.log('✅ Valid data:', result.data)
-    handleActionSave(result.data, {}, toast)
+    console.log('data', result.data)
+    handleActionSave(
+      {
+        ...payload.value,
+        value: JSON.stringify(result.data),
+        encounter_id: +route.params.id,
+        time: new Date().toISOString(),
+      },
+      {},
+      toast,
+    )
   } else {
-    console.log('❌ Ada error di form', result)
+    console.log('Ada error di form', result)
   }
 }
 
diff --git a/app/components/content/soapi/form.vue b/app/components/content/soapi/form.vue
index f1857de6..794daef9 100644
--- a/app/components/content/soapi/form.vue
+++ b/app/components/content/soapi/form.vue
@@ -7,9 +7,16 @@ import { EarlySchema } from '~/schemas/soapi.schema'
 import { toast } from '~/components/pub/ui/toast'
 import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
+const route = useRoute()
 const isOpen = ref(false)
 const data = ref([])
 const schema = EarlySchema
+const payload = ref({
+  encounter_id: 0,
+  time: '',
+  typeCode: 'early',
+  value: '',
+})
 
 const model = ref({
   'prim-compl': '',
@@ -54,10 +61,19 @@ async function actionHandler(type: string) {
   console.log(type)
   const result = await entryRef.value?.validate()
   if (result?.valid) {
-    console.log('✅ Valid data:', result.data)
-    handleActionSave(result.data, {}, toast)
+    console.log('data', result.data)
+    handleActionSave(
+      {
+        ...payload.value,
+        value: JSON.stringify(result.data),
+        encounter_id: +route.params.id,
+        time: new Date().toISOString(),
+      },
+      {},
+      toast,
+    )
   } else {
-    console.log('❌ Ada error di form', result)
+    console.log('Ada error di form', result)
   }
 }
 

From fe08643c0e972bf78865519dde48c388d6ed6b60 Mon Sep 17 00:00:00 2001
From: Abizrh <abizarah857@gmail.com>
Date: Wed, 22 Oct 2025 17:20:06 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20fix=20(encounter):=20fetch?=
 =?UTF-8?q?=20encounter=20data=20instead=20of=20patient=20data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/content/encounter/list.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index 065fbab1..76f32415 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -49,8 +49,7 @@ const refSearchNav: RefSearchNav = {
 
 async function getPatientList() {
   isLoading.isTableLoading = true
-  const resp = await xfetch('/api/v1/patient')
-  // const resp = await xfetch('/api/v1/encounter?includes=patient,patient-person')
+  const resp = await xfetch('/api/v1/encounter?includes=patient,patient-person')
   if (resp.success) {
     data.value = (resp.body as Record<string, any>).data
   }

From 44588f3273109e9b3ab27d57edd607d5fb359463 Mon Sep 17 00:00:00 2001
From: Abizrh <abizarah857@gmail.com>
Date: Wed, 22 Oct 2025 17:40:53 +0700
Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=90=9B=20fix=20(user):=20fix=20user?=
 =?UTF-8?q?=20role=20computation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/stores/user.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/stores/user.ts b/app/stores/user.ts
index a9ed35c1..cbe92a69 100644
--- a/app/stores/user.ts
+++ b/app/stores/user.ts
@@ -5,7 +5,10 @@ export const useUserStore = defineStore(
     // const token = useCookie('authentication')
 
     const isAuthenticated = computed(() => !!user.value)
-    // const userRole = computed(() => user.value?.user_position_code || '')
+    const userRole = computed(() => {
+      const roles = user.value?.roles || []
+      return roles.map((v) => v.split('-')[1])
+    })
 
     const login = async (userData: any) => {
       user.value = userData
@@ -18,7 +21,7 @@ export const useUserStore = defineStore(
     return {
       user,
       isAuthenticated,
-      userRole: ['doctor'],
+      userRole,
       login,
       logout,
     }

From 1042fd49233c25693d831d19ba7f5c0e9bb5c99c Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <57973347+munaja@users.noreply.github.com>
Date: Fri, 24 Oct 2025 08:16:06 +0700
Subject: [PATCH 5/5] chore: update .env.example

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index b6721291..899cee1f 100644
--- a/.env.example
+++ b/.env.example
@@ -1 +1 @@
-API_ORIGIN=
+NUXT_API_ORIGIN=