Squashed commit of the following:

commit 82e33c6dbf Merge: f96cbdb eba740a Author: Munawwirul Jamal <57973347+munaja@users.noreply.github.com> Date: Thu Dec 4 13:21:37 2025 +0700 Merge pull request #209 from dikstub-rssa/feat/move-kai-ui-to-sidebar-195 Feat/move kai UI to sidebar 195 commit f96cbdb173 Merge: 5de0057 62556a5 Author: Munawwirul Jamal <57973347+munaja@users.noreply.github.com> Date: Thu Dec 4 12:07:25 2025 +0700 Merge pull request #210 from dikstub-rssa/feat/procedure-room-order Feat/procedure room order commit 62556a5c7d Merge: 93a294d 5de0057 Author: Munawwirul Jamal <57973347+munaja@users.noreply.github.com> Date: Thu Dec 4 12:07:18 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commit 5de0057278 Merge: 71ca7f9 782034c Author: Andsky <andrianovsky95@gmail.com> Date: Thu Dec 4 11:56:31 2025 +0700 Merge pull request #211 from dikstub-rssa/feat/micro-lab-order-50 Feat/micro lab order 50 commit 93a294d8d0 Merge: 6c26367 26365bb Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 11:18:49 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commit 26365bbd2e Merge: b6b56d1 e7cab6c Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 11:18:33 2025 +0700 Merge branch 'dev' of github.com:dikstub-rssa/simrs-fe into dev commit 6c26367c1d Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 10:51:40 2025 +0700 feat/procedure-room-order: added item commit a0dfd214e5 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 10:25:50 2025 +0700 feat/procedure-room-order: finishing commit acb573e279 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 10:25:35 2025 +0700 feat/procedure-room-order: adjust procedure-room-order commit 9adb77d10b Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 10:24:52 2025 +0700 feat/procedure-room-order: adjust material-package commit 52454a019e Merge: 0a0fb73 b6b56d1 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Thu Dec 4 10:23:14 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commit b6b56d186d Author: Munawwirul Jamal <munawwirul.jamal@gmail.com> Date: Thu Dec 4 10:17:16 2025 +0700 dev: hotfix, cleaning some pubs commit 0a0fb73483 Author: Munawwirul Jamal <munawwirul.jamal@gmail.com> Date: Wed Dec 3 14:33:13 2025 +0700 feat/procedure-room-order: flow for procedure room commit 7b4b4eecf9 Merge: 9f72e1d b172125 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Dec 3 10:18:15 2025 +0700 Merge branch 'feat/mcu-order' into feat/procedure-room-order commit 782034c2b1 Merge: bae0a22 b80ee5a Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Dec 3 10:16:45 2025 +0700 Merge branch 'dev' into feat/micro-lab-order-50 commit 9f72e1df47 Merge: fa0ae98 b80ee5a Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Dec 3 10:02:57 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commit fa0ae9866e Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Dec 3 09:44:33 2025 +0700 feat/procedure-room-order: wip #3 commit ce93f996d9 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Dec 3 09:43:36 2025 +0700 feat/procedure-room-order: wip #2 + procedure-room commit 4444e87cb3 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Dec 3 09:42:31 2025 +0700 feat/procedure-room-order: wip #1 + material-package + material-package-item commit b172125d99 Merge: b2d3c14 9b7a719 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Mon Dec 1 20:41:58 2025 +0700 Merge branch 'feat/page-cleaning' into feat/mcu-order commit bae0a222b8 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Mon Dec 1 01:51:04 2025 +0700 feat/micro-lab-order-50: adjust for antibiotic commit 1ee0f39e7d Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Mon Dec 1 01:50:39 2025 +0700 feat/micro-lab-order-50: added antibiotic commit 95e27a8b6f Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sun Nov 30 13:00:04 2025 +0700 feat/micro-lab-order-50: wip commit a002ef6c6e Merge: fb2f01b b2d3c14 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sun Nov 30 12:50:31 2025 +0700 Merge branch 'feat/mcu-order' into feat/micro-lab-order-50 commit b2d3c14ddc Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sun Nov 30 12:48:11 2025 +0700 feat/mcu-order: adjustment commit fb2f01bd36 Merge: 9a481fe 5c92f8b Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sun Nov 30 12:43:11 2025 +0700 Merge branch 'feat/mcu-order' into feat/micro-lab-order-50 commit 5c92f8b946 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sun Nov 30 12:30:19 2025 +0700 feat/mcu-order: added the components commit 9a481fec14 Merge: 4251239 78fc289 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Fri Nov 28 21:18:10 2025 +0700 Merge branch 'dev' into feat/micro-lab-order-50 commit 4251239f7c Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Fri Nov 28 21:17:18 2025 +0700 feat/micro-lab-order-50: wip commit cf5789549e Author: Munawwirul Jamal <munawwirul.jamal@gmail.com> Date: Sun Nov 23 15:56:31 2025 +0700 feat/mcu: improved wip commit a40eac35f8 Merge: 3211972 baf6ab1 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Wed Nov 19 22:23:18 2025 +0700 Merge branch 'dev' into feat/radiology-order-54 commit 3211972a84 Merge: e3fc1e4 ccabe01 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sat Nov 15 20:15:07 2025 +0700 Merge branch 'dev' into feat/radiology-order-54 commit e3fc1e4ab9 Author: Andrian Roshandy <andrianovsky95@gmail.com> Date: Sat Nov 15 20:14:38 2025 +0700 feat/radiology-order-54: adjust wip
2025-12-04 13:57:03 +07:00
parent eba740a893
commit 89b6163da8
72 changed files with 2099 additions and 59 deletions
@@ -0,0 +1,16 @@
+import { type Base, genBase } from "./_base"
+import type { AntibioticSrc } from "./antibiotic-src"
+
+export interface AntibioticInUse extends Base {
+  mcuOrder_id: number
+  antibioticSrc_code: string
+  antibioticSrc: AntibioticSrc
+}
+
+export function genDevice(): Pick<AntibioticInUse, 'mcuOrder_id' | 'antibioticSrc_code'> {
+  return {
+    ...genBase(),
+    mcuOrder_id: 0,
+    antibioticSrc_code: ''
+  }
+}
@@ -0,0 +1,14 @@
+import { type Base, genBase } from "./_base"
+
+export interface AntibioticSrcCategory extends Base {
+  code: string
+  name: string
+}
+
+export function genDevice(): AntibioticSrcCategory {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+  }
+}
@@ -0,0 +1,16 @@
+import { type Base, genBase } from "./_base"
+
+export interface AntibioticSrc extends Base {
+  code: string
+  name: string
+  antibioticSrcCategory_code: string
+}
+
+export function genDevice(): AntibioticSrc {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+    antibioticSrcCategory_code: ''
+  }
+}
@@ -1,10 +1,27 @@
-export interface Infra {
-  id?: number
+import { type Base, genBase } from "./_base";
+import { genProcedureRoom, type ProcedureRoom } from "./procedure-room";
+
+export interface Infra extends Base {
  code: string
  name: string
  infraGroup_code: string
  parent_id?: number | string | null
+  unit_id?: number | string | null
  specialist_id?: number | string | null
  subspecialist_id?: number | string | null
-  unit_id?: number | string | null
+  procedureRoom?: ProcedureRoom
+}
+
+export function genInfra(): Infra {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+    infraGroup_code: '',
+    parent_id: null,
+    unit_id: null,
+    specialist_id: null,
+    subspecialist_id: null,
+    procedureRoom: genProcedureRoom(),
+  }
 }
