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

src/entity/emr/emr_diet.ts

@@ -5,20 +5,25 @@ import {
     CreateDateColumn,
     UpdateDateColumn,
     DeleteDateColumn,
-    ManyToOne,
     OneToOne,
     JoinColumn,
+    ManyToOne,
 } from "typeorm";
-import { EmrRegistration } from "./emr_registration";
+import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
+import { EmrPatient } from "./emr_patient";
 
 @Entity("emr_diet", { schema: "emr" })
 export class EmrDiet {
     @PrimaryGeneratedColumn("uuid")
     id: string;
 
-    @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" })
+    @ManyToOne(() => EmrPatient, { onDelete: "CASCADE" })
     @JoinColumn()
-    registration: EmrRegistration;
+    patient: EmrPatient;
+
+    @OneToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
+    @JoinColumn()
+    registration_outpatient: EmrRegistrationOutpatient;
 
     @Column({ nullable: true, type: "text" })
     diet: string;

src/entity/emr/emr_physical_examination.ts

@@ -5,20 +5,20 @@ import {
     CreateDateColumn,
     UpdateDateColumn,
     DeleteDateColumn,
-    ManyToOne,
     JoinColumn,
+    OneToOne,
 } from "typeorm";
 
-import { EmrRegistration } from "./emr_registration";
+import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
 
 @Entity("emr_physical_examination", { schema: "emr" })
 export class EmrPhysicalExamination {
     @PrimaryGeneratedColumn("uuid")
     id: string;
 
-    @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" })
+    @OneToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
     @JoinColumn()
-    registration: EmrRegistration;
+    registration_outpatient: EmrRegistrationOutpatient;
 
     @Column({ nullable: true, type: "text" })
     internal_status: string;