diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue
index 7c9ba923..1ac00703 100644
--- a/app/components/app/encounter/entry-form.vue
+++ b/app/components/app/encounter/entry-form.vue
@@ -115,11 +115,12 @@ watch(props, (value) => {
 
 function onAddSep() {
   const formValues = {
+    patientId: patientId.value || '',
     doctorCode: doctorId.value,
     subSpecialistCode: subSpecialistId.value,
     registerDate: registerDate.value,
-    paymentType: paymentType.value,
     cardNumber: bpjsNumber.value,
+    paymentType: paymentType.value,
     sepType: sepType.value
   }
   emit('event', 'add-sep', formValues)
diff --git a/app/components/app/patient/view-patient.vue b/app/components/app/patient/view-patient.vue
index 53d9f9ab..e24554b7 100644
--- a/app/components/app/patient/view-patient.vue
+++ b/app/components/app/patient/view-patient.vue
@@ -77,7 +77,6 @@ watch(debouncedSearch, (newValue) => {
     emit('fetch', { search: newValue })
   }
 })
-
 </script>
 
 <template>
diff --git a/app/components/content/encounter/entry.vue b/app/components/content/encounter/entry.vue
index 412007d8..d1e39afb 100644
--- a/app/components/content/encounter/entry.vue
+++ b/app/components/content/encounter/entry.vue
@@ -43,6 +43,7 @@ const sepsList = ref<Array<{ value: string; label: string }>>([])
 const participantGroupsList = ref<Array<{ value: string; label: string }>>([])
 const specialistsTree = ref<TreeItem[]>([])
 const doctorsList = ref<Array<{ value: string; label: string }>>([])
+const recSelectId = ref<number | null>(null)
 
 function handleSavePatient() {
   selectedPatientObject.value = null
@@ -82,6 +83,7 @@ function handleEvent(menu: string, value?: any) {
   } else if (menu === 'add') {
     navigateTo('/client/patient/add')
   } else if (menu === 'add-sep') {
+    recSelectId.value = null
     toNavigateSep({ sourcePath: route.path, resource: 'encounter', isService: 'false', ...value })
   } else if (menu === 'save') {
     console.log('Save encounter:', value)
@@ -179,6 +181,7 @@ async function handleInit() {
   await handleFetchSpecialists()
 }
 
+provide('rec_select_id', recSelectId)
 provide('table_data_loader', isLoading)
 
 onMounted(async () => {