diff --git a/app/components/app/outpatient/encounter/_common/select-date.vue b/app/components/app/control-letter/_common/select-date.vue
similarity index 100%
rename from app/components/app/outpatient/encounter/_common/select-date.vue
rename to app/components/app/control-letter/_common/select-date.vue
diff --git a/app/components/app/outpatient/encounter/_common/select-dpjp.vue b/app/components/app/control-letter/_common/select-dpjp.vue
similarity index 93%
rename from app/components/app/outpatient/encounter/_common/select-dpjp.vue
rename to app/components/app/control-letter/_common/select-dpjp.vue
index 2f5a9c6e..2053ebdb 100644
--- a/app/components/app/outpatient/encounter/_common/select-dpjp.vue
+++ b/app/components/app/control-letter/_common/select-dpjp.vue
@@ -36,11 +36,10 @@ async function fetchDpjp(specialistId: string, subspecialistId: string) {
   doctors.value = await getDoctorLabelList({
     serviceType: 1,
     serviceDate: new Date().toISOString().substring(0, 10),
-    specialistCode: 0,
     includes: 'employee-person',
     // "unit-id": parseInt(unitId),
-    "specialist-id": String(specialistId),
-    "subspecialist-id": String(subspecialistId),
+    "specialist-code": String(specialistId),
+    "subspecialist-code": String(subspecialistId),
   }, true)
 }
 
@@ -53,7 +52,8 @@ const selectedSubSpecialistId = inject<Ref<string | null>>("selectedSubSpecialis
 // }
 
 watch([ selectedSpecialistId, selectedSubSpecialistId], () => {
-  if ( selectedSpecialistId.value && selectedSubSpecialistId.value) {
+  if (selectedSpecialistId.value && selectedSubSpecialistId.value) {
+    console.log(`Select Doctor`)
     fetchDpjp( selectedSpecialistId.value, selectedSubSpecialistId.value)
   }
 })
diff --git a/app/components/app/outpatient/encounter/_common/select-specialist.vue b/app/components/app/control-letter/_common/select-specialist.vue
similarity index 98%
rename from app/components/app/outpatient/encounter/_common/select-specialist.vue
rename to app/components/app/control-letter/_common/select-specialist.vue
index f4de1373..cd5ee923 100644
--- a/app/components/app/outpatient/encounter/_common/select-specialist.vue
+++ b/app/components/app/control-letter/_common/select-specialist.vue
@@ -54,7 +54,6 @@ watch([selectedUnitId], () => {
     fetchSpecialists(selectedUnitId.value)
   }
 })
-  console.log(selectedUnitId.value)
 </script>
 
 <template>
diff --git a/app/components/app/outpatient/encounter/_common/select-subspecialist.vue b/app/components/app/control-letter/_common/select-subspecialist.vue
similarity index 98%
rename from app/components/app/outpatient/encounter/_common/select-subspecialist.vue
rename to app/components/app/control-letter/_common/select-subspecialist.vue
index e9a597d2..61567c0c 100644
--- a/app/components/app/outpatient/encounter/_common/select-subspecialist.vue
+++ b/app/components/app/control-letter/_common/select-subspecialist.vue
@@ -37,7 +37,7 @@ async function fetchSubSpecialists(specialistId: string) {
     serviceType: 1,
     serviceDate: new Date().toISOString().substring(0, 10),
     specialistCode: 0,
-    "specialist-id": String(specialistId),
+    "specialist-code": String(specialistId),
   }, true)
 }
 
diff --git a/app/components/app/outpatient/encounter/_common/select-unit.vue b/app/components/app/control-letter/_common/select-unit.vue
similarity index 100%
rename from app/components/app/outpatient/encounter/_common/select-unit.vue
rename to app/components/app/control-letter/_common/select-unit.vue
diff --git a/app/components/app/outpatient/encounter/entry-form.vue b/app/components/app/control-letter/entry-form.vue
similarity index 100%
rename from app/components/app/outpatient/encounter/entry-form.vue
rename to app/components/app/control-letter/entry-form.vue
diff --git a/app/components/app/outpatient/encounter/list.cfg.ts b/app/components/app/control-letter/list.cfg.ts
similarity index 100%
rename from app/components/app/outpatient/encounter/list.cfg.ts
rename to app/components/app/control-letter/list.cfg.ts
diff --git a/app/components/app/outpatient/encounter/list.vue b/app/components/app/control-letter/list.vue
similarity index 100%
rename from app/components/app/outpatient/encounter/list.vue
rename to app/components/app/control-letter/list.vue
diff --git a/app/components/app/outpatient/encounter/preview.vue b/app/components/app/control-letter/preview.vue
similarity index 100%
rename from app/components/app/outpatient/encounter/preview.vue
rename to app/components/app/control-letter/preview.vue
diff --git a/app/components/content/outpatient/encounter/add.vue b/app/components/content/control-letter/add.vue
similarity index 99%
rename from app/components/content/outpatient/encounter/add.vue
rename to app/components/content/control-letter/add.vue
index e5c556d7..44f03a2f 100644
--- a/app/components/content/outpatient/encounter/add.vue
+++ b/app/components/content/control-letter/add.vue
@@ -108,7 +108,7 @@ provide("selectedSubSpecialistId", selectedSubSpecialistId);
 
 <template>
   <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Tambah Surat Kontrol</div>
