Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into feat/general-consent-145

app/models/consultation.ts

@@ -28,9 +28,10 @@ export interface DeleteDto {
 
 export function genCreateDto(): CreateDto {
   return {
+    date: '',
     encounter_id: 0,
     problem: '',
-    unit_id: 0,
+    dstUnit_id: 0,
   }
 }
 

app/models/control-letter.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 ControlLetter 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 genControlLetter(): ControlLetter {
+  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: ''
+  }
+}

app/models/division-position.ts

@@ -1,11 +1,13 @@
 import { type Base, genBase } from './_base'
-
+import type { Employee } from './employee'
 export interface DivisionPosition extends Base {
   code: string
   name: string
   headStatus?: boolean
   division_id: number
   employee_id?: number
+
+  employee?: Employee | null
 }
 
 export function genDivisionPosition(): DivisionPosition {

app/models/division.ts

@@ -1,10 +1,13 @@
-import { type Base, genBase } from "./_base"
-
+import { type Base, genBase } from './_base'
+import type { DivisionPosition } from './division-position'
 export interface Division extends Base {
   code: string
   name: string
   parent_id?: number | null
   childrens?: Division[] | null
+
+  // preload
+  divisionPosition?: DivisionPosition[] | null
 }
 
 export function genDivision(): Division {

app/models/doctor.ts

@@ -8,10 +8,11 @@ export interface Doctor extends Base {
   employee: Employee
   ihs_number: string
   sip_number: string
-  unit_id?: number
-  specialist_id?: number
+  code?: string
+  unit_icode?: number
+  specialist_icode?: number
   specialist?: Specialist
-  subspecialist_id?: number
+  subspecialist_icode?: number
   subspecialist?: Subspecialist
   bpjs_code?: string
 }
@@ -21,9 +22,9 @@ export interface CreateDto {
   employee_id: number
   ihs_number: string
   sip_number: string
-  unit_id?: number
-  specialist_id?: number
-  subspecialist_id?: number
+  unit_code?: number
+  specialist_code?: number
+  subspecialist_code?: number
   bpjs_code: string
 }
 

app/models/general-consent.ts

@@ -1,19 +1,20 @@
 export interface GeneralConsent {
   id: number
   encounter_id: number
-  date?: string
-  unit_id: number
-  doctor_id?: number
-  problem: string
-  solution?: string
-  repliedAt?: string
+  value: string
+}
+
+export interface ValueCreateDto {
+  relatives: string[]
+  responsible: string
+  informant: string
+  witness1: string
+  witness2: string
 }
 
 export interface CreateDto {
   encounter_id: number
-  date: string
-  problem: string
-  dstUnit_id: number
+  value: string
 }
 
 export interface UpdateDto {

app/models/installation-position.ts

@@ -0,0 +1,23 @@
+import { type Base, genBase } from './_base'
+import type { Employee } from './employee'
+
+export interface InstallationPosition extends Base {
+  installation_id: number
+  code: string
+  name: string
+  headStatus?: boolean
+  employee_id?: number
+
+  employee?: Employee | null
+}
+
+export function genInstallationPosition(): InstallationPosition {
+  return {
+    ...genBase(),
+    installation_id: 0,
+    code: '',
+    name: '',
+    headStatus: false,
+    employee_id: 0,
+  }
+}

app/models/mcu-order.ts

@@ -1,14 +1,18 @@
 import { type Base, genBase } from "./_base"
+import { type Doctor, genDoctor } from "./doctor"
+import type { McuOrderItem } from "./mcu-order-item"
 
 export interface McuOrder extends Base {
   encounter_id: number
   doctor_id: number
+  doctor: Doctor
   status_code?: string
   specimenPickTime: string
   examinationDate: string
   number?: number
   temperature?: number
   mcuUrgencyLevel_code?: string
+  items: McuOrderItem[]
 }
 
 export function genMcuOrder(): McuOrder {
@@ -16,8 +20,10 @@ export function genMcuOrder(): McuOrder {
     ...genBase(),
     encounter_id: 0,
     doctor_id: 0,
+    doctor: genDoctor(),
     specimenPickTime: '',
-    examinationDate: ''
+    examinationDate: '',
+    items: []
   }
 }
 

app/models/prescription.ts

@@ -1,10 +1,10 @@
+import { type Base, genBase } from "./_base";
 import { type Encounter, genEncounter } from "./encounter";
 import { type Doctor, genDoctor } from "./doctor";
 import { type PrescriptionItem } from "./prescription-item";
 import type { SpecialistIntern } from "./specialist-intern";
 
-export interface Prescription {
-  id: number
+export interface Prescription extends Base {
   encounter_id: number
   encounter: Encounter
   doctor_id: number
@@ -44,7 +44,7 @@ export interface DeleteDto {
 
 export function genPresciption(): Prescription {
   return {
-    id: 0,
+    ...genBase(),
     encounter_id: 0,
     encounter: genEncounter(),
     doctor_id: 0,

app/models/specialist-position.ts

@@ -0,0 +1,22 @@
+import { type Base, genBase } from './_base'
+import type { Employee } from './employee'
+
+export interface SpecialistPosition extends Base {
+  specialist_id: number
+  code: string
+  name: string
+  headStatus?: boolean
+  employee_id?: number
+  employee?: Employee | null
+}
+
+export function genSpecialistPosition(): SpecialistPosition {
+  return {
+    ...genBase(),
+    specialist_id: 0,
+    code: '',
+    name: '',
+    headStatus: false,
+    employee_id: 0,
+  }
+}

app/models/specialist.ts

@@ -1,9 +1,12 @@
-import { type Base, genBase } from "./_base"
+import { type Base, genBase } from './_base'
+import type { Unit } from './unit'
+import type { Subspecialist } from "./subspecialist"
 
 export interface Specialist extends Base {
   code: string
   name: string
-  unit_id?: number | string | null
+  unit?: Unit | null
+  subspecialists?: Subspecialist[]
 }
 
 export function genSpecialist(): Specialist {
@@ -11,6 +14,6 @@ export function genSpecialist(): Specialist {
     ...genBase(),
     code: '',
     name: '',
-    unit_id: 0
+    unit_id: 0,
   }
 }

app/models/subspecialist-position.ts

@@ -0,0 +1,25 @@
+import { type Base, genBase } from './_base'
+import type { Employee } from './employee'
+import type { Subspecialist } from './subspecialist'
+
+export interface SubSpecialistPosition extends Base {
+  subspecialist_id: number
+  code: string
+  name: string
+  headStatus?: boolean
+  employee_id?: number
+
+  subspecialist?: Subspecialist | null
+  employee?: Employee | null
+}
+
+export function genSubSpecialistPosition(): SubSpecialistPosition {
+  return {
+    ...genBase(),
+    subspecialist_id: 0,
+    code: '',
+    name: '',
+    headStatus: false,
+    employee_id: 0,
+  }
+}

app/models/subspecialist.ts

@@ -1,9 +1,11 @@
-import { type Base, genBase } from "./_base"
-
+import { type Base, genBase } from './_base'
+import { type Specialist } from './specialist'
 export interface Subspecialist extends Base {
   code: string
   name: string
   specialist_id?: number | string | null
+
+  specialist?: Specialist | null
 }
 
 export function genSubspecialist(): Subspecialist {
@@ -11,6 +13,6 @@ export function genSubspecialist(): Subspecialist {
     ...genBase(),
     code: '',
     name: '',
-    specialist_id: 0
+    specialist_id: 0,
   }
 }

app/models/unit-position.ts

@@ -0,0 +1,23 @@
+import { type Base, genBase } from './_base'
+import type { Employee } from './employee'
+
+export interface UnitPosition extends Base {
+  unit_id: number
+  code: string
+  name: string
+  headStatus?: boolean
+  employee_id?: number
+
+  employee?: Employee | null
+}
+
+export function genUnitPosition(): UnitPosition {
+  return {
+    ...genBase(),
+    unit_id: 0,
+    code: '',
+    name: '',
+    headStatus: false,
+    employee_id: 0,
+  }
+}

app/models/unit.ts

@@ -1,9 +1,11 @@
-import { type Base, genBase } from "./_base"
-
+import { type Base, genBase } from './_base'
+import { type Installation } from '~/models/installation'
 export interface Unit extends Base {
   code: string
   name: string
   installation_id?: number | string | null
+
+  installation?: Installation | null
 }
 
 export function genUnit(): Unit {

app/models/vclaim.ts

@@ -0,0 +1,15 @@
+export interface VclaimSepData {
+  letterDate: string
+  letterNumber: string
+  serviceType: string
+  flow: string
+  medicalRecordNumber: string
+  patientName: string
+  cardNumber: string
+  controlLetterNumber: string
+  controlLetterDate: string
+  clinicDestination: string
+  attendingDoctor: string
+  diagnosis: string
+  careClass: string
+}