diff --git a/server/services/pacientes/get.in.json b/server/services/pacientes/get.in.json index a3107c9..e6c6266 100644 --- a/server/services/pacientes/get.in.json +++ b/server/services/pacientes/get.in.json @@ -3,7 +3,7 @@ "Serviços relacionados aos pacientes" ], "summary": "Detalhes dos pacientes", - "description": "É obtido todos os campos de detalhe do paciente especificado por nome, RG e/ou CPF, ou uma lista de médicos caso não especificado.", + "description": "É obtido todos os campos de detalhe do paciente especificado por nome e/ou CPF, ou uma lista de médicos caso não especificado.", "type": "object", "properties": { "nome": { @@ -13,10 +13,6 @@ "cpf": { "type": "string", "example": "123.456.789-10" - }, - "rg": { - "type": "string", - "example": "12.345.678" } } } diff --git a/server/services/pacientes/get.js b/server/services/pacientes/get.js index d9f6c35..9654414 100644 --- a/server/services/pacientes/get.js +++ b/server/services/pacientes/get.js @@ -1,15 +1,13 @@ const nome = _req.getString("nome"); -const rg = _req.getString("rg"); const cpf = _req.getString("cpf"); const campos = _req.getString("campos").split(","); const dbPacientes = _db.query(` - SELECT id, uid, nome, r_g, c_p_f, data_de_nascimento, endereco, telefone + SELECT id, uid, nome, c_p_f, data_de_nascimento, endereco, telefone FROM paciente - WHERE nome LIKE ? AND r_g LIKE ? AND c_p_f LIKE ? + WHERE nome LIKE ? AND c_p_f LIKE ? `, `%${nome}%`, - `%${rg}%`, `%${cpf}%` ); @@ -19,7 +17,6 @@ for (const dbPaciente of dbPacientes) { const paciente = _val.map() .set("uid", dbPaciente.getUID("uid")) .set("nome", dbPaciente.getString("nome")) - .set("rg", dbPaciente.getString("r_g")) .set("cpf", dbPaciente.getString("c_p_f")) .set("data de nascimento", dbPaciente.getSQLDate("data_de_nascimento")) .set("endereço", dbPaciente.getString("endereco")) diff --git a/server/services/pacientes/post.in.json b/server/services/pacientes/post.in.json index 9b77e78..9ecffa7 100644 --- a/server/services/pacientes/post.in.json +++ b/server/services/pacientes/post.in.json @@ -14,10 +14,6 @@ "type": "string", "required": true }, - "rg": { - "type": "string", - "required": true - }, "data_de_nascimento": { "type": "string", "required": true @@ -39,12 +35,11 @@ } }, "required": [ - "nome", "cpf", "rg", "data_de_nascimento", "endereco", "telefone", "convenios" + "nome", "cpf", "data_de_nascimento", "endereco", "telefone", "convenios" ], "example": { "nome": "José da Silva", "cpf": "123-456-789-01", - "rg": "12.345.678", "data_de_nascimento": "1970-03-20", "endereco": "Rua das Flores, 123, Bairro Central, São Paulo, SP, 01000-000", "telefone": "(31) 91234-5678", diff --git a/server/services/pacientes/post.js b/server/services/pacientes/post.js index 422166d..15773cd 100644 --- a/server/services/pacientes/post.js +++ b/server/services/pacientes/post.js @@ -1,5 +1,4 @@ const nome = _req.getString("nome"); -const rg = _req.getString("rg"); const cpf = _req.getString("cpf"); const data_de_nascimento = _req.getString("data_de_nascimento"); const endereco = _req.getString("endereco"); @@ -7,12 +6,12 @@ const telefone = _req.getString("telefone"); const convenios = _req.getList("convenios"); const dbPaciente = _db.form("paciente") - .where(_db.where("c_p_f").equal(cpf).or("r_g").equal(rg)) + .where(_db.where("c_p_f").equal(cpf) .first(); if (dbPaciente) { _header.status(409); - _out.json({ insertedData: 0, error: "esse CPF/RG já está cadastrado no sistema" }); + _out.json({ insertedData: 0, error: "esse CPF já está cadastrado no sistema" }); _exec.stop(); } @@ -32,7 +31,6 @@ const insertedData = _db.insertIfNotExists( "paciente", _val.map() .set("nome", nome) - .set("r_g", rg) .set("c_p_f", cpf) .set("data_de_nascimento", data_de_nascimento) .set("endereco", endereco) diff --git a/server/setup/_schema-form-1-consulta.js b/server/setup/_schema-form-1-consulta.js index 4d4de68..e077a7b 100644 --- a/server/setup/_schema-form-1-consulta.js +++ b/server/setup/_schema-form-1-consulta.js @@ -168,13 +168,13 @@ _form.createComponentIfNotExists( .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("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"paciente:c_p_f,nome\"},\"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", "paciente") .set("type", "select") - .set("uid", "a5134227-b2ac-4727-9d86-61f87e6f9f51") + .set("uid", "03bccbd4-7094-4a34-9b76-027d30631222") .set("unique", false) .set("user_id", 0) .set("whenedit", true) diff --git a/server/setup/_schema-form-7-paciente.js b/server/setup/_schema-form-7-paciente.js index 973cf83..09b23bc 100644 --- a/server/setup/_schema-form-7-paciente.js +++ b/server/setup/_schema-form-7-paciente.js @@ -152,37 +152,6 @@ _form.createComponentIfNotExists( .set("x", 1) .set("y", 1) ) -_form.createComponentIfNotExists( - "c3d3b84c-55da-4f13-a354-13052f8a5d7b", - _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", "r_g") - .set("properties", "{\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"},\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}") - .set("rowspan", 0) - .set("tdheight", 0) - .set("tdwidth", 0) - .set("title", "RG") - .set("type", "text") - .set("uid", "d58bc886-7b88-4254-8b91-1b3a2dbaf259") - .set("unique", true) - .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", 5) -) _form.createComponentIfNotExists( "c3d3b84c-55da-4f13-a354-13052f8a5d7b", _val.map() diff --git a/server/setup/_schema-form-8-paciente_convenio.js b/server/setup/_schema-form-8-paciente_convenio.js index aac993f..5848283 100644 --- a/server/setup/_schema-form-8-paciente_convenio.js +++ b/server/setup/_schema-form-8-paciente_convenio.js @@ -72,13 +72,13 @@ _form.createComponentIfNotExists( .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("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"paciente:c_p_f,nome\"},\"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", "paciente") .set("type", "select") - .set("uid", "d4c83c6c-413c-44f6-a82a-1dce28f2958c") + .set("uid", "969ac665-eff5-4e20-8992-b6f93863516f") .set("unique", false) .set("user_id", 0) .set("whenedit", true)