feat/things-munaja: fix enc status

app/components/app/encounter/check-in-entry.vue

@@ -10,12 +10,13 @@ import ComboBox from '~/components/pub/my-ui/combobox/combobox.vue'
 import * as DE from '~/components/pub/my-ui/doc-entry'
 import type { CheckInFormData } from '~/schemas/encounter.schema'
 import type { Encounter } from '~/models/encounter'
+import { now } from '@internationalized/date';
 
 interface Props {
   schema: z.ZodSchema<any>
   values: any
   doctors: { value: string; label: string }[]
-  employees: { value: string; label: string }[]
+  // employees: { value: string; label: string }[]
   encounter: Encounter
   isLoading?: boolean
   isReadonly?: boolean
@@ -36,18 +37,23 @@ const { defineField, errors, meta } = useForm({
   } as Partial<CheckInFormData>,
 })
 
-const [responsible_doctor_id, responsible_doctor_idAttrs] = defineField('responsible_doctor_id')
-const [adm_employee_id, adm_employee_idAttrs] = defineField('discharge_method_code')
+const [responsible_doctor_code, responsible_doctor_codeAttrs] = defineField('responsible_doctor_code')
+// const [adm_employee_id, adm_employee_idAttrs] = defineField('discharge_method_code')
 const [registeredAt, registeredAtAttrs] = defineField('registeredAt')
 
 function submitForm() {
   const formData: CheckInFormData = {
-    responsible_doctor_id: responsible_doctor_id.value,
-    adm_employee_id: adm_employee_id.value,
-    // registeredAt: registeredAt.value || '',
+    responsible_doctor_code: responsible_doctor_code.value,
+    // adm_employee_id: adm_employee_id.value,
+    registeredAt: registeredAt.value || '',
   }
   emit('submit', formData)
 }
+
+function setTime() {
+  const today = new Date()
+  registeredAt.value = today.toISOString().substring(0, 10) + ' ' + today.toLocaleTimeString('id-ID').substring(0, 5).replace('.', ':');
+}
 </script>
 
 <template>
