diff --git a/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml b/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml
index 3868644..2dae8d7 100644
--- a/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml
@@ -172,7 +172,7 @@
         case when c.state = 1 then 1
             when c.state = 2 and c.start_time > now() then 2
             when c.state = 2 and c.start_time <= now() and c.end_time > now() then 3
-            when c.state = 2 and c.end_time >= now() then 4
+            when c.state = 2 and c.end_time <= now() then 4
 
         end class_state,
         c.valid_start_time,
@@ -209,7 +209,7 @@
                     and c.state = 2 and c.start_time > now()
                 </if>
                 <if test = "params.eqState = 3">
-                    and c.state = 2 and c.end_time > now()
+                    and c.state = 2 and c.end_time > now() and c.start_time &lt;= now()
                 </if>
                 <if test = "params.eqState = 4">
                     and c.state = 2 and c.end_time &lt;= now()