@@ -0,0 +1,14 @@
+import { type Base, genBase } from "./_base"
+
+export interface MaterialPackageItem extends Base {
+  materialPackage_code: string
+  material_code: string
+}
+
+export function genMaterialPackage(): MaterialPackageItem {
+  return {
+    ...genBase(),
+    materialPackage_code: '',
+    material_code: '',
+  }
+}
@@ -0,0 +1,14 @@
+import { type Base, genBase } from "./_base"
+
+export interface MaterialPackage extends Base {
+  code: string
+  name: string
+}
+
+export function genMaterialPackage(): MaterialPackage {
+  return {
+    ...genBase(),
+    code: '',
+    name: '',
+  }
+}
@@ -2,16 +2,33 @@ import { type Base, genBase } from "./_base"

 export interface McuOrderItem extends Base {
  mcuOrder_id: number
-  mcuSrc_id: number
+  mcuSrc_code: string
+  note?: string
  examinationDate?: string
  result?: string
  status_code?: string
 }

+export interface CreateDto {
+  mcuOrder_id: number
+  mcuSrc_code: string
+  note?: string
+}
+
+export interface ReadList {
+  'mcu-order-id'?: number
+  'mcu-src-code'?: string
+  includes?: string
+}
+
+export interface UpdateDto extends CreateDto {
+  id: number
+}
+
 export function genMcuOrderItem(): McuOrderItem {
  return {
    ...genBase(),
    mcuOrder_id: 0,
-    mcuSrc_id: 0,
+    mcuSrc_code: '',
  }
 }
