Merge branch 'dev' into feat/micro-lab-order-50

app/models/consultation.ts

@@ -2,8 +2,8 @@ export interface Consultation {
   id: number
   encounter_id: number
   date?: string
-  unit_id: number
-  doctor_id?: number
+  unit_code: number
+  doctor_code?: number
   problem: string
   solution?: string
   repliedAt?: string
@@ -13,13 +13,13 @@ export interface CreateDto {
   encounter_id: number
   date: string
   problem: string
-  dstUnit_id: number
+  dstUnit_code: string
 }
 
 export interface UpdateDto {
   id: number
   problem: string
-  unit_id: number
+  unit_code: number
 }
 
 export interface DeleteDto {
@@ -31,7 +31,7 @@ export function genCreateDto(): CreateDto {
     date: '',
     encounter_id: 0,
     problem: '',
-    dstUnit_id: 0,
+    dstUnit_code: '',
   }
 }
 
@@ -39,8 +39,8 @@ export function genConsultation(): Consultation {
   return {
     id: 0,
     encounter_id: 0,
-    unit_id: 0,
-    doctor_id: 0,
+    unit_code: 0,
+    doctor_code: 0,
     problem: '',
     solution: '',
     repliedAt: '',

app/models/doctor.ts

@@ -1,5 +1,6 @@
 import { type Base, genBase } from "./_base"
 import { type Employee, genEmployee } from "./employee"
+import type { Unit } from "./unit"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
 
@@ -9,10 +10,11 @@ export interface Doctor extends Base {
   ihs_number: string
   sip_number: string
   code?: string
-  unit_icode?: number
-  specialist_icode?: number
+  unit_code?: string
+  unit?: Unit
+  specialist_code?: string
   specialist?: Specialist
-  subspecialist_icode?: number
+  subspecialist_code?: string
   subspecialist?: Subspecialist
   bpjs_code?: string
 }

app/models/encounter.ts

@@ -3,6 +3,7 @@ import { type Doctor, genDoctor } from "./doctor"
 import { genEmployee, type Employee } from "./employee"
 import type { EncounterDocument } from "./encounter-document"
 import type { InternalReference } from "./internal-reference"
+import type { Nurse } from "./nurse"
 import { type Patient, genPatient } from "./patient"
 import type { Specialist } from "./specialist"
 import type { Subspecialist } from "./subspecialist"
@@ -14,18 +15,20 @@ export interface Encounter {
     patient: Patient
     registeredAt: string
     class_code: string
-    unit_id: number
+    unit_code: string
     unit: Unit
-    specialist_id?: number
+    specialist_code?: string
     specilist?: Specialist
-    subspecialist_id?: number
+    subspecialist_code?: string
     subspecialist?: Subspecialist
     visitDate: string
     adm_employee_id: number
     adm_employee: Employee
-    appointment_doctor_id: number
+    responsible_nurse_code?: string
+    responsible_nurse?: Nurse
+    appointment_doctor_code: string
     appointment_doctor: Doctor
-    responsible_doctor_id?: number
+    responsible_doctor_code?: string
     responsible_doctor?: Doctor
     refSource_name?: string
     appointment_id?: number
@@ -49,12 +52,12 @@ export function genEncounter(): Encounter {
         patient: genPatient(),
         registeredAt: '',
         class_code: '',
-        unit_id: 0,
+        unit_code: 0,
         unit: genUnit(),
         visitDate: '',
         adm_employee_id: 0,
         adm_employee: genEmployee(),
-        appointment_doctor_id: 0,
+        appointment_doctor_code: '',
         appointment_doctor: genDoctor(),
         medicalDischargeEducation: '',
         status_code: '',

app/models/role.ts

@@ -1,5 +1,3 @@
-import type { PAGE_PERMISSIONS } from '~/lib/page-permission'
-
 export interface User {
   id: string
   name: string

app/models/surgery-report.ts

@@ -0,0 +1,37 @@
+import { type Base, genBase } from "./_base"
+import { genDoctor, type Doctor } from "./doctor"
+import { genEncounter, type Encounter } from "./encounter"
+import { genSpecialist, type Specialist } from "./specialist"
+import { genSubspecialist, type Subspecialist } from "./subspecialist"
+import { genUnit, type Unit } from "./unit"
+
+export interface SurgeryReport extends Base {
+  encounter_id: number
+  encounter: Encounter
+  unit_id: number
+  unit: Unit
+  specialist_id: number
+  specialist: Specialist
+  subspecialist_id: number
+  subspecialist: Subspecialist
+  doctor_id: number
+  doctor: Doctor
+  date: ''
+}
+
+export function genSurgeryReport(): SurgeryReport {
+  return {
+    ...genBase(),
+    encounter_id: 0,
+    encounter: genEncounter(),
+    unit_id: 0,
+    unit: genUnit(),
+    specialist_id: 0,
+    specialist: genSpecialist(),
+    subspecialist_id: 0,
+    subspecialist: genSubspecialist(),
+    doctor_id: 0,
+    doctor: genDoctor(),
+    date: ''
+  }
+}