diff --git a/src/libs/routes_v2/simcaqFirstReport.js b/src/libs/routes_v2/simcaqFirstReport.js index c4c4b9784733ce1cb2ab043bcbde91a7b09b1d51..db300da53a36c308186aedc30def6a5cbecf2163 100644 --- a/src/libs/routes_v2/simcaqFirstReport.js +++ b/src/libs/routes_v2/simcaqFirstReport.js @@ -127,7 +127,6 @@ simcaqFirstReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .field('simcaq_relatorio_1.localizacao_id', 'location') .field('SUM(simcaq_relatorio_1.num_matriculas)', 'num_enrollments') .field('SUM(simcaq_relatorio_1.num_escolas)', 'num_schools') - .where('situacao_funcionamento_pareada = 1 AND (ensino_regular = 1 OR ensino_eja = 1 OR educacao_profissional = 1)') .group('simcaq_relatorio_1.etapa') .group('simcaq_relatorio_1.turno') .group('simcaq_relatorio_1.localizacao_id'); diff --git a/src/libs/routes_v2/simcaqSecondReport.js b/src/libs/routes_v2/simcaqSecondReport.js index 51907e3308d8ee25a68e0259e8f827c8f426706e..6babe38356292fbf5db56003af921c20eb089fca 100644 --- a/src/libs/routes_v2/simcaqSecondReport.js +++ b/src/libs/routes_v2/simcaqSecondReport.js @@ -102,8 +102,7 @@ simcaqSecondReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .field('sum(num_escolas_rural)' ,'num_schools_rural') .field('sum(num_escolas_urbana)' ,'num_schools_urban') .field('dependencia_adm_priv', 'private_adm_dependency') - .where('situacao_funcionamento_pareada = 1 AND (ensino_regular = 1 OR ensino_eja = 1 OR educacao_profissional = 1)') - .group('dependencia_adm_priv') + .group('dependencia_adm_priv'); next(); }, query, response('simcaqSecondReport'));