diff --git a/app/components/content/general-consent/form.vue b/app/components/content/general-consent/form.vue
index 8c15ceb0..e26dbac1 100644
--- a/app/components/content/general-consent/form.vue
+++ b/app/components/content/general-consent/form.vue
@@ -10,7 +10,8 @@ import { handleActionSave, handleActionEdit } from '~/handlers/general-consent.h
 import { create } from '~/services/generate-file.service'
 // Services
 import { getDetail } from '~/services/general-consent.service'
-const { backToList } = useQueryMode('mode')
+const { backToList } = useQueryCRUDMode('mode')
+const { recordId } = useQueryCRUDRecordId('record-id')
 
 const route = useRoute()
 const isOpenProcedure = ref(false)
@@ -74,8 +75,15 @@ const loadEntryForEdit = async (id: number) => {
   if (result?.success) {
     const data = result.body?.data || {}
 
-    console.log('Mapping data:', data)
-    // Set state utk form
+    const value = JSON.parse(data.value || '{}')
+    console.log('Mapping data:', value)
+    model.value.witness1 = value?.witness1 || ''
+    model.value.witness2 = value?.witness2 || ''
+    model.value.informant = value?.informant || ''
+    model.value.responsibleName = value?.responsible || ''
+    model.value.responsiblePhone = value?.responsiblePhone || ''
+    model.value.relatives = value?.relatives || []
+    console.log('model', model.value)
   }
 }
 
@@ -95,7 +103,6 @@ async function actionHandler(type: string) {
     return
   }
   if (type === 'print') {
-    console.log('print')
     isOpenDiagnose.value = true
     return
   }
diff --git a/app/components/content/general-consent/list.vue b/app/components/content/general-consent/list.vue
index caba7f7c..4cf269ee 100644
--- a/app/components/content/general-consent/list.vue
+++ b/app/components/content/general-consent/list.vue
@@ -89,7 +89,6 @@ const headerPrep: HeaderPrep = {
     icon: 'i-lucide-plus',
     onClick: () => {
       goToEntry()
-      emits('add')
     },
   },
 }
diff --git a/app/composables/useQueryCRUD.ts b/app/composables/useQueryCRUD.ts
index a48e9a2b..f81649bd 100644
--- a/app/composables/useQueryCRUD.ts
+++ b/app/composables/useQueryCRUD.ts
@@ -19,7 +19,17 @@ export function useQueryCRUDMode(key: string = 'mode') {
   })
 
   const goToEntry = () => (mode.value = 'entry')
-  const backToList = () =>(mode.value = 'list')
+  const backToList = () => {
+    router.push({
+      path: route.path,
+      query: {
+        ...route.query,
+        mode: 'list',
+        // HAPUS record-id
+        'record-id': undefined,
+      },
+    })
+  }
 
   return { mode, goToEntry, backToList }
 }