From 1d3dbeb2b45efbe25f8b811462f9a0b013778746 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Wed, 25 Feb 2026 14:53:04 +0700 Subject: [PATCH] update --- src/entity/emr/emr_anamnesis.ts | 7 +++---- src/entity/emr/emr_diagnosis.ts | 6 +++--- src/entity/emr/emr_diagnostic_procedure.ts | 6 +++--- src/entity/emr/emr_diet.ts | 6 +++--- src/entity/emr/emr_doctor_procedure.ts | 6 +++--- src/entity/emr/emr_physical_examination.ts | 6 +++--- src/entity/emr/emr_vital_signs.ts | 6 +++--- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/entity/emr/emr_anamnesis.ts b/src/entity/emr/emr_anamnesis.ts index 4033365..a48658e 100644 --- a/src/entity/emr/emr_anamnesis.ts +++ b/src/entity/emr/emr_anamnesis.ts @@ -11,17 +11,16 @@ import { } from "typeorm"; import { anamnesisStatus } from "../../enum/anamnesisStatus"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; - +import { EmrRegistration } from "./emr_registration"; @Entity("emr_anamnesis", { schema: "emr" }) export class Emranamnesis { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + registration: EmrRegistration; /** Contoh: "08:00-12:00" atau "Pagi" */ @Column({ nullable: true, type: "text" }) diff --git a/src/entity/emr/emr_diagnosis.ts b/src/entity/emr/emr_diagnosis.ts index 1f61dd4..077aa59 100644 --- a/src/entity/emr/emr_diagnosis.ts +++ b/src/entity/emr/emr_diagnosis.ts @@ -10,7 +10,7 @@ import { JoinColumn, } from "typeorm"; import { EmrDiagnosisType } from "../../enum/emrDiagnosisType"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrPatient } from "./emr_patient"; import { Diagnosis } from "../diagnosis"; @Entity("emr_diagnosis", { schema: "emr" }) @@ -18,9 +18,9 @@ export class EmrDiagnosis { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrPatient, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + patient: EmrPatient; @ManyToOne(() => Diagnosis, { onDelete: "CASCADE", nullable: true }) @JoinColumn() diff --git a/src/entity/emr/emr_diagnostic_procedure.ts b/src/entity/emr/emr_diagnostic_procedure.ts index 32e8f4f..1c28613 100644 --- a/src/entity/emr/emr_diagnostic_procedure.ts +++ b/src/entity/emr/emr_diagnostic_procedure.ts @@ -10,7 +10,7 @@ import { JoinColumn, } from "typeorm"; import { EmrDiagnosisType } from "../../enum/emrDiagnosisType"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrPatient } from "./emr_patient"; import { DiagnosticProcedure } from "../diagnostic_procedure"; @Entity("emr_diagnostic_procedure", { schema: "emr" }) @@ -18,9 +18,9 @@ export class EmrDiagnosticProcedure { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrPatient, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + patient: EmrPatient; @ManyToOne(() => DiagnosticProcedure, { onDelete: "CASCADE", nullable: true }) @JoinColumn() diff --git a/src/entity/emr/emr_diet.ts b/src/entity/emr/emr_diet.ts index 3ebf52a..c3f39a3 100644 --- a/src/entity/emr/emr_diet.ts +++ b/src/entity/emr/emr_diet.ts @@ -9,16 +9,16 @@ import { OneToOne, JoinColumn, } from "typeorm"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrRegistration } from "./emr_registration"; @Entity("emr_diet", { schema: "emr" }) export class EmrDiet { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + registration: EmrRegistration; @Column({ nullable: true, type: "text" }) diet: string; diff --git a/src/entity/emr/emr_doctor_procedure.ts b/src/entity/emr/emr_doctor_procedure.ts index e1d91a2..cc3ac64 100644 --- a/src/entity/emr/emr_doctor_procedure.ts +++ b/src/entity/emr/emr_doctor_procedure.ts @@ -11,16 +11,16 @@ import { import { Service } from "../service"; import { ServiceType } from "../service_type"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrRegistration } from "./emr_registration"; @Entity('emr_doctor_procedure',{ schema: "emr" }) export class EmrDoctorProcedure { @PrimaryGeneratedColumn('uuid') id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + registration: EmrRegistration; @ManyToOne(() => ServiceType, { onDelete: 'NO ACTION' }) @JoinColumn() diff --git a/src/entity/emr/emr_physical_examination.ts b/src/entity/emr/emr_physical_examination.ts index 384d82f..39b4090 100644 --- a/src/entity/emr/emr_physical_examination.ts +++ b/src/entity/emr/emr_physical_examination.ts @@ -9,16 +9,16 @@ import { JoinColumn, } from "typeorm"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrRegistration } from "./emr_registration"; @Entity("emr_physical_examination", { schema: "emr" }) export class EmrPhysicalExamination { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + registration: EmrRegistration; @Column({ nullable: true, type: "text" }) internal_status: string; diff --git a/src/entity/emr/emr_vital_signs.ts b/src/entity/emr/emr_vital_signs.ts index 54a6f0d..f13c68c 100644 --- a/src/entity/emr/emr_vital_signs.ts +++ b/src/entity/emr/emr_vital_signs.ts @@ -10,7 +10,7 @@ import { } from "typeorm"; import { consciousness } from "../../enum/consciousness"; -import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; +import { EmrRegistration } from "./emr_registration"; enum YesNoEnum { YES = "YES", @@ -22,9 +22,9 @@ export class EmrVitalSigns { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" }) + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() - id_emr_outpatient: EmrRegistrationOutpatient; + registration: EmrRegistration; /** Contoh: "08:00-12:00" atau "Pagi" */ @Column({ nullable: true, length: 64 })