diff --git a/2.database/01.CreateTables.sql b/2.database/01.CreateTables.sql
index d6424eb..a660cf0 100644
--- a/2.database/01.CreateTables.sql
+++ b/2.database/01.CreateTables.sql
@@ -228,10 +228,10 @@ CREATE TABLE myhealth.question
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
     title VARCHAR(512) COLLATE pg_catalog."default" NOT NULL,
     message TEXT COLLATE pg_catalog."default" NOT NULL,
-    status INTEGER,
+    status VARCHAR(20) NOT NULL,
     response TEXT COLLATE pg_catalog."default",
-    patientid INTEGER REFERENCES myhealth.patient(id),
-    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
+    patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
+    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id) NOT NULL,
     CONSTRAINT question_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;
@@ -246,13 +246,13 @@ ALTER TABLE myhealth.question
 CREATE TABLE myhealth.medicaltest
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    date date,
-    "time" abstime,
+    date date NOT NULL,
+    "time" abstime NOT NULL,
     observations TEXT COLLATE pg_catalog."default",
     highresimage bytea,
-    type INTEGER,
-    patientid INTEGER REFERENCES myhealth.patient(id),
-    specialistdoctorid INTEGER REFERENCES myhealth.specialistdoctor(id),
+    type VARCHAR(30) NOT NULL,
+    patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
+    specialistdoctorid INTEGER REFERENCES myhealth.specialistdoctor(id) NOT NULL,
     CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;