diff --git a/app/components/content/encounter/process.vue b/app/components/content/encounter/process.vue
index e712b04d..02fc7495 100644
--- a/app/components/content/encounter/process.vue
+++ b/app/components/content/encounter/process.vue
@@ -79,8 +79,9 @@ const tabs: TabItem[] = [
   { value: 'consent', label: 'General Consent', component: GeneralConsentList, props: { encounter: data } },
   { value: 'prescription', label: 'Order Obat', component: Prescription, props: { encounter_id: data.value.id } },
   { value: 'device-order', label: 'Order Alkes', component: DeviceOrder, props: { encounter_id: data.value.id } },
-  { value: 'mcu-radiology', label: 'Order Radiologi', component: Radiology, props: { encounter_id: data.value.id } },
-  { value: 'mcu-lab-cp', label: 'Order Lab PK', component: CpLabOrder, props: { encounter_id: data.value.id } },
+  { value: 'device', label: 'Order Alkes' },
+  { value: 'mcu-radiology', label: 'Order Radiologi', component: Radiology, props: { encounter_id: data.id } },
+  { value: 'mcu-lab-cp', label: 'Order Lab PK', component: CpLabOrder, props: { encounter_id: data.id } },
   { value: 'mcu-lab-micro', label: 'Order Lab Mikro' },
   { value: 'mcu-lab-pa', label: 'Order Lab PA' },
   { value: 'medical-action', label: 'Order Ruang Tindakan' },
diff --git a/app/components/content/soapi/form.vue b/app/components/content/soapi/form.vue
index 881a2931..21ade93a 100644
--- a/app/components/content/soapi/form.vue
+++ b/app/components/content/soapi/form.vue
@@ -46,6 +46,7 @@ const isLoading = reactive<DataTableLoader>({
 })
 
 async function getDiagnoses() {
+  isLoading.isTableLoading = true
   const resp = await xfetch(`/api/v1/soapi/${recordId}`)
   if (resp.success) {
     diagnoses.value = (resp.body as Record<string, any>).data
diff --git a/app/components/content/soapi/list.vue b/app/components/content/soapi/list.vue
index 10f4ffdc..bc2a39d0 100644
--- a/app/components/content/soapi/list.vue
+++ b/app/components/content/soapi/list.vue
@@ -103,7 +103,7 @@ watch(
   (val) => {
     if (val) {
       if (val === 'early-medical-assessment') {
-        typeCode.value = 'early-medic'
+        typeCode.value = 'early'
       } else if (val === 'rehab-medical-assessment') {
         typeCode.value = 'early-rehab'
       } else if (val === 'function-assessment') {