Merge branch 'main' of https://git.shiblysolution.id/SAUDE-TL/entity

src/entity/emr/emr_internal_consultation.ts

@@ -15,16 +15,16 @@ import { EmrPatient } from "./emr_patient";
 import { User } from "../users";
 import { Room } from "../room";
 import { Diagnosis } from "../diagnosis";
-import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
+import { EmrRegistration } from "./emr_registration";
 
 @Entity("emr_internal_consultation", { schema: "emr" })
 export class EmrInternalConsultation {
     @PrimaryGeneratedColumn("uuid")
     id: string;
 
-    @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
+    @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" })
     @JoinColumn()
-    registration_outpatient: EmrRegistrationOutpatient;
+    registration: EmrRegistration;
 
     @ManyToOne(() => EmrPatient, { onDelete: "CASCADE" })
     @JoinColumn()
@@ -46,6 +46,10 @@ export class EmrInternalConsultation {
     @JoinColumn()
     consulted_room: Room;
 
+    @OneToOne(() => EmrRegistration, { onDelete: "CASCADE" })
+    @JoinColumn()
+    consulted_registration: EmrRegistration;
+
     @ManyToOne(() => Diagnosis, { onDelete: "CASCADE" })
     @JoinColumn()
     diagnosis: Diagnosis;

src/entity/emr/emr_registration_outpatient.ts

@@ -8,13 +8,13 @@ import {
     ManyToOne,
     OneToOne,
     JoinColumn,
-    OneToMany,
 } from "typeorm";
 
 import { EmrRegistration } from "./emr_registration";
 import { Room } from "../room";
 import { User } from "../users";
 import { DoctorSchedule } from "../doctor_schedule";
+import { EmrInternalConsultation } from "./emr_internal_consultation";
 // import { RegistrationOutPatientStatus } from "../../enum/registrationOutPatientStatus";
 
 /**
@@ -61,9 +61,9 @@ export class EmrRegistrationOutpatient {
     @Column({ nullable: true, length: 256 })
     registration_number: string;
 
-    @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "SET NULL", nullable: true })
+    @OneToOne(() => EmrInternalConsultation, { onDelete: "SET NULL", nullable: true })
     @JoinColumn()
-    ref_registration_outpatient: EmrRegistrationOutpatient | null;
+    ref_consultation: EmrInternalConsultation | null;
 
     @Column()
     @CreateDateColumn()