diff --git a/src/libs/routes_v1/classroomCount.js b/src/libs/routes_v1/classroomCount.js
index fd5b5f70b008b0610b4b43025519e27d397e7b45..8afcda14c560329b0a5fa87af2d78b2d88b4104b 100644
--- a/src/libs/routes_v1/classroomCount.js
+++ b/src/libs/routes_v1/classroomCount.js
@@ -795,27 +795,6 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
                     educationLevel.enrollment.full_period_classes = educationLevel.classes_school_year.reduce(reducer('full_period_classes'), 0);
                     educationLevel.enrollment.day_classes = educationLevel.classes_school_year.reduce(reducer('day_classes'), 0);
                     educationLevel.enrollment.total_classrooms_needed = educationLevel.classes_school_year.reduce(reducer('total_classrooms_needed'), 0);
-                
-                    // Matrículas diurnas
-                    let minimun_classes = minimunClasses(educationLevel.education_level_short_id);
-                    let partial_day_enrollment = educationLevel.enrollment.total_enrollment_day - educationLevel.enrollment.integral_time;
-                    if (partial_day_enrollment >= (minimun_classes * 10)) {
-                        if (educationLevel.enrollment.day_classes < minimun_classes) {
-                            educationLevel.enrollment.day_classes = minimun_classes;
-                        }
-                    }
-                    // Matrículas integrais
-                    if (educationLevel.enrollment.integral_time >= (minimun_classes * 10)) {
-                        if (educationLevel.enrollment.full_period_classes < minimun_classes) {
-                            educationLevel.enrollment.full_period_classes = minimun_classes;
-                        }
-                    }
-                    // Matrículas noturnas
-                    if (educationLevel.enrollment.total_enrollment_night >= (minimun_classes * 10)) {
-                        if (educationLevel.enrollment.night_classes < minimun_classes) {
-                            educationLevel.enrollment.night_classes = minimun_classes;
-                        }
-                    }
 
                 }
 
@@ -950,6 +929,27 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
                                 currentEducation.enrollment.night_classes += cityEducation.enrollment.night_classes;
                                 currentEducation.enrollment.total_classrooms_needed += cityEducation.enrollment.total_classrooms_needed;
 
+                                // Matrículas diurnas
+                                let minimun_classes = minimunClasses(currentEducation.education_level_short_id);
+                                let partial_day_enrollment = currentEducation.enrollment.total_enrollment_day - currentEducation.enrollment.integral_time;
+                                if (partial_day_enrollment >= (minimun_classes * 10)) {
+                                    if (currentEducation.enrollment.day_classes < minimun_classes) {
+                                        currentEducation.enrollment.day_classes = minimun_classes;
+                                    }
+                                }
+                                // Matrículas integrais
+                                if (currentEducation.enrollment.integral_time >= (minimun_classes * 10)) {
+                                    if (currentEducation.enrollment.full_period_classes < minimun_classes) {
+                                        currentEducation.enrollment.full_period_classes = minimun_classes;
+                                    }
+                                }
+                                // Matrículas noturnas
+                                if (currentEducation.enrollment.total_enrollment_night >= (minimun_classes * 10)) {
+                                    if (currentEducation.enrollment.night_classes < minimun_classes) {
+                                        currentEducation.enrollment.night_classes = minimun_classes;
+                                    }
+                                }
+
                                 // Caso tenha feito o cálculo de professores, atualiza os valores
                                 if (req.teacherCalc) {
                                     currentEducation.teacherNumber.total_teacher += cityEducation.teacherNumber.total_teacher;