diff --git a/src/entity/emr/emr_anthropometry.ts b/src/entity/emr/emr_anthropometry.ts
deleted file mode 100644
index 3eb3332..0000000
--- a/src/entity/emr/emr_anthropometry.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-    Entity,
-    PrimaryGeneratedColumn,
-    Column,
-    CreateDateColumn,
-    UpdateDateColumn,
-    DeleteDateColumn,
-    ManyToOne,
-    JoinColumn,
-} from "typeorm";
-
-import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
-
-
-@Entity("emr_anthropometry", { schema: "emr" })
-export class EmrAnthropometry {
-    @PrimaryGeneratedColumn("uuid")
-    id: string;
-
-    @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
-    @JoinColumn()
-    id_emr_outpatient: EmrRegistrationOutpatient;
-
-    @Column({ nullable: true, length: 64 })
-    weight: string;
-
-    @Column({ nullable: true, length: 64 })
-    height: string;
-
-    @Column({ nullable: true, length: 64 })
-    head_circumference: string;
-
-    @Column({ nullable: true, length: 64 })
-    bmi: string;
-
-    @Column()
-    @CreateDateColumn()
-    created_at: Date;
-
-    @Column({ nullable: true, length: 256 })
-    created_by: string;
-
-    @Column({ nullable: true })
-    @UpdateDateColumn()
-    updated_at: Date;
-
-    @Column({ nullable: true, length: 256 })
-    updated_by: string;
-
-    @Column({ nullable: true })
-    @DeleteDateColumn()
-    deleted_at: Date;
-
-    @Column({ nullable: true, length: 256 })
-    deleted_by: string;
-}
-
diff --git a/src/entity/emr/emr_functional_status.ts b/src/entity/emr/emr_functional_status.ts
deleted file mode 100644
index 97dfac0..0000000
--- a/src/entity/emr/emr_functional_status.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import {
-    Entity,
-    PrimaryGeneratedColumn,
-    Column,
-    CreateDateColumn,
-    UpdateDateColumn,
-    DeleteDateColumn,
-    ManyToOne,
-    JoinColumn,
-} from "typeorm";
-
-import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
-
-@Entity("emr_functional_status", { schema: "emr" })
-export class EmrFunctionalStatus {
-    @PrimaryGeneratedColumn("uuid")
-    id: string;
-
-    @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
-    @JoinColumn()
-    id_emr_outpatient: EmrRegistrationOutpatient;
-
-    @Column({ nullable: true, length: 256 })
-    assistive_devices: string;
-
-    @Column({ nullable: true, length: 256 })
-    prosthesis: string;
-
-    @Column({ nullable: true, length: 256 })
-    physical_disability: string;
-
-    @Column({
-        nullable: true,
-        default: false,
-    })
-    is_adl: boolean;
-
-    @Column({ nullable: true, length: 256 })
-    adl: string;
-
-    @Column({ nullable: true, length: 256 })
-    history_of_falls: string;
-
-    @Column({ nullable: true, length: 256 })
-    obstetric_and_gynecologic_status: string;
-
-    @Column({ nullable: true, length: 256 })
-    psychological_status: string;
-
-    @Column({
-        nullable: true,
-        default: false,
-    })
-    is_language_barrier: boolean;
-
-    @Column({ nullable: true, length: 256 })
-    language_barrier: string;
-
-     @Column({
-        nullable: true,
-        default: false,
-    })
-    is_physical_cognitive_disabilities: boolean;
-
-    @Column({ nullable: true, length: 256 })
-    physical_cognitive_disabilities: string;
-
-    @Column({ nullable: true, length: 256 })
-    nutritional_status_assessment: string;
-
-    @Column({ nullable: true, length: 512 })
-    patient_education: string;
-
-    @Column({ nullable: true, length: 256 })
-    health_problems: string;
-
-    @Column({ nullable: true, length: 256 })
-    nursing_interventions: string;
-
-    @Column()
-    @CreateDateColumn()
-    created_at: Date;
-
-    @Column({ nullable: true, length: 256 })
-    created_by: string;
-
-    @Column({ nullable: true })
-    @UpdateDateColumn()
-    updated_at: Date;
-
-    @Column({ nullable: true, length: 256 })
-    updated_by: string;
-
-    @Column({ nullable: true })
-    @DeleteDateColumn()
-    deleted_at: Date;
-
-    @Column({ nullable: true, length: 256 })
-    deleted_by: string;
-}
-
diff --git a/src/entity/emr/emr_vital_signs.ts b/src/entity/emr/emr_vital_signs.ts
index 97b5230..151723d 100644
--- a/src/entity/emr/emr_vital_signs.ts
+++ b/src/entity/emr/emr_vital_signs.ts
@@ -13,6 +13,10 @@ import {
 import { consciousness } from "../../enum/consciousness";
 import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
 
+enum YesNoEnum {
+    YES = "YES",
+    NO = "NO"
+}
 
 @Entity("emr_vital_signs", { schema: "emr" })
 export class EmrVitalSigns {
@@ -43,6 +47,93 @@ export class EmrVitalSigns {
     })
     consciousness: consciousness;
 
+    @Column({ nullable: true, length: 64 })
+    weight: string;
+
+    @Column({ nullable: true, length: 64 })
+    height: string;
+
+    @Column({ nullable: true, length: 64 })
+    head_circumference: string;
+
+    @Column({ nullable: true, length: 64 })
+    bmi: string;
+
+    @Column({ nullable: true, length: 256 })
+    assistive_devices: string;
+
+    @Column({ nullable: true, length: 256 })
+    prosthesis: string;
+
+    @Column({ nullable: true, length: 256 })
+    physical_disability: string;
+
+    @Column({
+        nullable: true,
+        default: false,
+    })
+    is_adl: boolean;
+
+    @Column({ nullable: true, length: 256 })
+    adl: string;
+
+    @Column({ nullable: true, length: 256 })
+    history_of_falls: string;
+
+    @Column({ nullable: true, length: 256 })
+    obstetric_and_gynecologic_status: string;
+
+    @Column({ nullable: true, length: 256 })
+    psychological_status: string;
+
+    @Column({
+        nullable: true,
+        default: false,
+    })
+    is_language_barrier: boolean;
+
+    @Column({ nullable: true, length: 256 })
+    language_barrier: string;
+
+    @Column({
+        nullable: true,
+        default: false,
+    })
+    is_physical_cognitive_disabilities: boolean;
+
+    @Column({ nullable: true, length: 256 })
+    physical_cognitive_disabilities: string;
+
+    @Column({ nullable: true, length: 256 })
+    nutritional_status_assessment: string;
+
+    @Column({ nullable: true, length: 512 })
+    patient_education: string;
+
+    @Column({ nullable: true, length: 256 })
+    health_problems: string;
+
+    @Column({ nullable: true, length: 256 })
+    nursing_interventions: string;
+
+    @Column({ nullable: true, length: 10 })
+    staggering: string;
+
+    @Column({ nullable: true, length: 10 })
+    using_assistive_device: string;
+
+    @Column({ nullable: true, length: 10 })
+    holding_on_to_something: string;
+
+    @Column({ nullable: true, length: 256 })
+    result: string;
+
+    @Column({ nullable: true, length: 10 })
+    risk_of_falling: string;
+
+    @Column({ nullable: true, length: 10 })
+    hospitalize: string;
+
     @Column()
     @CreateDateColumn()
     created_at: Date;
diff --git a/src/schema/emr.ts b/src/schema/emr.ts
index 392bc56..edcb0c4 100644
--- a/src/schema/emr.ts
+++ b/src/schema/emr.ts
@@ -6,8 +6,6 @@ export * from "../entity/emr/emr_registration_emergency";
 export * from "../entity/emr/emr_registration_hemodialysis";
 export * from "../entity/emr/emr_anamnesis";
 export * from "../entity/emr/emr_vital_signs";
-export * from "../entity/emr/emr_anthropometry";
-export * from "../entity/emr/emr_functional_status";
 
 export * from "../types/registration_type";
 export * from "../types/registration_status";