diff --git a/src/libs/routes/classCount.js b/src/libs/routes/classCount.js index 2713238305d705af7f5d8cc06ce10e09b64568c1..ffdbe34fb15ee4df7312a7d8b45fb2b286a04bab 100644 --- a/src/libs/routes/classCount.js +++ b/src/libs/routes/classCount.js @@ -367,7 +367,7 @@ classCountApp.get('/count', rqf.parse(), (req, res, next) => { .from('turma') .group('turma.ano_censo') .order('turma.ano_censo') - .where('turma.local_turma = 0 AND turma.dependencia_adm_id <= 3 AND ((turma.etapa_resumida >= 1 AND turma.etapa_resumida <= 7) OR turma.etapa_resumida = 99)'); + .where('turma.local_turma = 0 AND turma.dependencia_adm_id <= 3 AND ((turma.etapa_resumida >= 1 AND turma.etapa_resumida <= 7) OR turma.etapa_resumida = 99) AND turma.turma_turno_id <> 99') next(); }, rqf.build(), query, addMissing(rqf), id2str.transform(), response('class_count')); diff --git a/src/libs/routes/classroomCount.js b/src/libs/routes/classroomCount.js index 601b02346be7cca359cc1195303b90897f5e31f3..15a0f7eef1b7c12775d1011daa20dac763f78bc8 100644 --- a/src/libs/routes/classroomCount.js +++ b/src/libs/routes/classroomCount.js @@ -403,7 +403,7 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => { .from('matricula') .group('matricula.ano_censo') .order('matricula.ano_censo') - .where('((matricula.tipo<=3 OR matricula.tipo IS NULL) AND (matricula.tipo_atendimento_turma IS NULL OR matricula.tipo_atendimento_turma <= 2))'); + .where('((matricula.tipo<=3 OR matricula.tipo IS NULL) AND (matricula.tipo_atendimento_turma IS NULL OR matricula.tipo_atendimento_turma <= 2) AND matricula.turma_turno_id <> 99)'); next(); }, rqf.build() ,query, id2str.transform(), (req, res, next) => { // constrói objeto de tempo integral e calcula diagnósticos