Merge branch 'dev' into feat/encounter-status-107

2025-10-25 05:01:45 +07:00
parent 72e8d431d6 3558672f9a
commit eaac4aab85
21 changed files with 1350 additions and 184 deletions
@@ -3,12 +3,11 @@
 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'
-import type { Encounter } from '~/models/encounter'
+
+// Components
+import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
+import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'

 import Status from '~/components/content/encounter/status.vue'
 import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
@@ -29,7 +28,10 @@ const activeTab = computed({
 })

 const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
-const dataRes = await getDetail(id, { includes: 'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person'})
+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