From 2d452f524b53c64c801d6c47ab7ee37687a97607 Mon Sep 17 00:00:00 2001 From: avicenan Date: Thu, 12 Mar 2026 09:36:19 +0700 Subject: [PATCH] fix(emrdiagnosis): use emr registration relation --- src/entity/emr/emr_diagnosis.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/entity/emr/emr_diagnosis.ts b/src/entity/emr/emr_diagnosis.ts index 1de78b3..400a37d 100644 --- a/src/entity/emr/emr_diagnosis.ts +++ b/src/entity/emr/emr_diagnosis.ts @@ -13,7 +13,7 @@ import { EmrDiagnosisType } from "../../enum/emrDiagnosisType"; import { EmrPatient } from "./emr_patient"; import { Diagnosis } from "../diagnosis"; import { User } from "../users"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrRegistration } from "./emr_registration"; @Entity("emr_diagnosis", { schema: "emr" }) export class EmrDiagnosis { @@ -24,9 +24,9 @@ export class EmrDiagnosis { @JoinColumn() patient: EmrPatient; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() - registration_outpatient: EmrRegistrationOutpatient; + registration: EmrRegistration; @ManyToOne(() => User, { onDelete: "CASCADE" }) @JoinColumn() @@ -34,13 +34,13 @@ export class EmrDiagnosis { @ManyToOne(() => Diagnosis, { onDelete: "CASCADE", nullable: true }) @JoinColumn() - id_diagnosis: Diagnosis; + diagnosis: Diagnosis; @Column({ nullable: true, type: "text" }) diagnosis_code: string; @Column({ nullable: true, type: "text" }) - name: string; + diagnosis_name: string; @Column({ type: "enum",