Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into feat/integrasi-assessment-medis-114

app/components/content/encounter/list.vue

@@ -50,6 +50,7 @@ const refSearchNav: RefSearchNav = {
 async function getPatientList() {
   isLoading.isTableLoading = true
   const resp = await xfetch('/api/v1/patient')
+  // const resp = await xfetch('/api/v1/encounter?includes=patient,patient-person')
   if (resp.success) {
     data.value = (resp.body as Record<string, any>).data
   }
@@ -100,10 +101,10 @@ provide('table_data_loader', isLoading)
     :ref-search-nav="refSearchNav"
   />
   <Separator class="my-4 xl:my-5" />
+
   <Filter :ref-search-nav="refSearchNav" />
-  <div class="my-4 flex flex-1 flex-col gap-4 md:gap-8">
-    <AppEncounterList :data="data" />
-  </div>
+
+  <AppEncounterList :data="data" />
 
   <Dialog
     v-model:open="isFormEntryDialogOpen"
@@ -113,5 +114,4 @@ provide('table_data_loader', isLoading)
   >
     <AppEncounterFilter />
   </Dialog>
-  <!-- <Pagination :pagination-meta="paginationMeta" @page-change="handlePageChange" /> -->
 </template>

app/components/content/encounter/process.vue

@@ -3,17 +3,16 @@
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-// Components
-import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
-import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
-
 import { getDetail } from '~/services/encounter.service'
 
+// Components
+import type { Encounter } from '~/models/encounter'
+import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
+import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
 import AssesmentFunctionList from '~/components/content/soapi/entry.vue'
 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 type { Encounter } from '~/models/encounter'
 import Status from '~/components/app/encounter/status.vue'
 
 const route = useRoute()
@@ -28,23 +27,15 @@ const activeTab = computed({
 })
 
 const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
-const encounter = ref<Encounter>((await getDetail(id)) as Encounter)
-
-const data = {
-  noRm: 'RM21123',
-  nama: 'Ahmad Sutanto',
-  alamat: 'Jl Jaksa Agung Suprapto No. 12, Jakarta',
-  tanggalKunjungan: '23 April 2024',
-  klinik: 'Bedah',
-  tanggalLahir: '23 April 1990 (25 Tahun)',
-  jenisKelamin: 'Laki-laki',
-  jenisPembayaran: 'JKN',
-  noBilling: '223332',
-  dpjp: 'dr. Syaifullah, Sp.OT(K)',
-}
+const dataRes = await getDetail(id, {
+  includes:
+    'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person',
+})
+const dataResBody = dataRes.body ?? null
+const data = dataResBody?.data ?? null
 
 const tabs: TabItem[] = [
-  { value: 'status', label: 'Status Masuk/Keluar', component: Status },
+  { value: 'status', label: 'Status Masuk/Keluar', component: Status, props: { encounter: data } },
   { value: 'early-medical-assessment', label: 'Pengkajian Awal Medis', component: EarlyMedicalAssesmentList },
   {
     value: 'rehab-medical-assessment',