@@ -1,8 +1,8 @@
 import { type Base, genBase } from "./_base"

 export interface McuOrderSubItem extends Base {
-  mcuSubSrc_id: number
  mcuOrderItem_id: number
+  mcuSubSrc_code: string
  result?: string
  status_code?: string
 }
@@ -10,7 +10,7 @@ export interface McuOrderSubItem extends Base {
 export function genMcuOrderSubItem(): McuOrderSubItem {
  return {
    ...genBase(),
-    mcuSubSrc_id: 0,
    mcuOrderItem_id: 0,
+    mcuSubSrc_code: '',
  }
 }
@@ -1,4 +1,5 @@
 import { type Base, genBase } from "./_base"
+import type { AntibioticInUse } from "./antibiotic-in-use"
 import { type Doctor, genDoctor } from "./doctor"
 import type { McuOrderItem } from "./mcu-order-item"

@@ -13,6 +14,7 @@ export interface McuOrder extends Base {
  temperature?: number
  mcuUrgencyLevel_code?: string
  items: McuOrderItem[]
+  antibioticInUseItems: AntibioticInUse[]
 }

 export function genMcuOrder(): McuOrder {
@@ -23,7 +25,8 @@ export function genMcuOrder(): McuOrder {
    doctor: genDoctor(),
    specimenPickTime: '',
    examinationDate: '',
-    items: []
+    items: [],
+    antibioticInUseItems: [],
  }
 }

@@ -0,0 +1,27 @@
+import { type Base, genBase } from "./_base";
+import { genMaterialPackage, type MaterialPackage } from "./material-package";
+import { genProcedureRoom, type ProcedureRoom } from "./procedure-room";
+
+export interface ProcedureRoomOrderItem extends Base {
+	procedureRoomOrder_id: number
+	procedureRoom_code: string
+	procedureRoom: ProcedureRoom
+}
+
+export interface CreateDto {
+  procedureRoomOrder_id: number
+	procedureRoom_code: string
+}
+
+export interface UpdateDto extends CreateDto {
+  note?: string
+}
+
+export function genProcedureRoomOrderItem(): ProcedureRoomOrderItem {
+  return {
+    ...genBase(),
+    procedureRoomOrder_id: 0,
+    procedureRoom_code: '',
+    procedureRoom: genProcedureRoom(),
+  }
+}
@@ -0,0 +1,23 @@
+import { type Base, genBase } from "./_base";
+import { genMaterialPackage, type MaterialPackage } from "./material-package";
+import { genProcedureRoom, type ProcedureRoom } from "./procedure-room";
+
+export interface ProcedureRoomOrder extends Base {
+	encounter_id: number
+	materialPackage_code?: string
+	materialPackage: MaterialPackage
+  items?: ProcedureRoom[]
+}
+
+export interface CreateDto {
+  encounter_id: number
+}
+
+export function genProcedureRoomOrder(): ProcedureRoomOrder {
+  return {
+    ...genBase(),
+    encounter_id: 0,
+    materialPackage_code: '',
+    materialPackage: genMaterialPackage(),
+  }
+}
@@ -0,0 +1,24 @@
+import { type Base, genBase } from "./_base";
+import type { Infra } from "./infra";
+
+export interface ProcedureRoom extends Base {
+	code: string
+	infra_code: string
+  infra?: Infra
+	type_code: string
+	unit_code: string
+  specialist_code?: string | null
+  subspecialist_code?: string | null
+}
+
+export function genProcedureRoom(): ProcedureRoom {
+  return {
+    ...genBase(),
+    code: '',
+    infra_code: '',
+    type_code: '',
+    unit_code: '',
+    specialist_code: null,
+    subspecialist_code: null,
+  }
+}