Merge branch 'dev' into feat/consultation-82

app/models/division-position.ts

@@ -1,8 +1,9 @@
-import { type Base, genBase } from "./_base"
+import { type Base, genBase } from './_base'
 
 export interface DivisionPosition extends Base {
   code: string
   name: string
+  headStatus?: boolean
   division_id: number
   employee_id?: number
 }
@@ -12,6 +13,7 @@ export function genDivisionPosition(): DivisionPosition {
     ...genBase(),
     code: '',
     name: '',
+    headStatus: false,
     division_id: 0,
     employee_id: 0,
   }

app/models/encounter.ts

@@ -1,4 +1,5 @@
 import { type Doctor, genDoctor } from "./doctor"
+import { genEmployee, type Employee } from "./employee"
 
 export interface Encounter {
     id: number
@@ -9,6 +10,8 @@ export interface Encounter {
     specialist_id?: number
     subspecialist_id?: number
     visitdate: string
+    adm_employee_id: number
+    adm_employee: Employee
     appointment_doctor_id: number
     appointment_doctor: Doctor
     responsible_doctor_id?: number
@@ -31,9 +34,16 @@ export function genEncounter(): Encounter {
         class_code: '',
         unit_id: 0,
         visitdate: '',
+        adm_employee_id: 0,
+        adm_employee: genEmployee(),
         appointment_doctor_id: 0,
         appointment_doctor: genDoctor(),
         medicalDischargeEducation: '',
         status_code: ''
     }
-}
+}
+
+export interface EncounterCheckInDto {
+    responsible_doctor_id: number
+    responsibleArea_employee_id: number
+}