fix change unit price and total price format in medicine and change compound to item
This commit is contained in:
@ -14,9 +14,7 @@ import { EmrCompoundingMedicineItem } from "./emr_compounding_medicine_item";
|
||||
import { UsageTime } from "../pharmacy/usage_time";
|
||||
import { UsageInstructions } from "../pharmacy/usage_instructions";
|
||||
import { EmrRegistration } from "./emr_registration";
|
||||
import { Room } from "../room";
|
||||
import { EmrPatient } from "./emr_patient";
|
||||
import { User } from "../users";
|
||||
import { EmrPharmacyOrder } from "./emr_pharmacy_order";
|
||||
|
||||
@Entity("emr_compounding_medicine", { schema: "emr" })
|
||||
@ -59,12 +57,6 @@ export class EmrCompoundingMedicine {
|
||||
@OneToMany(() => EmrCompoundingMedicineItem, (item) => item.compounding_medicine, { cascade: true })
|
||||
items: EmrCompoundingMedicineItem[];
|
||||
|
||||
@Column({ nullable: true, type: "float" })
|
||||
unit_price?: number | null;
|
||||
|
||||
@Column({ nullable: true, type: "float" })
|
||||
total_price?: number | null;
|
||||
|
||||
@Column()
|
||||
@CreateDateColumn()
|
||||
created_at: Date;
|
||||
|
||||
@ -35,6 +35,12 @@ export class EmrCompoundingMedicineItem {
|
||||
@JoinColumn({ name: "room_stock_id" })
|
||||
room_stock: RoomStock;
|
||||
|
||||
@Column({ type: "decimal", precision: 10, scale: 2, nullable: true })
|
||||
unit_price?: number | null;
|
||||
|
||||
@Column({ type: "decimal", precision: 10, scale: 2, nullable: true })
|
||||
total_price?: number | null;
|
||||
|
||||
@Column()
|
||||
@CreateDateColumn()
|
||||
created_at: Date;
|
||||
|
||||
@ -57,10 +57,10 @@ export class EmrPrescription {
|
||||
@JoinColumn({ name: "room_stock_id" })
|
||||
room_stock: RoomStock;
|
||||
|
||||
@Column({ nullable: true, type: "float" })
|
||||
@Column({ type: "decimal", precision: 10, scale: 2, nullable: true })
|
||||
unit_price?: number | null;
|
||||
|
||||
@Column({ nullable: true, type: "float" })
|
||||
@Column({ type: "decimal", precision: 10, scale: 2, nullable: true })
|
||||
total_price?: number | null;
|
||||
|
||||
@Column()
|
||||
|
||||
Reference in New Issue
Block a user