diff --git a/dbs/clinica.mv.db b/dbs/clinica.mv.db
index d97d57e..6259464 100644
Binary files a/dbs/clinica.mv.db and b/dbs/clinica.mv.db differ
diff --git a/server/setup/_schema-form-1-consulta.js b/server/setup/_schema-form-1-consulta.js
index 6a96ad8..65dc513 100644
--- a/server/setup/_schema-form-1-consulta.js
+++ b/server/setup/_schema-form-1-consulta.js
@@ -64,20 +64,22 @@ _form.createComponentIfNotExists(
 	_val.map()
 	.set("colspan", 0)
 	.set("description", "")
+	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
+	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
 	.set("firebase", "")
 	.set("group_id", 0)
 	.set("height", 0)
 	.set("mandatory", true)
 	.set("max", 0)
 	.set("min", 0)
-	.set("name", "medico_id")
-	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"medico:nome,c_r_m\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
+	.set("name", "dia")
+	.set("properties", "{\"DEFAULT_CURRENT\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}")
 	.set("rowspan", 0)
 	.set("tdheight", 0)
 	.set("tdwidth", 0)
-	.set("title", "medico")
-	.set("type", "select")
-	.set("uid", "d27df5fa-2d18-4476-a52f-204a4ecdc1f4")
+	.set("title", "dia")
+	.set("type", "date")
+	.set("uid", "e0479825-88a8-4d05-8560-d779a1da0551")
 	.set("unique", false)
 	.set("user_id", 0)
 	.set("whenedit", true)
@@ -88,27 +90,60 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 2)
+	.set("y", 5)
 )
 _form.createComponentIfNotExists(
 	"2b671e68-2a28-4465-9eb9-3ad47155045d",
 	_val.map()
 	.set("colspan", 0)
 	.set("description", "")
+	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
+	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
 	.set("firebase", "")
 	.set("group_id", 0)
 	.set("height", 0)
 	.set("mandatory", true)
 	.set("max", 0)
 	.set("min", 0)
-	.set("name", "paciente_id")
-	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"paciente:nome,c_p_f,r_g\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
+	.set("name", "hora")
+	.set("properties", "{\"DEFAULT_CURRENT\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}")
 	.set("rowspan", 0)
 	.set("tdheight", 0)
 	.set("tdwidth", 0)
-	.set("title", "paciente")
+	.set("title", "hora")
+	.set("type", "time")
+	.set("uid", "e2ae22c7-a3a5-40ac-aa43-b3bd40f01b2e")
+	.set("unique", false)
+	.set("user_id", 0)
+	.set("whenedit", true)
+	.set("whenexport", true)
+	.set("whenfilter", true)
+	.set("whennew", true)
+	.set("whenresult", true)
+	.set("whenview", true)
+	.set("width", 0)
+	.set("x", 1)
+	.set("y", 6)
+)
+_form.createComponentIfNotExists(
+	"2b671e68-2a28-4465-9eb9-3ad47155045d",
+	_val.map()
+	.set("colspan", 0)
+	.set("description", "")
+	.set("firebase", "")
+	.set("group_id", 0)
+	.set("height", 0)
+	.set("mandatory", true)
+	.set("max", 0)
+	.set("min", 0)
+	.set("name", "medico_id")
+	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"medico:nome,c_r_m\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
+	.set("rowspan", 0)
+	.set("tdheight", 0)
+	.set("tdwidth", 0)
+	.set("title", "medico")
 	.set("type", "select")
-	.set("uid", "a5134227-b2ac-4727-9d86-61f87e6f9f51")
+	.set("uid", "d27df5fa-2d18-4476-a52f-204a4ecdc1f4")
 	.set("unique", false)
 	.set("user_id", 0)
 	.set("whenedit", true)
@@ -119,7 +154,7 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 1)
+	.set("y", 2)
 )
 _form.createComponentIfNotExists(
 	"2b671e68-2a28-4465-9eb9-3ad47155045d",
@@ -132,14 +167,14 @@ _form.createComponentIfNotExists(
 	.set("mandatory", true)
 	.set("max", 0)
 	.set("min", 0)
-	.set("name", "quando_id")
-	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"medico_agenda:dia,hora,medico_id\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
+	.set("name", "paciente_id")
+	.set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"paciente:nome,c_p_f,r_g\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}")
 	.set("rowspan", 0)
 	.set("tdheight", 0)
 	.set("tdwidth", 0)
-	.set("title", "quando")
+	.set("title", "paciente")
 	.set("type", "select")
-	.set("uid", "7c4b6cd9-bd2d-41a8-9c3b-91d6d8ee96b4")
+	.set("uid", "a5134227-b2ac-4727-9d86-61f87e6f9f51")
 	.set("unique", false)
 	.set("user_id", 0)
 	.set("whenedit", true)
@@ -150,13 +185,15 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 5)
+	.set("y", 1)
 )
 _form.createComponentIfNotExists(
 	"2b671e68-2a28-4465-9eb9-3ad47155045d",
 	_val.map()
 	.set("colspan", 0)
 	.set("description", "")
+	.set("edit_group_uid", "027bf7a4-a130-481c-807f-1f4bedaf5f45")
+	.set("edit_user_uid", "678201a1-1c85-4819-a1b6-600e6217b020")
 	.set("firebase", "")
 	.set("group_id", 0)
 	.set("height", 0)
@@ -164,13 +201,13 @@ _form.createComponentIfNotExists(
 	.set("max", 0)
 	.set("min", 0)
 	.set("name", "retorno")
-	.set("properties", "{\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"},\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}")
+	.set("properties", "{\"DEFAULT\":{\"default\":\"true\",\"type\":\"BOOLEAN\",\"value\":\"true\"}}")
 	.set("rowspan", 0)
 	.set("tdheight", 0)
 	.set("tdwidth", 0)
-	.set("title", "Retorno?")
-	.set("type", "text")
-	.set("uid", "04f7a1e1-e740-410f-bfed-3d5770695cf8")
+	.set("title", "retorno")
+	.set("type", "checkbox")
+	.set("uid", "1e2d8c14-6f94-4d35-bdcd-90f5aad4ad09")
 	.set("unique", false)
 	.set("user_id", 0)
 	.set("whenedit", true)
@@ -181,5 +218,5 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 4)
+	.set("y", 7)
 )
