From 09c3ab2ccec85c32d03bd8d98a9cb17a22ff9158 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Fri, 27 Mar 2026 17:10:48 +0700 Subject: [PATCH] update : detail for pharmacy orderlist done --- src/entity/emr/emr_registration_outpatient.ts | 4 ++++ src/entity/pharmacy/item_origin.ts | 7 ++++++- src/entity/room.ts | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/entity/emr/emr_registration_outpatient.ts b/src/entity/emr/emr_registration_outpatient.ts index eae542f..649a7b6 100644 --- a/src/entity/emr/emr_registration_outpatient.ts +++ b/src/entity/emr/emr_registration_outpatient.ts @@ -16,6 +16,7 @@ import { User } from "../users"; import { DoctorSchedule } from "../doctor_schedule"; import { EmrInternalConsultation } from "./emr_internal_consultation"; import { ScheduleSeries } from "../schedule_series"; +import { Emranamnesis } from "./emr_anamnesis"; // import { RegistrationOutPatientStatus } from "../../enum/registrationOutPatientStatus"; /** @@ -28,6 +29,9 @@ export class EmrRegistrationOutpatient { @PrimaryGeneratedColumn("uuid") id: string; + @OneToOne(() => Emranamnesis, (anamnesis) => anamnesis.registration_outpatient) + anamnesis: Emranamnesis; + @OneToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn() registration: EmrRegistration; diff --git a/src/entity/pharmacy/item_origin.ts b/src/entity/pharmacy/item_origin.ts index 55704b6..50d5f29 100644 --- a/src/entity/pharmacy/item_origin.ts +++ b/src/entity/pharmacy/item_origin.ts @@ -5,15 +5,20 @@ import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, - OneToMany + OneToMany, + OneToOne, } from "typeorm"; import { RoomStock } from "../pharmacy-logistic/room_stock"; +import { SellingPricePercentage } from "./selling_price_percentage"; @Entity("pharmacy_item_origin", { schema: "pharmacy" }) export class ItemOrigin { @PrimaryGeneratedColumn("uuid") id!: string; + @OneToOne(() => SellingPricePercentage, (sellingpricepercentage) => sellingpricepercentage.item_origin) + sellingpricepercentage: SellingPricePercentage; + @OneToMany(() => RoomStock, (roomstock) => roomstock.itemorigin) roomstock: RoomStock[]; diff --git a/src/entity/room.ts b/src/entity/room.ts index 548c9b9..ba9c411 100644 --- a/src/entity/room.ts +++ b/src/entity/room.ts @@ -1,14 +1,20 @@ -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, ManyToOne, JoinColumn, ManyToMany } from "typeorm"; +import { Entity, + OneToOne, + PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, ManyToOne, JoinColumn, ManyToMany } from "typeorm"; import { Status } from "../types/status"; import { Department } from "./department"; import { Service } from "./service"; +import { RoomStock } from "./pharmacy-logistic/room_stock"; @Entity("rooms") export class Room { @PrimaryGeneratedColumn("uuid") id: string; + @OneToOne(() => RoomStock, (room) => room.room) + roomstock: RoomStock; + @Column({ nullable: false, length: 256,