-  <AppOutpatientEncounterEntryForm
+  <AppControlLetterEntryForm
     ref="controlLetterForm"
     :schema="ControlLetterSchema"
     :selected-unit-id="selectedUnitId"
diff --git a/app/components/content/outpatient/encounter/detail.vue b/app/components/content/control-letter/detail.vue
similarity index 95%
rename from app/components/content/outpatient/encounter/detail.vue
rename to app/components/content/control-letter/detail.vue
index cd0d3092..d9019d57 100644
--- a/app/components/content/outpatient/encounter/detail.vue
+++ b/app/components/content/control-letter/detail.vue
@@ -75,5 +75,5 @@ function handleAction(type: string) {
 <template>
   <Header :prep="headerPrep" :ref-search-nav="headerPrep.refSearchNav" />
 
-  <AppOutpatientEncounterPreview :instance="controlLetter" @click="handleAction" />
+  <AppControlLetterPreview :instance="controlLetter" @click="handleAction" />
 </template>
diff --git a/app/components/content/outpatient/encounter/edit.vue b/app/components/content/control-letter/edit.vue
similarity index 96%
rename from app/components/content/outpatient/encounter/edit.vue
rename to app/components/content/control-letter/edit.vue
index eea6878a..99a5c282 100644
--- a/app/components/content/outpatient/encounter/edit.vue
+++ b/app/components/content/control-letter/edit.vue
@@ -61,9 +61,9 @@ onMounted(async () => {
   const result = await getDetail(controlLetterId)
   if (result.success) {
     const responseData = {...result.body.data, date: formatDateYyyyMmDd(result.body.data.date)}
-    selectedUnitId.value = responseData?.unit_id
-    selectedSpecialistId.value = responseData?.specialist_id
-    selectedSubSpecialistId.value = responseData?.subspecialist_id
+    selectedUnitId.value = responseData?.unit_code
+    selectedSpecialistId.value = responseData?.specialist_code
+    selectedSubSpecialistId.value = responseData?.subspecialist_code
 
     controlLetter.value = responseData
     controlLetterForm.value?.setValues(responseData)
@@ -135,7 +135,7 @@ provide("selectedSubSpecialistId", selectedSubSpecialistId);
 
 <template>
   <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg font-semibold xl:text-xl">Update Surat Kontrol</div>
-  <AppOutpatientEncounterEntryForm
+  <AppControlLetterEntryForm
     ref="controlLetterForm"
     :schema="ControlLetterSchema"
     :selected-unit-id="selectedUnitId"
diff --git a/app/components/content/outpatient/encounter/list.vue b/app/components/content/control-letter/list.vue
similarity index 97%
rename from app/components/content/outpatient/encounter/list.vue
rename to app/components/content/control-letter/list.vue
index da703ecb..c9353057 100644
--- a/app/components/content/outpatient/encounter/list.vue
+++ b/app/components/content/control-letter/list.vue
@@ -151,7 +151,7 @@ watch([recId, recAction], () => {
       :ref-search-nav="refSearchNav"
       @search="handleSearch" />
 
-    <AppOutpatientEncounterList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
+    <AppControlLetterList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
 
     <RecordConfirmation v-model:open="isRecordConfirmationOpen" action="delete" :record="recItem"
       @confirm="handleConfirmDelete" @cancel="handleCancelConfirmation">
diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index 5093c66e..5e0f8062 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -16,7 +16,7 @@ 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 Consultation from '~/components/content/consultation/list.vue'
-import EncounterList from '~/components/content/outpatient/encounter/list.vue'
+import ControlLetterList from '~/components/content/control-letter/list.vue'
 
 const route = useRoute()
 const router = useRouter()
@@ -71,7 +71,7 @@ const tabs: TabItem[] = [
   { value: 'mcu-result', label: 'Hasil Penunjang' },
   { value: 'consultation', label: 'Konsultasi', component: Consultation, props: { encounter: data } },
   { value: 'resume', label: 'Resume' },
-  { value: 'control', label: 'Surat Kontrol', component: EncounterList, props: { encounter: data } },
+  { value: 'control', label: 'Surat Kontrol', component: ControlLetterList, props: { encounter: data } },
   { value: 'screening', label: 'Skrinning MPP' },
   { value: 'supporting-document', label: 'Upload Dokumen Pendukung' },
 ]
diff --git a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue b/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue
index 701f7dca..cc5d182f 100644
--- a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/edit.vue
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <ContentOutpatientEncounterEdit />
+      <ContentControlLetterEdit />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue b/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue
index 1864cf2c..612315ad 100644
--- a/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/control-letter/[control_letter_id]/index.vue
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <ContentOutpatientEncounterDetail :patient-id="Number(route.params.id)" />
+      <ContentControlLetterDetail :patient-id="Number(route.params.id)" />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue b/app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue
index 2da7d15e..1070a29f 100644
--- a/app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue
+++ b/app/pages/(features)/rehab/encounter/[id]/control-letter/add.vue
@@ -35,7 +35,7 @@ const callbackUrl = route.query['return-path'] as string | undefined
 <template>
   <div>
     <div v-if="canRead">
-      <ContentOutpatientEncounterAdd :callback-url="callbackUrl" />
+      <ContentControlLetterAdd :callback-url="callbackUrl" />
     </div>
     <Error v-else :status-code="403" />
   </div>