diff --git a/server/setup/_schema-form-5-medico_agenda.js b/server/setup/_schema-form-5-medico_agenda.js
index 5235707..2210c4c 100644
--- a/server/setup/_schema-form-5-medico_agenda.js
+++ b/server/setup/_schema-form-5-medico_agenda.js
@@ -124,3 +124,34 @@ _form.createComponentIfNotExists(
 	.set("x", 1)
 	.set("y", 1)
 )
+_form.createComponentIfNotExists(
+	"1f6eddf6-2026-41e2-b700-003769b3ea32",
+	_val.map()
+	.set("colspan", 0)
+	.set("description", "")
+	.set("firebase", "")
+	.set("group_id", 0)
+	.set("height", 0)
+	.set("mandatory", true)
+	.set("max", 0)
+	.set("min", 0)
+	.set("name", "retorno")
+	.set("properties", "{\"DEFAULT\":{\"default\":\"true\",\"type\":\"BOOLEAN\",\"value\":\"true\"}}")
+	.set("rowspan", 0)
+	.set("tdheight", 0)
+	.set("tdwidth", 0)
+	.set("title", "retorno")
+	.set("type", "checkbox")
+	.set("uid", "74e988f7-0c62-4d96-ac89-6615fa0df5dc")
+	.set("unique", false)
+	.set("user_id", 0)
+	.set("whenedit", true)
+	.set("whenexport", true)
+	.set("whenfilter", false)
+	.set("whennew", true)
+	.set("whenresult", true)
+	.set("whenview", true)
+	.set("width", 0)
+	.set("x", 1)
+	.set("y", 4)
+)