diff --git a/src/_screens/criteria/criteria-manage/index.js b/src/_screens/criteria/criteria-manage/index.js
index 8244f88..c87b870 100644
--- a/src/_screens/criteria/criteria-manage/index.js
+++ b/src/_screens/criteria/criteria-manage/index.js
@@ -141,6 +141,8 @@ export default function CriteriaManage() {
     ) {
       return;
     }
+    setLoadMoreOnline(true)
+    setIsEndOnlineClasses(false)
     setIsFiltered(true);
     getDataCriteria(true);
   };
diff --git a/src/_screens/home/admin/index.js b/src/_screens/home/admin/index.js
index 61f5449..b36fb5a 100644
--- a/src/_screens/home/admin/index.js
+++ b/src/_screens/home/admin/index.js
@@ -186,6 +186,8 @@ export default function AdminHome() {
 
   const handleSubmit = () => {
     if (isFilterSchool) {
+      setLoadMoreOnline(true)
+      setIsEndOnlineClasses(false)
       setIsSearched(true);
       getData();
       return;
diff --git a/src/_screens/home/teacher/index.js b/src/_screens/home/teacher/index.js
index a3ffe54..3163aa5 100644
--- a/src/_screens/home/teacher/index.js
+++ b/src/_screens/home/teacher/index.js
@@ -39,6 +39,8 @@ export default function TeacherHome() {
   const [limitOnline] = useState(10);
   const [offsetOnline, setOffsetOnline] = useState(0);
   const [isEndOnlineClasses, setIsEndOnlineClasses] = useState(false);
+  const [totalClass, setTotalClass] = useState(0)
+  const [totalAssign, settotalAssign] = useState(0)
 
   const teacherName = !!teacherId
     ? !!teacher_name ? decodeURIComponent(teacher_name) : ''
@@ -60,6 +62,8 @@ export default function TeacherHome() {
 
       const res = await apiCaller(endPoint, "GET");
       if (res?.status) {
+        setTotalClass(res?.total_class);
+        settotalAssign(res?.total_assign);
         setCriteria(res?.criteria_teacher);
         setListClass(res?.data);
       }
@@ -84,6 +88,9 @@ export default function TeacherHome() {
   };
 
   const handleFilter = () => {
+    setLoadMoreOnline(true)
+    setIsEndOnlineClasses(false)
+    setListClass([])
     getData();
   };
 
@@ -96,9 +103,9 @@ export default function TeacherHome() {
       "Tiêu chí giao bài",
       "Tỷ lệ học sinh làm bài",
       "Tiêu chí tỷ lệ học sinh làm bài",
-      // "Trường",
-      // "Huyện",
-      // "Tỉnh",
+      "Trường",
+      "Huyện",
+      "Tỉnh",
       "Tháng",
       "học kỳ",
       "Niên khóa",
@@ -111,9 +118,9 @@ export default function TeacherHome() {
       item?.assign_number_level || 0,
       `${item?.student_done_per || 0}%`,
       item?.student_done_per_level || 0,
-      // "Trường",
-      // "Huyện",
-      // "Tỉnh",
+      item?.organization_name || '',
+      item?.organization_district ||'',
+      item?.organization_province ||'',
       !!month?.value
         ? month.value
         : getListMonthBySemester(semester.value)
@@ -156,7 +163,6 @@ export default function TeacherHome() {
     try {
       if (!isEndOnlineClasses) {
         let queryParams = []
-
         if(!!semester?.value){
           queryParams.push(`&semester=${semester?.value}`)
         }
@@ -164,8 +170,8 @@ export default function TeacherHome() {
           queryParams.push(`month=${month?.value}`)
         }
         const endPoint = 
-        `/api_exercise_report/teacher_report_summary?teacher_id=${id}&year=${schoolYear?.value}${queryParams.length ? `${queryParams.join("&")}` : ""}
-        &limit=${limitOnline}&offset=${offsetOnlineMore}`;
+        `/api_exercise_report/teacher_report_summary?teacher_id=${id}&year=${schoolYear?.value.trim()}&limit=${limitOnline}&offset=${offsetOnlineMore}` +
+        (queryParams.length > 0 ? `&${queryParams.join("&")}` : "");
         const res = await apiCaller(endPoint, "GET");
         if (res?.status) {
           concatListSide = res?.data;
@@ -224,13 +230,13 @@ export default function TeacherHome() {
               <div className="teacher-home-info-assign-box">
                 <img src="/assets/imgs/icon_group.png" />
                 <span style={{fontWeight: 700}}>{"Tổng số lớp: "}
-                  <span style={{color: PRIMARY_COLOR}}>{listClass?.length}</span>
+                  <span style={{color: PRIMARY_COLOR}}>{totalClass}</span>
                 </span>
               </div>
               <div className="teacher-home-info-assign-box">
                 <img src="/assets/imgs/icon_assign_class.png" />
                 <span style={{fontWeight: 700}}>{"Tổng số lần giao: "}
-                  <span style={{color: PRIMARY_COLOR}}>{countAss(listClass)}</span>
+                  <span style={{color: PRIMARY_COLOR}}>{totalAssign}</span>
                 </span>
               </div>
             </div>