@@ -57,8 +63,8 @@ function submitForm() {
       <DE.Field>
         <ComboBox
           id="doctor"
-          v-model="responsible_doctor_id"
-          v-bind="responsible_doctor_idAttrs"
+          v-model="responsible_doctor_code"
+          v-bind="responsible_doctor_codeAttrs"
           :items="doctors"
           :disabled="isLoading || isReadonly"
           placeholder="Pilih Dokter DPJP"
@@ -67,7 +73,7 @@ function submitForm() {
         />
       </DE.Field>
     </DE.Cell>
-    <DE.Cell>
+    <!-- <DE.Cell>
       <DE.Label>PJ Berkas</DE.Label>
       <DE.Field>
         <ComboBox
@@ -81,7 +87,7 @@ function submitForm() {
           empty-message="Petugas tidak ditemukan"
         />
       </DE.Field>
-    </DE.Cell>
+    </DE.Cell> -->
     <DE.Cell>
       <DE.Label>Waktu Masuk</DE.Label>
       <DE.Field>
@@ -89,7 +95,8 @@ function submitForm() {
             id="name"
             v-model="registeredAt"
             v-bind="registeredAtAttrs"
-            :disabled="isLoading || isReadonly"
+            @click="setTime"
+            readonly
           />
       </DE.Field>
     </DE.Cell>
@@ -104,4 +111,4 @@ function submitForm() {
 
 <style>
 
-</style>
+</style>

app/components/app/encounter/check-in-view.vue

@@ -7,43 +7,48 @@ import type { Encounter } from '~/models/encounter'
 
 interface Props {
   encounter: Encounter
+  canUpdate?: boolean
+  isLoading?: boolean
 }
 const props = defineProps<Props>()
-const doctor = ref('-belum dipilih-')
+const doctor = computed(() => {
+  return props.encounter.responsible_doctor?.employee?.person?.name ?? '-belum dipilih-'
+})
 const adm = ref('-belum dipilih-')
 
 const emit = defineEmits<{
   edit: []
 }>()
-
-watch(props.encounter, () => {
-  doctor.value = props.encounter.responsible_doctor?.employee?.person?.name ?? props.encounter.appointment_doctor?.employee?.person?.name ?? '-belum dipilih-'
-  adm.value = props.encounter.adm_employee?.person?.name ?? '-belum dipilih-'
-})
 </script>
 
 <template>
   <DE.Block :cell-flex="false">
+    <DE.Cell>
+      <DE.Label class="font-semibold">Waktu Masuk</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter?.registeredAt?.substring(0, 15).replace('T', ' ') || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label class="font-semibold">PJ Berkas</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter.adm_employee?.person?.name || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
+    <DE.Cell>
+      <DE.Label class="font-semibold">Perawat</DE.Label>
+      <DE.Field>
+        <div class="py-2 border-b border-b-slate-300">{{ encounter.responsible_nurse?.employee?.person?.name || '-' }}</div>
+      </DE.Field>
+    </DE.Cell>
     <DE.Cell>
       <DE.Label class="font-semibold">Dokter</DE.Label>
       <DE.Field>
         <div class="py-2 border-b border-b-slate-300">{{ doctor }}</div>
       </DE.Field>
     </DE.Cell>
-    <DE.Cell>
-      <DE.Label class="font-semibold">PJ Berkas</DE.Label>
-      <DE.Field>
-        <div class="py-2 border-b border-b-slate-300">{{ adm }}</div>
-      </DE.Field>
-    </DE.Cell>
-    <DE.Cell>
-      <DE.Label class="font-semibold">Waktu Masuk</DE.Label>
-      <DE.Field>
-        <div class="py-2 border-b border-b-slate-300">{{ encounter?.registeredAt || '-' }}</div>
-      </DE.Field>
-    </DE.Cell>
   </DE.Block>
-  <div class="text-center">
+  <div v-if="canUpdate" class="text-center">
     <Button @click="() => emit('edit')">
       <LucidePen />
       Edit
@@ -53,4 +58,4 @@ watch(props.encounter, () => {
 
 <style>
 
-</style>
+</style>

app/components/app/encounter/check-out-view.vue

@@ -12,8 +12,7 @@ import type { Encounter } from '~/models/encounter';
 
 interface Props {
   encounter: Encounter
-  isLoading?: boolean
-  isReadonly?: boolean
+  canUpdate?: boolean
 }
 const props = defineProps<Props>()
 
@@ -73,7 +72,7 @@ const emit = defineEmits<{
       </DE.Field>
     </DE.Cell>
   </DE.Block>
-  <div class="text-center [&>*]:mx-1">
+  <div v-if="canUpdate" class="text-center [&>*]:mx-1">
     <Button @click="() => emit('edit')">
       <LucidePen />
       Edit
@@ -87,4 +86,4 @@ const emit = defineEmits<{
 
 <style>
 
-</style>
+</style>

app/components/app/prescription/flat-list.vue

@@ -31,12 +31,6 @@ function navClick(type: 'cancel' | 'edit' | 'submit', data: Prescription): void
 <template>
   <div v-if="data.length == 0" class="p-10 text-center">
     <div class="mb-4 xl:mb-5">Belum Ada Data</div>
-    <div>
-      <Button>
-        <Icon name="i-lucide-plus" class="me-2 align-middle" />
-        Tambah Order
-      </Button>
-    </div>
   </div>
   <Table.Table>
     <Table.TableHeader>

app/components/app/prescription/grouped-list.vue

@@ -32,12 +32,6 @@ function navClick(type: 'cancel' | 'edit' | 'submit', data: Prescription): void
 <template>
   <div v-if="data.length == 0" class="p-10 text-center">
     <div class="mb-4 xl:mb-5">Belum Ada Data</div>
-    <div>
-      <Button>
-        <Icon name="i-lucide-plus" class="me-2 align-middle" />
-        Tambah Order
-      </Button>
-    </div>
   </div>
   <template v-for="item, idx in data">
     <div :class="'text-sm 2xl:text-base font-semibold ' + (item.status_code == 'new' ? 'mb-2' : 'mb-2')">

app/components/content/encounter/process.vue

@@ -43,6 +43,10 @@ import EncounterHistoryButtonMenu from '~/components/app/encounter/quick-shortcu
 const props = defineProps<{
   classCode: EncounterProps['classCode']
   subClassCode?: EncounterProps['subClassCode']
+  canCreate?: boolean
+  canRead?: boolean
+  canUpdate?: boolean
+  canDelete?: boolean
 }>()
 
 // Common preparations
@@ -198,6 +202,10 @@ async function getData() {
       :data="menus"
       :initial-active-menu="activeMenu"
       @change-menu="activeMenu = $event"
+      :can-create="canCreate"
+      :can-read="canRead"
+      :can-update="canUpdate"
+      :can-delete="canDelete"
     />
   </div>
 </template>

app/components/content/encounter/status.vue

@@ -5,6 +5,7 @@ import { getValueLabelList as getEmployeeValueLabelList } from '~/services/emplo
 import { getValueLabelList as getUnitValueLabelList } from '~/services/unit.service'
 import type { CheckInFormData, CheckOutFormData } from '~/schemas/encounter.schema'
 import { CheckInSchema, CheckOutSchema } from '~/schemas/encounter.schema'
+import { getEncounterData } from '~/handlers/encounter-process.handler'
 
 //
 import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
@@ -18,10 +19,12 @@ import { checkIn } from '~/services/encounter.service'
 //
 const props = defineProps<{
   encounter: Encounter
+  canUpdate?: boolean
 }>()
 
 // doctors
-const doctors = await getDoctorValueLabelList({'includes': 'employee,employee-person'})
+const localEncounter = ref<Encounter>(props.encounter)
+const doctors = await getDoctorValueLabelList({'includes': 'employee,employee-person'}, true)
 const employees = await getEmployeeValueLabelList({'includes': 'person', 'position-code': 'reg'})
 const units = await getUnitValueLabelList()
 
@@ -32,7 +35,7 @@ const checkInValues = ref<any>({
   // registeredAt: '',
 })
 const checkInIsLoading = ref(false)
-const checkInIsReadonly = ref(false)
+const checkInIsReadonly = ref(props.canUpdate )
 const checkInDialogOpen = ref(false)
 
 // check out
@@ -49,8 +52,15 @@ function editCheckIn() {
   checkInDialogOpen.value = true
 }
 
-function submitCheckIn(values: CheckInFormData) {
-  checkIn(props.encounter.id, values)
+async function submitCheckIn(values: CheckInFormData) {
+  const res = await checkIn(props.encounter.id, values)
+  if (res.success) {
+    checkInDialogOpen.value = false
+    const resEnc = await getEncounterData(props.encounter.id)
+    if (resEnc.success) {
+      localEncounter.value = resEnc.body.data
+    }
+  }
 }
 
 function editCheckOut() {
@@ -67,9 +77,8 @@ function submitCheckOut(values: CheckOutFormData) {
     <div class="border-r lg:pe-4 xl:pe-5 mb-10">
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Masuk</div>
       <CheckInView
-        :encounter="encounter"
-        :is-loading="checkInIsLoading"
-        :is-readonly="checkInIsReadonly"
+        :encounter="localEncounter"
+        :can-update="canUpdate"
         @edit="editCheckIn"
       />
     </div>
@@ -77,9 +86,8 @@ function submitCheckOut(values: CheckOutFormData) {
       <Separator class="lg:hidden my-4 xl:my-5" />
       <div class="mb-4 xl:mb-5 text-base text-center font-semibold">Informasi Keluar</div>
       <CheckOutView
-        :encounter="encounter"
-        :is-loading="checkOutIsLoading"
-        :is-readonly="checkOutIsReadonly"
+        :encounter="localEncounter"
+        :can-update="canUpdate"
         @edit="editCheckOut"
       />
     </div>
@@ -122,4 +130,4 @@ function submitCheckOut(values: CheckOutFormData) {
       @cancel="checkInDialogOpen = false"
     />
   </Dialog>
-</template>
+</template>

app/components/pub/my-ui/menus/submenu.vue

@@ -4,6 +4,10 @@ import { type EncounterItem } from "~/handlers/encounter-init.handler";
 const props = defineProps<{
   initialActiveMenu: string
   data: EncounterItem[]
+  canCreate?: boolean
+  canRead?: boolean
+  canUpdate?: boolean
+  canDelete?: boolean
 }>()
 
 const activeMenu = ref(props.initialActiveMenu)
@@ -38,7 +42,12 @@ function changeMenu(value: string) {
         class="flex-1 rounded-md border bg-white p-4 shadow-sm dark:bg-neutral-950">
         <component
           :is="data.find((m) => m.id === activeMenu)?.component"
-          v-bind="data.find((m) => m.id === activeMenu)?.props" />
+          v-bind="data.find((m) => m.id === activeMenu)?.props"
+          :can-create="canCreate"
+          :can-read="canRead"
+          :can-update="canUpdate"
+          :can-delete="canDelete"
+        />
       </div>
     </div>
   </div>

app/const/page-permission/ambulatory.ts

@@ -39,14 +39,134 @@ export const permissions: Record<string, Record<string, Permission[]>> = {
     'emp|reg': ['C', 'R', 'U', 'D'],
   },
   '/ambulatory/encounter/[id]/process': {
-    'emp|doc': ['R', 'U'],
+    'emp|doc': ['R'],
     'emp|nur': ['R', 'U'],
-    'emp|thr': ['R', 'U'],
-    'emp|miw': ['R', 'U'],
-    'emp|nut': ['R', 'U'],
-    'emp|pha': ['R', 'U'],
-    'emp|lab': ['R', 'U'],
-    'emp|rad': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=status': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=early-medical-assessment': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=fkr': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=education-assessment': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=general-consent': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=patient-amb-note': {
+    'emp|doc': ['R'],
+    'emp|nur': ['R', 'U'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=prescription': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=device-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=radiology-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=cp-lab-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=micro-lab-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
+  },
+  '/ambulatory/encounter/[id]/process?menu=pa-lab-order': {
+    'emp|doc': ['R', 'U'],
+    'emp|nur': ['R'],
+    'emp|thr': ['R'],
+    'emp|miw': ['R'],
+    'emp|nut': ['R'],
+    'emp|pha': ['R'],
+    'emp|lab': ['R'],
+    'emp|rad': ['R'],
   },
   '/ambulatory/consulation': {
     'emp|doc': ['R'],

app/handlers/encounter-init.handler.ts

@@ -502,9 +502,12 @@ export function mapResponseToEncounter(result: any): any {
       ? result.visitDate
       : result.registeredAt || result.patient?.registeredAt || null,
     adm_employee_id: result.adm_employee_id || 0,
-    appointment_doctor_id: result.appointment_doctor_id || null,
-    responsible_doctor_id: result.responsible_doctor_id || null,
+    adm_employee: result.adm_employee || null,
+    responsible_nurse_code: result.responsible_nurse_code || null,
+    responsible_nurse: result.responsible_nurse || null,
+    appointment_doctor_code: result.appointment_doctor_code || null,
     appointment_doctor: result.appointment_doctor || null,
+    responsible_doctor_code: result.responsible_doctor_id || null,
     responsible_doctor: result.responsible_doctor || null,
     refSource_name: result.refSource_name || null,
     appointment_id: result.appointment_id || null,

app/handlers/encounter-process.handler.ts

@@ -9,7 +9,11 @@ export async function getEncounterData(id: string | number) {
   try {
     const dataRes = await getDetail(id, {
       includes:
-        'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person,Responsible_Doctor,Responsible_Doctor-employee,Responsible_Doctor-employee-person',
+        'patient,patient-person,patient-person-addresses,unit,' +
+        'Adm_Employee,Adm_Employee,Adm_Employee-Person,' +
+        'Responsible_Nurse,Responsible_Nurse-Employee,Responsible_Nurse-Employee-Person,' +
+        'Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person,' +
+        'Responsible_Doctor,Responsible_Doctor-employee,Responsible_Doctor-employee-person',
     })
     const dataResBody = dataRes.body ?? null
     const result = dataResBody?.data ?? null
@@ -29,4 +33,4 @@ export async function getEncounterData(id: string | number) {
     data = null
   }
   return data
-}
+}

app/models/encounter.ts

@@ -52,7 +52,7 @@ export function genEncounter(): Encounter {
         patient: genPatient(),
         registeredAt: '',
         class_code: '',
-        unit_code: 0,
+        unit_code: '',
         unit: genUnit(),
         visitDate: '',
         adm_employee_id: 0,

app/models/nurse.ts

@@ -1,7 +1,9 @@
 import { type Base, genBase } from "./_base"
+import type { Employee } from "./employee"
 
 export interface Nurse extends Base {
   employee_id: number
+  employee?: Employee
   ihs_number?: string
   unit_id: number
   infra_id: number

app/pages/(features)/ambulatory/encounter/[id]/process.vue

@@ -12,7 +12,7 @@ import Error from '~/components/pub/my-ui/error/error.vue'
 // Apps
 import Content from '~/components/content/encounter/process.vue'
 
-const { getRouteTitle, getPageAccess } = usePageChecker()
+const { getRouteTitle, getPageAccess, hasCreateAccess, hasReadAccess, hasUpdateAccess, hasDeleteAccess } = usePageChecker()
 
 definePageMeta({
   middleware: ['rbac'],
@@ -28,16 +28,32 @@ useHead({
 })
 
 // Preps role checking
-const roleAccess: Record<string, Permission[]> = permissions['/ambulatory/encounter/[id]/process'] || {}
-const hasAccess = getPageAccess(roleAccess, 'read')
+const route = useRoute()
+const menu = computed(() => route.query.menu as string | undefined)
+const accessKey = computed(() => `/ambulatory/encounter/[id]/process` + (menu.value ? `?menu=${menu.value}` : ''))
+const roleAccess: Record<string, Permission[]> = permissions[accessKey.value] || {}
+const hasAccess = getPageAccess(roleAccess, 'read') || true
+const canCreate = hasCreateAccess(roleAccess)
+const canRead = hasReadAccess(roleAccess)
+const canUpdate = hasUpdateAccess(roleAccess)
+const canDelete = hasDeleteAccess(roleAccess)
 </script>
 
 <template>
+  <!--
+  {{ accessKey }}
+  {{ roleAccess }}
+  {{ hasAccess }}
+  {{ canUpdate }}
+   -->
   <div v-if="hasAccess">
-    <Content class-code="ambulatory" />
+    <Content
+      class-code="ambulatory"
+      :can-create="canCreate"
+      :can-read="canRead"
+      :can-update="canUpdate"
+      :can-delete="canDelete"
+    />
   </div>
-  <Error
-    v-else
-    :status-code="403"
-  />
+  <Error v-else :status-code="403" />
 </template>

app/schemas/encounter.schema.ts

@@ -4,8 +4,9 @@ import { InternalReferenceSchema } from './internal-reference.schema'
 // Check In
 const CheckInSchema = z.object({
   // registeredAt: z.string({ required_error: 'Tanggal masuk harus diisi' }),
-  responsible_doctor_id: z.number({ required_error: 'Dokter harus diisi' }).gt(0, 'Dokter harus diisi'),
-  adm_employee_id: z.number({ required_error: 'PJA harus diisi' }).gt(0, 'PJA harus diisi'),
+  responsible_doctor_code: z.string({ required_error: 'Dokter harus diisi' }),
+  // adm_employee_id: z.number({ required_error: 'PJA harus diisi' }).gt(0, 'PJA harus diisi'),
+  registeredAt: z.string({ required_error: 'waktu harus diisi' }),
 })
 type CheckInFormData = z.infer<typeof CheckInSchema>