diff --git a/app/components/app/consultation/entry.vue b/app/components/app/consultation/entry.vue
index a8378b0c..bff12bfb 100644
--- a/app/components/app/consultation/entry.vue
+++ b/app/components/app/consultation/entry.vue
@@ -95,7 +95,7 @@ function onCancelForm() {
             id="strUnit_id"
             v-model.number="unit_id"
             icon-name="i-lucide-chevron-down"
-            placeholder="Pilih kelompok obat"
+            placeholder="Pilih poliklinik tujuan"
             v-bind="unitAttrs"
             :items="props.units || []"
             :disabled="isLoading || isReadonly"
diff --git a/app/components/content/consultation/list.vue b/app/components/content/consultation/list.vue
index 5d17acd0..cfce5ae3 100644
--- a/app/components/content/consultation/list.vue
+++ b/app/components/content/consultation/list.vue
@@ -23,6 +23,7 @@ import {
   isProcessing,
   isFormEntryDialogOpen,
   isRecordConfirmationOpen,
+  onResetState,
   handleActionSave,
   handleActionEdit,
   handleActionRemove,
@@ -43,6 +44,7 @@ interface Props {
 const props = defineProps<Props>()
 
 let units = ref<{ value: string; label: string }[]>([])
+const encounterId = ref<number>(props?.encounter?.id || 0)
 const title = ref('')
 
 const {
@@ -57,7 +59,7 @@ const {
   fetchFn: async ({ page, search }) => {
     const result = await getList({ 'encounter-id': props.encounter.id, includes: 'encounter,dstUnit', search, page })
     if (result.success) {
-      data.value = result.body.data;
+      data.value = result.body.data
     }
     return { success: result.success || false, body: result.body || {} }
   },
@@ -83,7 +85,7 @@ const headerPrep: HeaderPrep = {
     icon: 'i-lucide-plus',
     onClick: () => {
       recItem.value = {
-        encounter_id: props.encounter.id,
+        encounter_id: encounterId.value,
         date: today.toISOString().slice(0, 10),
         unit_id: 0,
         problem: '',
@@ -144,13 +146,29 @@ onMounted(async () => {
     @search="handleSearch"
     class="mb-4 xl:mb-5"
   />
-  <List :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
-  <Dialog v-model:open="isFormEntryDialogOpen" :title="recItem?.id ? 'Edit Konsultasi' : 'Tambah Konsultasi'" size="xl" prevent-outside>
+  <List
+    :data="data"
+    :pagination-meta="paginationMeta"
+    @page-change="handlePageChange"
+  />
+
+  <Dialog
+    v-model:open="isFormEntryDialogOpen"
+    :title="recItem?.id ? 'Edit Konsultasi' : 'Tambah Konsultasi'"
+    size="xl"
+    prevent-outside
+    @update:open="
+      (value: any) => {
+        onResetState()
+        isFormEntryDialogOpen = value
+      }
+    "
+  >
     <Entry
       :schema="ConsultationSchema"
       :values="recItem"
-      :encounter_id="props.encounter.id"
+      :encounter_id="encounterId"
       :units="units"
       :is-loading="isProcessing"
       :is-readonly="isReadonly"
@@ -168,7 +186,6 @@ onMounted(async () => {
   </Dialog>
 
   <!-- Record Confirmation Modal -->
-   {{ isRecordConfirmationOpen }}
   <RecordConfirmation
     v-model:open="isRecordConfirmationOpen"
     action="delete"
@@ -178,9 +195,18 @@ onMounted(async () => {
   >
     <template #default="{ record }">
       <div class="text-sm">
-        <p><strong>ID:</strong> {{ record?.id }}</p>
-        <p v-if="record?.name"><strong>Nama:</strong> {{ record.name }}</p>
-        <p v-if="record?.code"><strong>Kode:</strong> {{ record.code }}</p>
+        <p>
+          <strong>ID:</strong>
+          {{ record?.id }}
+        </p>
+        <p v-if="record?.name">
+          <strong>Nama:</strong>
+          {{ record.name }}
+        </p>
+        <p v-if="record?.code">
+          <strong>Kode:</strong>
+          {{ record.code }}
+        </p>
       </div>
     </template>
   </RecordConfirmation>