diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 3309020..f2a7b34 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1362,7 +1362,8 @@
                     ,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
                     ,a.lectno longval
                     ,b.cname strval,bc.cname strval2,concat(date_format(c.idate,'%m/%d'),' ',left(c.ist,2),':',right(c.ist,2),' ~ ',left(c.iet,2),':',right(c.iet,2)) strval3
-                    ,b.sstime time,b.setime time2
+                    ,case when a.sdate is null then b.sstime else a.sdate end as time
+                    ,case when a.edate is null then b.setime else a.edate end as time2
                     ,row_number() over(partition by a.cmno order by c.iseq) rno2
                     ,row_number() over(order by b.setime) rno
                 from lect a
@@ -1386,7 +1387,8 @@
                     ,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
                     ,a.lectno longval
                     ,b.cname strval,bc.cname strval2,null strval3
-                    ,b.sstime time,b.setime time2
+                    ,case when a.sdate is null then b.sstime else a.sdate end as time
+                    ,case when a.edate is null then b.setime else a.edate end as time2
                     ,row_number() over(partition by a.cmno order by c.extype,c.cdt) rno2
                     ,row_number() over(order by b.setime) rno
                 from lect a
@@ -1410,7 +1412,8 @@
                     ,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
                     ,a.lectno longval
                     ,b.cname strval,bc.cname strval2,null strval3
-                    ,b.sstime time,b.setime time2
+                    ,case when a.sdate is null then b.sstime else a.sdate end as time
+                    ,case when a.edate is null then b.setime else a.edate end as time2
                     ,row_number() over(partition by a.cmno order by c.cdt) rno2
                     ,row_number() over(order by b.setime) rno
                 from lect a
@@ -1434,7 +1437,8 @@
                     ,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
                     ,a.lectno longval
                     ,b.cname strval,bc.cname strval2,null strval3
-                    ,b.sstime time,b.setime time2
+                    ,case when a.sdate is null then b.sstime else a.sdate end as time
+                    ,case when a.edate is null then b.setime else a.edate end as time2
                     ,row_number() over(partition by a.cmno order by c.cdt) rno2
                     ,row_number() over(order by b.setime) rno
                 from lect a
@@ -1458,7 +1462,7 @@
                     ,a.scdno intval,a.dday intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,b.cmno intval7,0 intval8
                     ,c.lectno longval,a.alno longval2
                     ,b.cname strval,null strval2,null strval3
-                    ,a.atime time,null time2
+                    ,a.atime time,c.edate time2
                     ,row_number() over(order by a.atime desc) rno
                 from alarms a
                 inner join cm b on b.cmno=a.cmexno