fix radiology & lab

src/entity/emr/emr_laboratory_orders.ts

@@ -15,7 +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";
+import { LaboratoryOrderStatus } from "../../types/laboratory_order_status";
 import { EmrRegistration } from "./emr_registration";
 
 /**

src/entity/emr/emr_radiology.ts

@@ -10,7 +10,7 @@ import {
     JoinColumn,
     OneToMany
 } from "typeorm";
-// import { radiologyStatus } from "../../enum/radiologyStatus";
+import { RadiologyOrderStatus } from "../../types/radiology_order_status";
 import { EmrPatient } from "./emr_patient";
 import { User } from "../users";
 import { RadiologyServices } from "./emr_radiology_services";
@@ -46,12 +46,20 @@ export class Radiology {
     @JoinColumn()
     id_registration: EmrRegistration;
 
-    @Column({ nullable: true, type: "text" })
-    status: string;
+    @Column({
+        type: "enum",
+        enum: RadiologyOrderStatus,
+        nullable: false,
+        default: RadiologyOrderStatus.WAITING,
+    })
+    status: RadiologyOrderStatus;
 
     @Column({ nullable: true, length: 128, unique: true })
     queue_number?: string;
 
+    @Column({ type: "date", nullable: true })
+    schedule_date: Date;
+
     @Column({ nullable: true, type: "text" })
     order_number: string;
 

src/enum/laboratoryOrderStatus.ts

@@ -1,7 +0,0 @@
-export enum LaboratoryOrderStatus {
-    WAITING = "waiting",
-    ORDERED = "ordered",
-    VERIFIED = "verified",
-    COMPLETED = "completed",
-    CANCELED = "canceled",
-}

src/schema/emr.ts

@@ -30,3 +30,5 @@ export * from "../types/registration_type";
 export * from "../types/registration_status";
 export * from "../types/pharmacy_order_status";
 export * from "../types/prescription_pharmacy_status";
+export * from "../types/radiology_order_status";
+export * from "../types/laboratory_order_status";

src/types/laboratory_order_status.ts

@@ -0,0 +1,15 @@
+/**
+ * Workflow status untuk order laboratorium.
+ * Waiting: menunggu konfirmasi order pasien
+ * Ordered: order diterima oleh laboratorium
+ * Verified: order diverifikasi oleh laboratorium
+ * Completed: order selesai
+ * Canceled: order dibatalkan
+ */
+export enum LaboratoryOrderStatus {
+    WAITING = "waiting",
+    ORDERED = "ordered",
+    VERIFIED = "verified",
+    COMPLETED = "completed",
+    CANCELED = "canceled",
+}

src/types/radiology_order_status.ts

@@ -0,0 +1,16 @@
+/**
+ * Workflow status untuk order radiologi.
+ * Waiting: menunggu konfirmasi order pasien
+ * Ordered: order diterima oleh radiologi
+ * Verified: order diverifikasi oleh radiologi
+ * Completed: order selesai
+ * Canceled: order dibatalkan
+ */
+export enum RadiologyOrderStatus {
+    WAITING = "waiting",
+    ORDERED = "ordered",
+    VERIFIED = "verified",
+    COMPLETED = "completed",
+    CANCELED = "canceled",
+}
+