From 44c56a936fe1514860b9767017083679116b2dc7 Mon Sep 17 00:00:00 2001 From: avicenan Date: Sun, 22 Feb 2026 23:03:38 +0700 Subject: [PATCH] feat: add laboratory orders entity --- .../emr/emr_laboratory_order_item_results.ts | 16 ++++++++++++++++ src/entity/emr/emr_laboratory_orders.ts | 13 +++++++++++++ src/enum/laboratoryOrderStatus.ts | 6 ++++++ 3 files changed, 35 insertions(+) create mode 100644 src/enum/laboratoryOrderStatus.ts diff --git a/src/entity/emr/emr_laboratory_order_item_results.ts b/src/entity/emr/emr_laboratory_order_item_results.ts index c0f613f..c698483 100644 --- a/src/entity/emr/emr_laboratory_order_item_results.ts +++ b/src/entity/emr/emr_laboratory_order_item_results.ts @@ -31,6 +31,22 @@ export class EmrLaboratoryOrderItemResult { @JoinColumn() examination_detail: ExaminationDetail; + /** Denormalized: examination type name from examination_type.name */ + @Column({ type: "text", nullable: true }) + examination_type: string; + + /** Denormalized: examination detail name from examination_detail.name */ + @Column({ type: "text", nullable: true }) + examination_detail_name: string; + + /** Denormalized: measurement unit from measurement_unit.unit */ + @Column({ nullable: true, length: 256 }) + measurement_unit: string; + + /** Denormalized: reference range as flat string from reference_range */ + @Column({ type: "text", nullable: true }) + reference_range: string; + /** The actual examination result value that can be filled */ @Column({ type: "text", nullable: true }) examination_result: string; diff --git a/src/entity/emr/emr_laboratory_orders.ts b/src/entity/emr/emr_laboratory_orders.ts index 431a133..90dc321 100644 --- a/src/entity/emr/emr_laboratory_orders.ts +++ b/src/entity/emr/emr_laboratory_orders.ts @@ -15,6 +15,7 @@ import { Room } from "../room"; import { User } from "../users"; import { Department } from "../department"; import { EmrLaboratoryOrderItem } from "./emr_laboratory_order_items"; +import { LaboratoryOrderStatus } from "../../enum/laboratoryOrderStatus"; /** * Laboratory orders entity. @@ -42,6 +43,10 @@ export class EmrLaboratoryOrder { @JoinColumn() referring_room: Room | null; + @ManyToOne(() => Room, { onDelete: "NO ACTION", nullable: true }) + @JoinColumn() + order_room: Room | null; + @ManyToOne(() => User, { onDelete: "NO ACTION", nullable: true }) @JoinColumn() referring_doctor: User | null; @@ -50,6 +55,14 @@ export class EmrLaboratoryOrder { @JoinColumn() department: Department | null; + @Column({ + type: "enum", + enum: LaboratoryOrderStatus, + nullable: false, + default: LaboratoryOrderStatus.PENDING, + }) + status: LaboratoryOrderStatus; + @OneToMany(() => EmrLaboratoryOrderItem, (item) => item.laboratory_order, { cascade: true }) order_items: EmrLaboratoryOrderItem[]; diff --git a/src/enum/laboratoryOrderStatus.ts b/src/enum/laboratoryOrderStatus.ts new file mode 100644 index 0000000..eff7bfe --- /dev/null +++ b/src/enum/laboratoryOrderStatus.ts @@ -0,0 +1,6 @@ +export enum LaboratoryOrderStatus { + PENDING = "pending", + VERIFIED = "verified", + COMPLETED = "completed", + CANCELED = "canceled", +}