diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 32a000e..004fbbb 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -613,7 +613,7 @@
where a.lectno=#lectno# and a.exno=#exno# and a.eend is null
update lectsd a
- inner join lect b on b.lectno=a.lectno and b.userno=#userno#
- inner join cm c on c.cmno=b.cmno and c.sstime < now() and c.setime > now()
+ inner join lect b on b.lectno=a.lectno and b.userno=#userno# and b.sdate < now() and b.edate > now()
+ inner join cm c on c.cmno=b.cmno
set a.udt=now(),a.uno=#uno#,a.uip=#uip#
,a.fgno=#fgno#,a.atext=#atext#
,a.submittime=now(),submitip=#uip#
@@ -636,7 +636,7 @@
select a.lectno,a.sdno,#atext#,#fgno#,0,now(),#uip#,
from (select #lectno# lectno,#userno# userno,#sdno# sdno) a
inner join lect b on b.lectno=a.lectno and b.userno=a.userno
- inner join cm c on c.cmno=b.cmno and c.sstime < now() and c.setime > now()
+ inner join cm c on c.cmno=b.cmno and b.sdate < now() and b.edate > now()
left outer join lectsd d on d.lectno=a.lectno and d.sdno=a.sdno
where d.lectno is null;
diff --git a/FO/Views/CRoom/EstimationSubject.cshtml b/FO/Views/CRoom/EstimationSubject.cshtml
index af4edf6..f097aa7 100644
--- a/FO/Views/CRoom/EstimationSubject.cshtml
+++ b/FO/Views/CRoom/EstimationSubject.cshtml
@@ -18,7 +18,7 @@