diff --git a/src/libs/convert/instructionLevel.js b/src/libs/convert/instructionLevel.js index 7750a704d90a916bc9ec01f04b43a262a9c02307..78bbf88a9124af8efef6452873b4521b819bcc34 100644 --- a/src/libs/convert/instructionLevel.js +++ b/src/libs/convert/instructionLevel.js @@ -34,7 +34,7 @@ module.exports = function instructionLevel(id) { return 'Superior incompleto ou equivalente'; case 7: return 'Superior completo ou equivalente'; - case 8: + case 99: return 'Não se aplica - 17 anos ou menos'; } }; diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js index e222b37de0a3feeaff367df2213e4797ec99a829..05ab151a4beeaaaf3f01aa9ff2e13242d16f2170 100644 --- a/src/libs/routes_v1/newPnad.js +++ b/src/libs/routes_v1/newPnad.js @@ -465,23 +465,17 @@ rqf.addField({ type: 'integer', field: 'microrregiao_id' } -}).addValueToField({ +}).addValue({ name: 'region', - table: 'estado', - tableField: 'regiao_id', - resultField: 'region_id', + table: 'pnad_novo', + tableField: 'cod_regiao', + resultField: 'reg_code_id', where: { relation: '=', type: 'integer', - field: 'regiao_id', - table: 'estado' - }, - join: { - primary: 'id', - foreign: 'estado_id', - foreignTable: 'municipio' + field: 'cod_regiao', } -}, 'filter'); +}); PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { req.sql.from('pnad_novo')