Merge branch 'fix_query_enrollment' into development

src/libs/routes/glossEnrollmentRatio.js

@@ -226,12 +226,12 @@ rqf.addField({
 }).addValue({
     name: 'education_level_basic',
     table: 'matricula',
-    tableField: 'etapa_resumida',
+    tableField: 'etapas_mod_ensino_segmento_id',
     resultField: 'education_level_basic_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'etapa_resumida'
+        field: 'etapas_mod_ensino_segmento_id'
     }
 });
 
@@ -305,7 +305,7 @@ glossEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
     req.numerator = req.result;
     req.resetSql();
     log.debug(req.sql.toParam());
-    req.sql.field('count(*)', 'total')
+    req.sql.field('sum(peso)', 'total')
     .field('pnad.ano_censo','year')
     .from('pnad')
     .group('pnad.ano_censo')

src/libs/routes/liquidEnrollmentRatio.js

@@ -226,12 +226,12 @@ rqf.addField({
 }).addValue({
     name: 'education_level_basic',
     table: 'matricula',
-    tableField: 'etapa_resumida',
+    tableField: 'etapas_mod_ensino_segmento_id',
     resultField: 'education_level_basic_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'etapa_resumida'
+        field: 'etapas_mod_ensino_segmento_id'
     }
 });
 
@@ -338,7 +338,7 @@ liquidEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
     req.numerator = req.result;
     req.resetSql();
     log.debug(req.sql.toParam());
-    req.sql.field('count(*)', 'total')
+    req.sql.field('sum(peso)', 'total')
     .field('pnad.ano_censo','year')
     .from('pnad')
     .group('pnad.ano_censo')