diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 931226d..a354016 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1367,6 +1367,10 @@
 			,a.time3,a.time4
 			,a.time5,a.time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from(
 			select 1 dtype
 			,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7
@@ -1376,9 +1380,25 @@
 			,c.cname strval,null strval2,null strval3
 			,c.rstime time,c.retime time2
 			,b.cdt time3,f.estart time4
-			,case when l.sdate is null then c.sstime else l.sdate end time5,case when l.edate is null then c.setime else l.edate end time6
+			,CASE
+				WHEN l.sdate IS NULL then <!--lect의 시작일자가 없으면--> 
+     				(case
+						when c.cshape ='1' then f.estart <!--교육장교육일경우 교육일정의 시작일자-->
+						else l.cdt  <!--그외는 lect의 등록일자-->
+					end)
+ 				ELSE l.sdate
+			 end AS time5
+
+			,case
+				when l.edate is null then f.eend  <!-- lect의 종료일자가 없으면-->
+			else l.edate
+			end time6
 			,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus
 			,row_number() over(order by sortpstatus, c.retime, b.payno,a.pino) rno
+			,l.iscomplete
+			,c.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from payitem a
 			inner join pay b on b.payno=a.payno and b.pstatus in (21,22,51,55) and b.rstatus &lt; 2
 			inner join cm c on c.cmno=a.itemno and c.rstime &lt; <include refid="sql.now"></include> and c.retime &gt; <include refid="sql.now"></include>
@@ -1386,9 +1406,11 @@
 			inner join term d on d.tmno=c.tmno
 			left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0
 			left outer join cminningscd f on f.cmisno = l.cmisno
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = l.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (21,22,51,55) and a.rstatus=0
 			and 1 = case when c.retime = '2099-12-31 23:59:59' and  l.stime is not null then 0 else 1 end
-			order by sortpstatus, c.retime, b.payno,a.pino
+			order by sortpstatus, c.retime desc, b.payno,a.pino
 			) a
 			union all
 			select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
@@ -1398,22 +1420,44 @@
 			,a.time3,a.time4
 			,a.time5,a.time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 2 dtype
 			,c.tyear intval,c.tseq intval2,b.cshape intval3,0 intval4,0 intval5,a.isrebate intval6,a.cmno intval7,0 intval8
 			,a.lectno longval,0 longval2
 			,b.cname strval,null strval2,null strval3
-			,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
+			,case
+			WHEN a.sdate IS NULL then  <!--lect의 시작일자가 없으면-->
+					(case
+						when b.cshape ='1' then d.estart  <!--교육장교육일경우 교육일정의 시작일자-->
+						else a.cdt  <!--그외는 lect의 등록일자-->
+				end)
+			ELSE a.sdate
+			end AS time
+
+			,case
+			when a.edate is null then d.eend   <!--lect의 종료일자가 없으면-->
+			else a.edate
+			end time2
+
 			,d.estart time3,d.eend time4
 			,e.cdt time5,null time6
 			,row_number() over(order by b.setime desc) rno
 			,case when d.eend is not null then d.eend else a.edate end as sortedate
+			,a.iscomplete
+			,b.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from lect a
 			inner join pay e on e.payno = a.payno
 			inner join cm b on b.cmno=a.cmno
 			inner join term c on c.tmno=b.tmno
 			left outer join cminningscd d on a.cmisno = d.cmisno
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a.userno=#userno# and a.status=1 and a.ischanged=0
 			and (case when a.sdate is null then b.sstime else a.sdate end) &lt; <include refid="sql.now"></include>
 			order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc
@@ -1426,6 +1470,10 @@
 			,null time3, null time4
 			,null time5, null time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 3 dtype
 			,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@@ -1435,10 +1483,17 @@
 			,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
+			,a.iscomplete
+			,b.studytime,
+			cc.cname  studyplacename,
+			cmis.studyplace
 			from lect a
 			inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
 			inner join cminning c on c.cmno=b.cmno and c.isonline=1 and c.isscd = 0
 			left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
+
 			where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
 			and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
 			) a
@@ -1451,6 +1506,10 @@
 			,null time3, null time4
 			,null time5, null time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 3 dtype
 			,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@@ -1460,11 +1519,17 @@
 			,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
+			,a.iscomplete
+			,b.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from lect a
 			inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include> and b.cshape=1-->
 			left outer join comcode bc on bc.ccode=b.studyplace
 			inner join cminning c on c.cmno=b.cmno and c.isonline=0 and c.isscd = 0
 			<!--left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2-->
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a.userno=#userno# and a.status=1 and a.ischanged=0 <!--and d.lectno is null-->
 			and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
 			) a
@@ -1477,6 +1542,10 @@
 			,null time3, null time4
 			,null time5, null time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 3 dtype
 			,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@@ -1486,10 +1555,16 @@
 			,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
+			,a.iscomplete
+			,b.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from lect a
 			inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
 			left outer join comcode bc on bc.ccode=b.studyplace
 			inner join cmex c on c.cmno=b.cmno and c.isdel=0 and c.econdition &lt;= a.attrate
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			left outer join lectex d on d.lectno=a.lectno and d.exno=c.exno and d.eend is not null
 			where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
 			and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
@@ -1503,6 +1578,10 @@
 			,null time3, null time4
 			,null time5, null time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 3 dtype
 			,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@@ -1512,11 +1591,17 @@
 			,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
+			,a.iscomplete
+			,b.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from lect a
 			inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
 			left outer join comcode bc on bc.ccode=b.studyplace
 			inner join cmsd c on c.sdtype=0 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
 			left outer join lectsd d on d.lectno=a.lectno and d.sdno=c.sdno and d.submittime is not null
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
 			and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
 			) a
@@ -1529,6 +1614,10 @@
 			,null time3, null time4
 			,null time5, null time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 3 dtype
 			,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@@ -1538,11 +1627,17 @@
 			,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
+			,a.iscomplete
+			,b.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from lect a
 			inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
 			left outer join comcode bc on bc.ccode=b.studyplace
 			inner join cmsd c on c.sdtype=1 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
 			left outer join lectsdboard d on d.lectno=a.lectno and d.sdno=c.sdno and d.isdel=0
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
 			and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
 			) a
@@ -1555,6 +1650,10 @@
 			,null time3, null time4
 			,null time5, null time6
 			,a.rno
+			,a.iscomplete
+			,a.studytime,
+			a.studyplacename                                             studyplacename,
+			a.studyplace
 			from (
 			select 4 dtype
 			,a.scdno intval,a.dday intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,b.cmno intval7,0 intval8
@@ -1562,9 +1661,15 @@
 			,b.cname strval,null strval2,null strval3
 			,a.atime time,c.edate time2
 			,row_number() over(order by a.atime desc) rno
+			,c.iscomplete
+			,b.studytime,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from alarms a
 			inner join cm b on b.cmno=a.cmexno
 			inner join lect c on c.cmno=b.cmno and c.userno=a.userno and c.status=1 and c.ischanged=0
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = c.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a.userno=#userno# and a.scdno &lt; 9 and a.isdel=0
 			order by a.atime desc
 			limit 5
@@ -1574,7 +1679,7 @@
 			update alarms set isdel=1 where alno=#alno# and userno=#userno#
 		</update>
 		<select id="lect.mylectures" parameterClass="hashtable" resultClass="lect">
-			select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete
+			select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete,b.studytime,b.outfee
 			,case when a.sdate is null then b.sstime else a.sdate end as sdate
 			,case when a.edate is null then b.setime else a.edate end as edate
 			,b.cmno,b.cname,b.cshape
@@ -1588,8 +1693,10 @@
 			,1 rno
 			,e.cdt
 			,scd.estart,scd.eend
-			,cc.ccode studyplace
-			,cc.cname studyplacename
+			<!--,cc.ccode studyplace
+			,cc.cname studyplacename-->
+			,ccc.cname                                             studyplacename,
+			cmis.studyplace
 			,case when scd.eend is not null then scd.eend else a.edate end as sortedate
 			,ci.scdtype
 			from lect a
@@ -1602,10 +1709,12 @@
 			left outer join assign ua on ua.asno=u.asno
 			left outer join cminningscd scd on scd.cmisno = a.cmisno
 			left outer join cminning ci on ci.cmino = scd.cmino
-			left outer join comcode cc on cc.ccode = b.studyplace
+			<!--left outer join comcode cc on cc.ccode = b.studyplace-->
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode ccc  ON ccc.ccode = cmis.studyplace and ccc.cgroup ='studyplace'
 			where a.userno=#userno# and a.status=1 and a.ischanged=0 <!-- 20220810 and a.sdate &lt; <include refid="sql.now"></include>-->
 			<!--20220810 where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate &lt; <include refid="sql.now"></include>-->
-			<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
+		<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
 			<isNotNull property="issubtable">
 				and (ifnull(a.iscomplete,0) = 0  <!-- 20220810 and b.cshape = 2 --> and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01'
 				<!--and scd.estart &gt; now()-->
@@ -1613,7 +1722,7 @@
 				and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59'))
 			</isNotNull>
 			union all
-			select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete
+			select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete,b.studytime,b.outfee
 			,case when a.sdate is null then b.sstime else a.sdate end as sdate
 			,case when a.edate is null then b.setime else a.edate end as edate
 			,b.cmno,b.cname,b.cshape,b.sstime,b.setime,b.classno,b.isrefund
@@ -1622,10 +1731,12 @@
 			,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
 			,row_number() over(partition by e.payno) rno
 			,e.cdt,null estart, null eend
-			,null studyplace
-			,null studyplacename
+			<!--null studyplace
+			,null studyplacename-->
 			,a.edate as sortedate
-			,null scdtype
+			,null scdtype,
+			cc.cname                                             studyplacename,
+			cmis.studyplace
 			from pay e
 			inner join lect a on a.payno=e.payno and a.status=1 and a.ischanged=0
 			inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include>
@@ -1633,10 +1744,14 @@
 			inner join cg d on d.cgno=b.cgno <isNotNull property="iscover">and d.iscover=1</isNotNull>
 			inner join users u on u.userno=a.userno
 			left outer join assign ua on ua.asno=u.asno
+
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
+
 			where e.isgroup=1 and e.userno=#userno# and e.pstatus=1
 			<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
 			union all
-			select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete
+			select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete,b.studytime,b.outfee
 			,case when a.sdate is null then b.sstime else a.sdate end as sdate
 			,case when a.edate is null then b.setime else a.edate end as edate
 			,b.cmno,b.cname,b.cshape,b.sstime,b.setime,b.classno,b.isrefund
@@ -1645,10 +1760,12 @@
 			,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
 			,row_number() over(partition by e.payno) rno
 			,e.cdt,null estart, null eend
-			,null studyplace
-			,null studyplacename
+			<!--null studyplace
+			,null studyplacename-->
 			,a.edate as sortedate
-			,null scdtype
+			,null scdtype,
+			cc.cname                                             studyplacename,
+			cmis.studyplace 
 			from lect a0
 			inner join pay e on e.payno=a0.payno and e.isgroup=1 and e.userno&lt;&gt;#userno# and e.pstatus=1
 			inner join lect a on a.payno=e.payno and a.status=1 and a.ischanged=0
@@ -1657,6 +1774,8 @@
 			inner join cg d on d.cgno=b.cgno <isNotNull property="iscover">and d.iscover=1</isNotNull>
 			inner join users u on u.userno=a.userno
 			left outer join assign ua on ua.asno=u.asno
+			LEFT OUTER JOIN cminningscd cmis  ON cmis.cmisno = a0.cmisno
+			LEFT OUTER JOIN comcode cc  ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace'
 			where a0.userno=#userno# and a0.status=1 and a0.ischanged=0
 			<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
 			order by case when setime &lt; now() then 0 else 1 end desc,sortedate desc, edate desc,payno
@@ -1812,7 +1931,7 @@
 			select a.*
 			from (
 			select a.lectno,a.userno,a.iscomplete,a.sdate,a.edate,a.status
-			,b.cmno,b.cname,b.cshape
+			,b.cmno,b.cname,b.cshape,b.studytime
 			,b.rstime,b.retime
 			,b.sstime,b.setime
 			,c.tyear,c.tseq
diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index 76d179b..3e6fe89 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -647,15 +647,15 @@
             where a.payno=#payno#
         </select>
         <select id="pay.mypayitems" parameterClass="hashtable" resultClass="payitem">
-            select a.payno,a.isgroup,a.pstatus ppstatus,a.rstatus prstatus
-                ,b.pino,b.ptype,b.pcno,b.itemno,b.userno,b.pstatus,b.rstatus,b.isrebate
-                ,c.cname,c.classno,c.rstime,c.retime,c.sstime,c.setime,c.cshape,c.isrefund,c.studydays
-                ,cc.cname studyplacename
-                ,d.tyear,d.tseq
-                ,u.username
-                ,ua.asname
-                ,uc.cname ccpositionname
-                ,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email
+			select a.payno,a.isgroup,a.pstatus ppstatus,a.rstatus prstatus,c.studytime
+			,b.pino,b.ptype,b.pcno,b.itemno,b.userno,b.pstatus,b.rstatus,b.isrebate
+			,c.cname,c.classno,c.rstime,c.retime,c.sstime,c.setime,c.cshape,c.isrefund,c.studydays
+			,cc.cname studyplacename,cmis.studyplace
+			,d.tyear,d.tseq
+			,u.username
+			,ua.asname
+			,uc.cname ccpositionname
+			,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email
                 ,case when max(e.rfdno) &gt; 0 then 1 else 0 end rfdstatus
                 ,lect.cmisno
                 ,a.cdt,cmis.estart cmiestart,cmis.eend cmieend
@@ -665,29 +665,35 @@
             from pay a
             inner join payitem b on b.payno=a.payno and b.ptype in (0,1,4) and b.pstatus in (21,22,51,55)
             inner join cm c on c.cmno=b.itemno and c.rstime &lt; now() and c.retime &gt; now()
-            inner join term d on d.tmno=c.tmno
-            inner join users u on u.userno=b.userno
-            left outer join assign ua on ua.asno=u.asno
-            left outer join comcode uc on uc.ccode=u.ccposition
-            left outer join payrfditem e0 on e0.pino=b.pino
-            left outer join payrfd e on e.rfdno=e0.rfdno and e.payno=a.payno and e.rstatus=0
-            left outer join comcode cc on cc.ccode=c.studyplace
-            left outer join lect lect on lect.pino=b.pino and lect.ischanged=0
-            left outer join cminningscd cmis on cmis.cmisno=lect.cmisno
-            where a.userno=#userno# and a.pstatus in (1,21,22,51,55) and lect.status &lt; 8
-            and 1 = case when c.retime = '2099-12-31 23:59:59' and  lect.stime is not null then 0 else 1 end
-            group by a.payno,a.isgroup,a.pstatus,a.rstatus
-                ,b.pino,b.ptype,b.pcno,b.itemno,b.userno,b.pstatus,b.rstatus,b.isrebate
-                ,c.cname,c.classno,c.rstime,c.retime,c.sstime,c.setime,c.cshape
-                ,cc.cname
-                ,d.tyear,d.tseq
-                ,u.username
-                ,ua.asname
-                ,uc.cname
-                ,u.email
-                ,lect.cmisno
-                ,cmis.estart,cmis.eend
-            order by sortpstatus, c.retime, a.payno,b.pino
+			inner join term d on d.tmno=c.tmno
+			inner join users u on u.userno=b.userno
+			left outer join assign ua on ua.asno=u.asno
+			left outer join comcode uc on uc.ccode=u.ccposition
+			left outer join payrfditem e0 on e0.pino=b.pino
+			left outer join payrfd e on e.rfdno=e0.rfdno and e.payno=a.payno and e.rstatus=0
+			left outer join lect lect on lect.pino=b.pino and lect.ischanged=0
+			left outer join cminningscd cmis on cmis.cmisno=lect.cmisno
+			LEFT OUTER JOIN comcode cc
+			ON cc.ccode = cmis.studyplace
+			and cc.cgroup ='studyplace'
+			<!--left outer join cminningscd cmmis
+			on cmmis.studyplace = cc.ccode-->
+			where a.userno=#userno# and a.pstatus in (1,21,22,51,55) and lect.status &lt; 8
+			<isNotNull property="cshape">and c.cshape=#cshape#</isNotNull>
+			and 1 = case when c.retime = '2099-12-31 23:59:59' and  lect.stime is not null then 0 else 1 end
+			group by a.payno,a.isgroup,a.pstatus,a.rstatus
+			,b.pino,b.ptype,b.pcno,b.itemno,b.userno,b.pstatus,b.rstatus,b.isrebate
+			,c.cname,c.classno,c.rstime,c.retime,c.sstime,c.setime,c.cshape
+			,cc.cname
+			,d.tyear,d.tseq
+			,u.username
+			,ua.asname
+			,uc.cname
+			,u.email
+			,lect.cmisno
+			,cmis.estart,cmis.eend
+			order by sortpstatus, c.retime, a.payno,b.pino
+		
         </select>
         <update id="pay.paycancel" parameterClass="hashtable">
             update pay set <include refid="sql.up"></include>
@@ -953,8 +959,13 @@
             order by d.rfdno,b.rstatus,ispast,b.pino
         </select>
         <insert id="pay.payrfd.in" parameterClass="payrfd">
-            delete from payrfd where payno=#payno#;
-            insert into payrfd(payno,rtext,bankname,bankno,bankowner,isowner,rstatus,ruser,rphone,rreason,fgnor,fgnob,ramt,<include refid="sql.inc"></include>)
+			<!--자식 테이블 지우기-->
+			delete from payrfditem
+			where rfdno in (select rfdno from payrfd where payno =#payno#);
+			<!--부모 테이블 지우기-->
+			delete from payrfd where payno=#payno#;
+			<!--부모 테이블 환불 저장-->
+			insert into payrfd(payno,rtext,bankname,bankno,bankowner,isowner,rstatus,ruser,rphone,rreason,fgnor,fgnob,ramt,<include refid="sql.inc"></include>)
             select distinct #payno#,#rtext#,#bankname#
                 ,HEX(AES_ENCRYPT(#bankno#, <include refid="sql.digest"></include>))
                 ,#bankowner#,#isowner#,#rstatus#,#ruser#
diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs
index 2ca2e73..c4ff613 100644
--- a/FO/Controllers/CourseController.cs
+++ b/FO/Controllers/CourseController.cs
@@ -943,7 +943,7 @@ namespace NP.FO.Controllers
             foreach (var item in cmInningscdTmp)
             {
                 vm.SelectCMInningscd = item;
-                if (item.studyplace != null)
+                if (vm.CM.cshape == 1)
                 {
                     item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
                 }
@@ -1032,7 +1032,7 @@ namespace NP.FO.Controllers
             foreach (var item in cmInningscdTmp)
             {
                 vm.SelectCMInningscd = item;
-                if (item.studyplace != null)
+                if (vm.CM.cshape == 1)
                 {
                     item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
                 }
@@ -1189,7 +1189,7 @@ namespace NP.FO.Controllers
             foreach (var item in cmInningscdTmp)
             {
                 vm.SelectCMInningscd = item;
-                if (item.studyplace != null)
+                if (vm.CM.cshape == 1)
                 {
                     item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
                 }
@@ -1245,7 +1245,7 @@ namespace NP.FO.Controllers
             foreach (var item in cmInningscdTmp)
             {
                 vm.SelectCMInningscd = item;
-                if (item.studyplace != null)
+                if (vm.CM.cshape == 1)
                 {
                     item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
                 }
diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs
index 07ad682..deb74c4 100644
--- a/FO/Controllers/FOBaseController.cs
+++ b/FO/Controllers/FOBaseController.cs
@@ -797,7 +797,7 @@ namespace NP.FO.Controllers
             foreach (var item in cmInningscdTmp)
             {
                 vm.SelectCMInningscd = item;
-                if (item.studyplace != null)
+                if (vm.CM.cshape == 1)
                 {
                     item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
                 }
diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs
index aca500b..43198c4 100644
--- a/FO/Controllers/MyController.cs
+++ b/FO/Controllers/MyController.cs
@@ -48,6 +48,40 @@ namespace NP.FO.Controllers
                 //신청중인강좌 없고 고객사사이트가 아니면 수강완료한 강좌 중 후행과정 -> 선행과정 -> 직급추천과정 2개 출력
                 vm.CMs = Dao.Get<CM>("lect.myrecomm", SUserInfo.UserNo);
             }
+            //20220803 
+            vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } });
+
+            foreach (var item in vm.Datas)
+            {
+                //time5 = lect.sdate / time6 = lect.edate / pstatus=intval4
+                if (item.intval4 == 22) 
+                {
+                    item.lectStatus = "미입금";
+                }
+                else
+                {
+                    // 입금상태
+                    if(item.time5 > DateTime.Now)
+                    {
+                        item.lectStatus = "입교확정";
+                    }
+                    else if(item.time5 <= DateTime.Now && item.time2 >= DateTime.Now )
+                    {
+                        item.lectStatus = "교육진행중";
+                    }
+                    /*else if (item.time6 < DateTime.Now)
+                    {
+                        if (item.iscomplete == null || item.iscomplete == 0)
+                        {
+                            item.lectStatus = "미수료";
+                        }
+                        else
+                        {
+                            item.lectStatus = "수료";
+                        }
+                    }*/
+                }
+            }
             return View(vm);
         }
         public ActionResult BoardList(VMCC vm)
@@ -138,7 +172,7 @@ namespace NP.FO.Controllers
         }
         public ActionResult Ready(VMMy vm)
         {
-            vm.PIs = Dao.Get<PayItem>("pay.mypayitems", new System.Collections.Hashtable() { {"userno", SUserInfo.UserNo } });
+            vm.PIs = Dao.Get<PayItem>("pay.mypayitems", new System.Collections.Hashtable() { {"userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } });
             return View(vm);
         }
         public ActionResult ReadyPay(VMPay vm)
@@ -163,16 +197,60 @@ namespace NP.FO.Controllers
             hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
             hsData.Add("cshape", vm.stringval);
             vm.Lects = Dao.Get<Lect>("lect.mylectures", hsData);   
+
+            foreach (var item in vm.Lects)
+            {
+                if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now)
+                {
+                    item.lectStatus = "미수료";
+                }
+                else if (item.iscomplete == 1 && item.edate < DateTime.Now)
+                {
+                    item.lectStatus = "수료";
+                }
+                else if (item.sdate > DateTime.Now)
+                {
+                    item.lectStatus = "입교확정";
+                }
+                else if (item.sdate <= DateTime.Now)
+                {
+                    item.lectStatus = "교육진행중";
+                }
+            }
+            
             return View(vm);
         }
         public ActionResult LectureOn(VMMy vm)
         {
+            vm.cmm = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable()).FirstOrDefault();
             Hashtable hsData = new Hashtable();
             hsData.Add("userno", SUserInfo.UserNo);
             hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
             //hsData.Add("cshape", 2);
-            hsData.Add("issubtable", 1);            
+            hsData.Add("issubtable", 1);
             vm.Lects = Dao.Get<Lect>("lect.mylectures", hsData);
+            
+
+            foreach (var item in vm.Lects)
+            {
+                if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now)
+                {
+                    item.lectStatus = "미수료";
+                }
+                else if (item.iscomplete == 1 && item.edate < DateTime.Now)
+                {
+                    item.lectStatus = "수료";
+                }
+                else if (item.sdate > DateTime.Now)
+                {
+                    item.lectStatus = "입교확정";
+                }
+                else if (item.sdate <= DateTime.Now)
+                {
+                    item.lectStatus = "교육진행중";
+                }
+            }
+            
             return View(vm);
         }
         public ActionResult CertPrint(VMMy vm)
@@ -473,6 +551,32 @@ namespace NP.FO.Controllers
                 vm.Lects = Dao.Get<Lect>("lect.lecture.document.past", ht);
 
             }
+            
+            foreach (var item in vm.Lects)
+            {
+                if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now)
+                {
+                    item.lectStatus = "미수료";
+                }
+                else if (item.iscomplete == 1 && item.edate < DateTime.Now)
+                {
+                    item.lectStatus = "수료";
+                }
+                else if (/*item.sdate == null &&*/ item.pstatus == 22)
+                {
+                    item.lectStatus = "미입금";
+                }
+                else if (item.sdate > DateTime.Now)
+                {
+                    item.lectStatus = "입교확정";
+                }
+                else if (item.sdate <= DateTime.Now)
+                {
+                    item.lectStatus = "교육진행중";
+                }
+             
+            }
+            
             return View(vm);
         }
     }
diff --git a/FO/Views/CRoom/Boards.cshtml b/FO/Views/CRoom/Boards.cshtml
index 1bd8a84..9f8f9b7 100644
--- a/FO/Views/CRoom/Boards.cshtml
+++ b/FO/Views/CRoom/Boards.cshtml
@@ -17,14 +17,14 @@
     <dl class="faqList">
         @foreach (var b in Model.Boards.Where(w => w.pbno == null))
         {
-            <dt>
+            <dd>
                 <table>
                     <tr>
                         <th>Q.</th>
                         <td>@Html.Raw(b.subject ?? "")</td>
                     </tr>
                 </table>
-            </dt>
+            </dd>
             <dd>
                 <table>
                     <tr>
@@ -55,8 +55,10 @@ else
     }
 
     <table class="notiList">
+       
         @foreach (var b in Model.Boards)
         {
+            if (ViewBag.SSUserNo == b.cno) { 
             <tr class="@(b.istop == 1 ? "visit" : "") @(b.pbno == null ? "" : "reply")">
                 <th>
                     <a href="#" onclick="gov(@b.bno, @b.cno, @b.issecr,@b.pcno )">
@@ -73,6 +75,7 @@ else
                     </dl>
                 </td>
             </tr>
+            }
         }
     </table>
     if (Model.BM.bmtype > 0)
diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml
index 8b48e03..082c495 100644
--- a/FO/Views/Course/ApplyAgree.cshtml
+++ b/FO/Views/Course/ApplyAgree.cshtml
@@ -17,31 +17,43 @@
     <input type="hidden" name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
     <input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
     <h4 class="clsTitle">신청강좌</h4>
-    <ul class="smtList mt0">
+    <ul class="smtList mt0" style="font-weight:500;">
         <li>
             <ul class="smtlChk">
                 <li>
-                    <span class="cshapelabel">
-                        @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
-                    </span>
-                    @{
-                        string strStudyPlaceTmp = "";
-                        if (Model.SelectCMInningscd.studyplace != null)
-                        {
-                            strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname);
-                        }
-                        else
-                        {
-                            strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
-                        }
-
-                        //Model.SelectCMInningscd.eend2 교육종료일
-                        string strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span>| 교육비 {4}원",
+                    <p>
+                        <span class="@(Model.CM.cshape == 0 ? "org" : Model.CM.cshape == 1 ? "nav_grn" : "nav_blu")">
+                            @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
+                        </span>
+                        @{
+                            string strStudyPlaceTmp = "";
+                            string strStudyPlaceTmp2 = "";
+                            string strEduInfo = "";
+                            if (Model.SelectCMInningscd.studyplace != null)
+                            {
+                                strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename);
+                                strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname);
+                            }
+                            else
+                            {
+                                strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
+                            }
+                            if (Model.CM.cshape == 1)
+                            {
+                                strEduInfo = string.Format("교육기간 {0} | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
                                 Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
-                    }
 
-                    <span style="font-size:22px"><label>@strStudyPlaceTmp</label></span>
-                    <p><label>@Html.Raw(strEduInfo)</label></p>
+                            }
+                            else
+                            {
+                                //Model.SelectCMInningscd.eend2 교육종료일
+                                strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
+                                                       Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
+                            } }
+
+                        <span style="font-size:22px"><label>@Html.Raw("<span class=\"blu\">" + strStudyPlaceTmp + "</span>") @strStudyPlaceTmp2</label></span><br />
+                        <span><label>@Html.Raw(strEduInfo)</label></span>
+                    </p>
                 </li>
             </ul>
             <div class="apyCost">
@@ -120,13 +132,17 @@
         </table>
     }
     <p class="subTxt">
-        <span style="color:red;">※ 반드시 확인하세요</span><br />
-        - 실제 이수해야 할 내용과 신청내용이 다른 경우 <span style="color:red;">교육인정 및 수정이 불가능</span> 하오니 정확하게 확인 해주세요.<br />
-        - 상기 신청내용의 등급이 <span style="color:red;">직무분야의 등급으로 맞게 기재되어 있는지 확인해주세요.</span>(전문분야 등급 아님)<br />
-        - 건설사업관리기술인은 <span style="color:red;">감리업무를 수행하는 기술인</span>을 말합니다.<br />
-        - 승급교육일 경우 등급은 <span style="color:red;">승급 후 등급이 기재되어야</span> 하며 승급대상 여부 등을 반드시 협회로 확인 해주세요.<br />
-        - 승급교육 또는 계속교육을 인정받으려면 <span style="color:red;">기본교육 및 최초교육을 먼저 이수하여야 합니다.</span><br />
-    </p>
+        <strong>
+            <br />
+            <span style="color:red; font-size:18px;"><strong>※ 반드시 확인하세요</strong></span><br />
+            - 실제 이수해야 할 내용과 신청내용이 다른 경우 <span style="color:red;">교육인정 및 수정이 불가능</span> 하오니 정확하게 확인 해주세요.<br />
+            - 상기 신청내용의 등급이 <span style="color:red;">직무분야의 등급으로 맞게 기재되어 있는지 확인해주세요.</span>(전문분야 등급 아님)<br />
+            - 건설사업관리기술인은 <span style="color:red;">감리업무를 수행하는 기술인</span>을 말합니다.<br />
+            - 승급교육일 경우 등급은 <span style="color:red;">승급 후 등급이 기재되어야</span> 하며 승급대상 여부 등을 반드시 협회로 확인 해주세요.<br />
+            - 승급교육 또는 계속교육을 인정받으려면 <span style="color:red;">기본교육 및 최초교육을 먼저 이수하여야 합니다.</span><br />
+            - 모든 최초,승급,계속 교육 등은 직무분야 교육이며<span style="color:red;">전문분야 관련으로 따로 이수하여야 할 교육은 없습니다.
+        </strong>
+     </p>
 
     @if (Model.CM.cshape == 1)
     {
@@ -158,7 +174,7 @@
 
             <span class="subTxt red">※ 위 4가지 조건 모두 만족하셔야 수료가 가능합니다.</span><br />
             <span class="subTxt red">※ 하루 최대 학습 시간은 10차시 입니다.</span><br />
-            <span style="font-size:15pt;">※ 현재 코로나로 인하여 기존 <span style="color:red;">(동영상강의 시청 27시간 + 현장집체7시간 참석)</span>에서 한시적으로 <span style="color:red;">(동영상강의 시청 35시간)으로 진행합니다.</span></span>
+            <span style="font-size:15pt;">※ 현재 코로나로 인하여 기존 <span style="color:red;">(동영상강의 시청 28시간 + 현장집체7시간 참석)</span>에서 한시적으로 <span style="color:red;">(동영상강의 시청 35시간)으로 진행합니다.</span></span>
             @*※ 국토부 장관이 인정하는 사유로 집체교육을 실시 하지 못할 시 에는 동영상강의로 대체되며 7시간을 100% 이수하셔야 수료가 가능합니다.<br />*@
         </p>
 
diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml
index b5f05b4..06e02ad 100644
--- a/FO/Views/Course/ApplyComplete.cshtml
+++ b/FO/Views/Course/ApplyComplete.cshtml
@@ -19,30 +19,43 @@ else
     
     var isallday = !string.IsNullOrEmpty(Model.CM.retimeymd) ? (Model.CM.retimeymd == "2099-12-31" ? true : false) : false;
     <h4 class="clsTitle">신청강좌</h4>
-    <ul class="smtList mt0">
+    <ul class="smtList mt0" style="font-weight:500;">
         <li>
             <ul class="smtlChk">
                 <li>
-                    <span class="cshapelabel">
-                        @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
-                    </span>
-                    @{
-                        string strStudyPlaceTmp = "";
-                        if (Model.SelectCMInningscd.studyplace != null)
-                        {
-                            strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname);
-                        }
-                        else
-                        {
-                            strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
-                        }
-
-                        //Model.SelectCMInningscd.eend2 교육종료일
-                        string strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span>| 교육비 {4}원",
+                    <p>
+                        <span class="@(Model.CM.cshape == 0 ? "org" : Model.CM.cshape == 1 ? "nav_grn" : "nav_blu")">
+                            @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
+                        </span>
+                        @{
+                            string strStudyPlaceTmp = "";
+                            string strStudyPlaceTmp2 = "";
+                            string strEduInfo = "";
+                            if (Model.SelectCMInningscd.studyplace != null)
+                            {
+                                strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename);
+                                strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname);
+                            }
+                            else
+                            {
+                                strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
+                            }
+                            if (Model.CM.cshape == 1)
+                            {
+                                strEduInfo = string.Format("교육기간 {0} | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
                                 Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
-                    }
-                    <span style="font-size:22px"><label>@strStudyPlaceTmp</label></span>
-                    <p><label>@Html.Raw(strEduInfo)</label></p>
+
+                            }
+                            else
+                            {
+                                //Model.SelectCMInningscd.eend2 교육종료일
+                                strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
+                                                       Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
+                            }
+                        }
+                        <span style="font-size:22px"><label>@Html.Raw("<span class=\"blu\">" + strStudyPlaceTmp + "</span>") @strStudyPlaceTmp2</label></span><br />
+<p><label>@Html.Raw(strEduInfo)</label></p>
+                    </p>
                 </li>
             </ul>
             <div class="apyCost">
diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml
index 94c4758..e30a91c 100644
--- a/FO/Views/Course/ApplyEdu.cshtml
+++ b/FO/Views/Course/ApplyEdu.cshtml
@@ -30,31 +30,44 @@
     <input type="hidden" name="applicableCM" id="applicableCM" />
     <input type="hidden" name="cshape" id="cshape" value="@Model.CM.cshape" />
     <h4 class="clsTitle">신청강좌</h4>
-    <ul class="smtList mt0">
+    <ul class="smtList mt0" style="font-weight:500;">
         <li>
             <ul class="smtlChk" style="padding-left:0px;">
                 <li>
-                    <span class="cshapelabel">
-                        @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
-                    </span>
-                    @{
-                        string strStudyPlaceTmp = "";
-                        if (Model.SelectCMInningscd.studyplace != null)
-                        {
-                            strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname);
-                        }
-                        else
-                        {
-                            strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
-                        }
 
-                        //Model.SelectCMInningscd.eend2 교육종료일
-                        string strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span>| 교육비 {4}원",
+                    <p>
+                        <span class="@(Model.CM.cshape == 0 ? "org" : Model.CM.cshape == 1 ? "nav_grn" : "nav_blu")">
+                            @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
+                        </span>
+                        @{
+                            string strStudyPlaceTmp = "";
+                            string strStudyPlaceTmp2 = "";
+                            string strEduInfo = "";
+                            if (Model.SelectCMInningscd.studyplace != null)
+                            {
+                                strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename);
+                                strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname);
+                            }
+                            else
+                            {
+                                strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
+                            }
+                            if (Model.CM.cshape == 1)
+                            {
+                                strEduInfo = string.Format("교육기간 {0} | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
                                 Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
-                    }
 
-                    <span style="font-size:22px"><label>@strStudyPlaceTmp</label></span>
-                    <p><label>@Html.Raw(strEduInfo)</label></p>
+                            }else {
+                                //Model.SelectCMInningscd.eend2 교육종료일
+                                strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
+                                Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
+                            }
+                          }
+
+
+                        <span style="font-size:22px"><label>@Html.Raw("<span class=\"blu\">"+strStudyPlaceTmp+"</span>") @strStudyPlaceTmp2</label></span><br />
+                         <span><label>@Html.Raw(strEduInfo)</label></span>
+                    </p>
                 </li>
             </ul>
             <div class="apyCost">
@@ -83,7 +96,7 @@
 
     @if (Model.CM.isaccommodation == 1 && Model.SelectCMInningscd.studyplace == "19")
     {
-        <h4 class="clsTitle">합숙여부 <span style="color:red;">(영천교육장만 합숙가능)</span> </h4>
+        <h4 class="clsTitle">합숙여부 <span style="color:red; font-weight:700;">(영천교육장만 합숙가능)</span> </h4>
         <ul class="bakRadio">
             <li>
                 <input type="radio" name="isaccommodation" id="isaccommodation1" value="1" /><label for="isaccommodation1"> 예 (<span id="spnaccommofee"></span>원 추가)</label>
@@ -96,7 +109,7 @@
 
     @if (Model.CM.isrefund == 1)
     {
-        <h4 class="clsTitle">환급여부선택<span> (고용보험 가입자만 환급가능)</span></h4>
+        <h4 class="clsTitle">환급여부선택<span style="color:red; font-weight:700;"> (고용보험 가입자만 환급가능)</span></h4>
         <table class="clsTable">
             <tbody>
                 <tr>
@@ -137,25 +150,25 @@
     @if (Model.CM.isrefund == 1)
     {
     <div class="div-rbankInfo">
-        <h4 class="clsTitle">환급금 수령계좌 등록<span style="color:red;">  (법인계좌만 입력가능)</span></h4>
+        <h4 class="clsTitle">환급금 수령계좌 등록<span style="color: red; font-weight: 700;">  (법인계좌만 입력가능)</span></h4>
         <p class="subDsc">*는 필수 입력사항입니다.</p>
         <table class="clsTable">
             <tbody>
                 <tr>
                     <th class="req">은행명</th>
-                    <td><input type="text" name="rbankname" id="rbankname" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankname : string.Empty)" /></td>
+                    <td><input type="text" name="rbankname" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankname" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankname : string.Empty)" /></td>
                 </tr>
                 <tr>
                     <th class="req">계좌번호</th>
-                    <td><input type="text" name="rbankacc" id="rbankacc" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankacc : string.Empty)" /></td>
+                    <td><input type="text" name="rbankacc" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankacc" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankacc : string.Empty)" /></td>
                 </tr>
                 <tr>
                     <th class="req">예금주</th>
-                    <td><input type="text" name="rbankowner" id="rbankowner" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankowner : string.Empty)" /></td>
+                    <td><input type="text" name="rbankowner" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankowner" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankowner : string.Empty)" /></td>
                 </tr>
                 <tr>
                     <th class="req">고용보험관리번호</th>
-                    <td><input type="text" name="eino" id="eino" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.eino : string.Empty)" /><button type="button" onclick="insuranceguide()" style="margin-left:10px;">고용보험관리번호 안내</button></td>
+                    <td><input type="text" name="eino" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="eino" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.eino : string.Empty)" /><button type="button" onclick="insuranceguide()" style="margin-left:10px;">고용보험관리번호 안내</button></td>
                 </tr>
             </tbody>
         </table>
@@ -389,6 +402,11 @@
     @Html.Partial("./Partial/filescript")
 }
 <script type="text/javascript">
+   
+    function checkSpacebar() {
+        var kcode = event.keyCode;
+        if (kcode == 32) event.returnValue = false
+    }
     function insuranceguide() {
       
         msg("<span style='font-size:17pt;'>고용보험관리번호</span></br></br><span style='text-align: left; margin:auto; display: inherit;'>- 회사 마다 사업자등록번호 처럼 부여되어 있는 번호 이며 11자리 숫자로 보통 사업자등록번호 뒤에 0이나 6이 붙는 경우가 많습니다.(다른 형식인 경우도 있음)</span></br><span style='text-align: left; margin:auto; display: inherit;'>- 교육원에서 환급금 신청 목적으로 노동부 전산망에 교육생 등록을 할 때 필요한 번호 입니다. 따라서 <span style='color:red'>본인이 소속된 회사의 고용보험관리번호를 기재하시면 됩니다.</span></br></br><spanstyle='text-align: left; margin:auto; display: inherit;'> - 고용보험관리번호는 일반적으로 회사 내 고용보험 담당자가 알고 있습니다.</span>");
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index 123f45b..3bd5c75 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -34,31 +34,44 @@
     <input type="hidden" name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
     <input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
     <h4 class="clsTitle">신청강좌</h4>
-    <ul class="smtList mt0">
+    <ul class="smtList mt0" style="font-weight:500;">
         <li>
             <ul class="smtlChk">
                 <li>
-                    <span class="cshapelabel">
-                        @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
-                    </span>
-                    @{
-                        string strStudyPlaceTmp = "";
-                        if (Model.SelectCMInningscd.studyplace != null)
-                        {
-                            strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname);
-                        }
-                        else
-                        {
-                            strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
-                        }
-
-                        //Model.SelectCMInningscd.eend2 교육종료일
-                        string strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span>| 교육비 {4}원",
+                    <p>
+                        <span class="@(Model.CM.cshape == 0 ? "org" : Model.CM.cshape == 1 ? "nav_grn" : "nav_blu")">
+                            @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
+                        </span>
+                        @{
+                            string strStudyPlaceTmp = "";
+                            string strStudyPlaceTmp2 = "";
+                            string strEduInfo = "";
+                            if (Model.SelectCMInningscd.studyplace != null)
+                            {
+                                strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename);
+                                strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname);
+                            }
+                            else
+                            {
+                                strStudyPlaceTmp = string.Format("{0}", Model.CM.cname);
+                            }
+                            if (Model.CM.cshape == 1)
+                            {
+                                strEduInfo = string.Format("교육기간 {0} | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
                                 Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
-                    }
 
-                    <span style="font-size:22px"><label>@strStudyPlaceTmp</label></span>
-                    <p><label>@Html.Raw(strEduInfo)</label></p>
+                            }
+                            else
+                            {
+                                //Model.SelectCMInningscd.eend2 교육종료일
+                                strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
+                                                       Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
+                            }
+                        }
+
+                        <span style="font-size:22px"><label>@Html.Raw("<span class=\"blu\">" + strStudyPlaceTmp + "</span>") @strStudyPlaceTmp2</label></span><br />
+                        <span><label>@Html.Raw(strEduInfo)</label></span>
+                    </p>
                 </li>
             </ul>
             <div class="apyCost">
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index 8ea7501..040b87e 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -88,13 +88,18 @@
                         </em>
                         @*<span style="font-size:22px">@($"{item.cname} | {item.studytime}시간과정 | 교육비{item.infee}")</span></h5>*@
                         @{
-                            string strTitle =string.Format("{0} | {1} 시간과정 |<span style='color:red;'> {2}과정 </span> | 교육비 {3}원", item.cname, item.studytime, (item.isrefund == 1 ? "환급" : "비환급"), item.infee.ToString("#,0"));
+                                    string strTitle =string.Format("{0} | {1}시간과정 |<span  class='red' style='vertical-align: initial;'> {2}과정 </span>", item.cname, item.studytime, (item.isrefund == 1 ? "환급" : "비환급"), item.infee.ToString("#,0"));
                         }
                         <span style="font-size:22px">@Html.Raw(strTitle)</span>
                     </h5>
                     <ul class="smtlBtn">
-                        <li style="font-size:18px;"><a href="#" class="smtlBtn02" id="btnIntro" onclick="javascript: openIntro(@item.cmno)">강좌소개</a></li>
-                        <li style="font-size:18px;"><a href="#" class="smtlBtn02" id=@("btnSelect" + item.cmno) onclick="javascript: getCmInning(@item.cshape, @item.cmno)">조회하기</a></li>
+                        <li>
+                            <a onclick="javascript: openIntro(362);" class="smtlChkBtn smtlChk01" style="right:130px;">강좌소개</a>
+                        </li>                    
+                            @*<li style="font-size:18px;"><a href="#" class="smtlBtn02" id="btnIntro" onclick="javascript: openIntro(@item.cmno)">강좌소개</a></li>*@
+                        <li>
+                            <a href="#" class="smtlBtn02 smtlChkBtn" id=@("btnSelect" + item.cmno) onclick="javascript: getCmInning(@item.cshape, @item.cmno)">일정조회</a>
+                        </li>
                     </ul>
                 </div>
 
@@ -112,7 +117,7 @@
                     }*@
 
                 @*20220728온라인/오프라인 안내*@
-                <div id="divInfo_@item.cmno">
+                <div id="divInfo_@item.cmno"class="smtlChk" >
                 </div>
 
                 @*20220728교육 영역*@
@@ -120,7 +125,7 @@
                 </ul>
 
                 @*20220728교육일정 영역*@
-                <div id=@("divScd"+ @item.cmno)>
+                <div id=@("divScd"+ @item.cmno) class="smtlChk">
                 </div>
                 <input type="hidden" id="pcmno_@(item.cmno)_cgcode" value="@(item.cgcode)" />
                 <ul class="smtlChk" id="ulSubCm_@item.cmno"></ul>
@@ -339,7 +344,7 @@
         var divPlace = $("#divPlace_" + cmno);
         var divScd = $("#divScd" + cmno);
 
-        if (btnSelect.html() == '조회하기') {
+        if (btnSelect.html() == '일정조회') {
             btnSelect.html('조회닫기');
             //capp("/focommon/GetScdForMixEdu", { cmno: model.cm.cmno, month: $("#selMonth").val() }, "renderScd");
             //교육일정에 등록되어 있는 일정 중 선택이 가능한 첫번째 일정 선택으로 달 파라미터 제거
@@ -350,7 +355,7 @@
             divPlace.empty();
             divPlace.hide();
             divScd.empty();
-            btnSelect.html('조회하기');
+            btnSelect.html('일정조회');
         }
     }
 
@@ -364,7 +369,7 @@
         var divScd = $("#divScd" + cmno);
 
         if (job == 1) {
-            
+
             divInfo.empty();
             divPlace.empty();
 
@@ -381,7 +386,7 @@
                     "<span style='color:red'>온라인 35시간 교육입니다.<br>" +
                     "※ 선택한 교육종료일까지 수료조건을 만족하시면 그 다음날 오후 3시 이후에 수료증 출력이 가능합니다.<br>" +
                     "※ 교육비 입금과 동시에 동영상강의 시청이 가능합니다." +
-                    "</span></p>";
+                    "</span></p><br><span class='clsTitle'>교육종료일을 선택하여 주세요.</span>";
             }
             divInfo.append(strTmp);
 
@@ -414,9 +419,9 @@
 
                 if (studyPlace.length > 0) {
                     /*strStudyPlaceTag = "<ul class='smtlTab' id='divPlace_" + cmno + "'>";*/
-                    strStudyPlaceTag = "<li class='current' onclick='javascript:setStudyplace(this," + cmno + ");'><a href='javascript:getCmInningPlace(" + cshape + ", " + cmno + ");'>전체</a></li>";
+                    strStudyPlaceTag = "<li class='current' onclick='javascript:setStudyplace(this," + cmno + ");'><a href='javascript:getCmInningPlace(" + cshape + ", " + cmno + ");' style='font-size:20px;'>전체</a></li>";
                     $.each(studyPlace, function (i, d) {
-                        strStudyPlaceTag += "<li onclick='javascript:setStudyplace(this," + cmno + ");'><a href='javascript:getCmInningPlace(" + cshape + ", " + cmno + ", " + d.studyplace + ");'>" + d.studyplacename + " 교육장</a></li>";
+                        strStudyPlaceTag += "<li onclick='javascript:setStudyplace(this," + cmno + ");'><a href='javascript:getCmInningPlace(" + cshape + ", " + cmno + ", " + d.studyplace + ");'style='font-size:20px;'>" + d.studyplacename + " 교육장</a></li>";
                     });
                 }
             }
@@ -448,7 +453,8 @@
             var pData = $("<p />");
             var aApplyClass = $("<a />", { "onclick": "javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ");" });
             /*var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03", "style": "font-size:18px" });*/
-            var spanApplyClass = $("<span />", { "style": "font-size:18px" });
+            var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03" }, { "style": "font-size:18px" });
+            var spanApplyClassN = $("<span />", { "class": "smtlChkBtn smtlChk05" }, { "style": "font-size:18px" });
             var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' ";
             /*var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ") + "' ";*/
             var strStudyPlacename = "";
@@ -457,24 +463,27 @@
             }
 
             if (d.isEnd == true) {
-                pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
+                pData.html("<label>"+ "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
             }
             else {
                 if (d.quota != 0) {
                     if (d.remainPeople <= 0) {
-                        pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
+                        spanApplyClassN.text("수강신청");
+                        aApplyClass.append(spanApplyClassN);
+                        pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
+                        pData.append(spanApplyClassN);
                     }
                     else {
                         if (d.isselected == 1) {
                             spanApplyClass.text("수강신청");
                             aApplyClass.append(spanApplyClass);
-                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
+                            pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + " checked> " + d.scdInfoSummary + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span></span>");
                             pData.append(aApplyClass);
                         }
                         else {
                             spanApplyClass.text("수강신청");
                             aApplyClass.append(spanApplyClass);
-                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
+                            pData.html("<label>" + "<span style='color:blue'>"+strStudyPlacename+"</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + "'> " + d.scdInfoSummary + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span> " + "</span>");
                             pData.append(aApplyClass);
                         }
                     }
@@ -502,7 +511,7 @@
         } else if ($("#stringval").val() == 1 && $("#stringval3").val() != "") {
             issearchable = true;
         }
-        
+
         if (issearchable) {
             //if (cshape == 1) {
             //    $("#divPlace_" + cmno).show();
@@ -699,10 +708,12 @@
                     span.text("대기접수");
                 }
                 else {
+                    span = $("<span />", { "class": "smtlChkBtn smtlChk02", "style": "font-size:18px" });
                     span.text("수강신청");
                 }
             }
             else {
+                 span = $("<span />", { "class": "smtlChkBtn smtlChk02" ,"style": "font-size:18px" });
                 span.text("수강신청");
             }
 
diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml
index 550e934..432f942 100644
--- a/FO/Views/Home/Index.cshtml
+++ b/FO/Views/Home/Index.cshtml
@@ -299,7 +299,7 @@
 
         $(".msBtn").click(function () {
             if (@ViewBag.SSUserNo <= 0) {
-                msg("로그인 후 진행 할 수 있습니다.");
+                msg("로그인 후 진행 할 수 있습니다.", null, null, null, "location.href='" + '/Account/Index' + "'");
                 return;
             }
             if ($("#liTab1").hasClass("current")) {
diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml
index 1e82a85..ce01d8d 100644
--- a/FO/Views/My/Document.cshtml
+++ b/FO/Views/My/Document.cshtml
@@ -14,10 +14,10 @@
         }
 </style>
 <div class="mpgInfo">
-    <ul> 
-       @* <li>증빙서류는 현금영수증이나 전자계산서 중 하나만 출력할 수 있습니다.</li>
-        <li>환급금 지급내역서는 환급을 신청한 강좌만 출력하실 수 있습니다.</li>*@
-        <li>- 21년 7월1일 전에 수료한 과정은 이전과정 탭에서 확인 가능합니다</li>
+    <ul>
+        @* <li>증빙서류는 현금영수증이나 전자계산서 중 하나만 출력할 수 있습니다.</li>
+            <li>환급금 지급내역서는 환급을 신청한 강좌만 출력하실 수 있습니다.</li>*@
+        <li><strong>- 21년 7월1일 전에 수료한 과정은 <span style="color:red;">이전과정 탭에서 확인</span> 가능합니다</strong></li>
     </ul>
 </div>
 <form id="dform" method="post" action="/My/Document">
@@ -50,25 +50,56 @@
         <tbody>
             @foreach (var item in Model.Lects)
             {
+                string[] arrEduTerm = new string[3];
+                {
+                    arrEduTerm = new string[3];
+                    if (item.sdate != null)
+                    {
+                        arrEduTerm[0] = item.sdate.Value.ToString("yyyy년 MM월 dd일");
+                    }
+                    if (item.edate != null)
+                    {
+                        arrEduTerm[1] = item.edate.Value.ToString("yyyy년 MM월 dd일");
+                    }
+
+                    arrEduTerm[2] = string.Format("{0} ~ {1}", arrEduTerm[0], arrEduTerm[1]);
+                }
                 <tr>
                     <th>
                         <div class="ltaList">
                             <a href="#" style="cursor:default">
                                 <h5>
-                                    <em>@(item.tseq)기</em>
-                                    <span class="nav">@item.cshapename</span>
-                                    @Html.Raw(item.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
+                                    <span class="@(item.cshape == 0 ? "org" : item.cshape == 1 ? "nav_grn" : "nav_blu")">@item.cshapename</span>
+                                    @if (item.studyplace == null)
+                                    {
+                                        <strong style="display:none;">@item.studyplacename 교육장</strong>
+                                    }
+                                    else if (item.studyplace != null)
+                                    {
+                                        <strong>@item.studyplacename 교육장</strong>
+                                    }
                                     <b>@item.cname</b>
                                 </h5>
                                 <dl class="ltaDl">
                                     @if (item.status == 1)
                                     {
-                                        <dd>교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))</dd>
-                                        if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01"))
+                                        <dt class="lectstatus">@item.lectStatus</dt>
+                                        @*if (item.pstatus != 22) { *@
+
+                                        @*<dd>교육기간 : @item.sdate.Value.ToString("yyyy년 MM월 dd일") ~ @(item.edate.Value.ToString("yyyy년 MM월 dd일"))</dd>*@
+                                        <dd>교육기간 : @arrEduTerm[2]</dd>
+                                        <dt></dt>
+                                        @*}*@
+                                        if (item.cshape != 1)
                                         {
-                                            @:| 집체교육일자 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd")))
+                                            <dd style="color:red;">교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))</dd>
+                                            <dt></dt>
                                         }
-                                        <dd>결제금액 : @(item.payamt)원</dd>
+                                        <dt>@item.studytime 시간과정</dt>
+
+                                        @Html.Raw(item.isrebate == 1 ? "<span class=\"grn\" style='color: red;'>환급과정</span>" : "<span class=\"grn\" style='color: red;'>비환급과정</span>")
+
+                                        @*    <dd>결제금액 : @(item.payamt)원</dd>*@
                                     }
                                     else
                                     {
@@ -77,14 +108,36 @@
                                         {
                                             if (item.cshape == 1)
                                             {
-                                            <dd>교육기간 : 상시</dd>
+                                                <dt class="lectstatus">@item.lectStatus</dt>
+                                                @*if (item.pstatus != 22)
+                                                    {*@
+                                                <dd>교육기간 :@arrEduTerm[2]</dd>
+                                                <dt></dt>
+                                                @*}*@
+                                                <dd style="color:red;">교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))</dd>
+                                                <dt></dt>
+                                                <dt>@item.studytime 시간과정</dt>
+
+                                                @Html.Raw(item.isrebate == 1 ? "<span class=\"grn\" style='color: red;'>환급과정</span>" : "<span class=\"grn\" style='color: red;'>비환급과정</span>")
+
                                             }
                                             else
                                             {
-                                            <dd>교육기간 : 상시</dd>
+                                                <dt class="lectstatus">@item.lectStatus</dt>
+                                                @* if (item.pstatus != 22)
+                                                    {*@
+                                                <dd>교육기간 :@arrEduTerm[2]</dd>
+                                                <dt></dt>
+                                                @*}*@
+                                                <dd style="color:red;">교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))</dd>
+                                                <dt></dt>
+                                                <dt>@item.studytime 시간과정</dt>
+
+                                                @Html.Raw(item.isrebate == 1 ? "<span class=\"red\" style='vertical-align: middle;'>환급과정</span>" : "<span class=\"red\" style='vertical-align: middle;'>비환급과정</span>")
+
                                             }
                                         }
-                                        <dd>미결제 : @(item.payamt)원</dd>
+
                                     }
                                 </dl>
                             </a>
@@ -102,13 +155,13 @@
                     </td>
                     <td class="ltaBtn" data-th="입교통지서 : ">
                         @if (item.status == 1 || item.status == 2)
-                        {                            
+                        {
                             <a href="#" onclick="javascript: eduannotation(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
                         }
                         else
                         {
                             @Html.Raw("-")
-                        }                        
+                        }
                     </td>
                     <td class="ltaBtn" data-th="수료증 : ">
                         @if (item.iscomplete == 1 && item.status == 1)
@@ -152,7 +205,8 @@
                                         {
                                             @*<a href="#" onclick="viewtaxinvoice('@(item.payno)')">[인쇄]</a>*@
                                             <a href="#" onclick="msg('요청하신 메일로 확인바랍니다.<br/>감사합니다.')">[계산서발행완료]</a>
-                                        }else if (item.iscancel != 1 && item.taxdate2 != null && item.ischeck == 1)
+                                        }
+                                        else if (item.iscancel != 1 && item.taxdate2 != null && item.ischeck == 1)
                                         {
                                             <a href="#" onclick="msg('요청하신 메일로 확인바랍니다.<br/>감사합니다.')">[계산서발행완료]</a>
                                         }
@@ -162,7 +216,7 @@
                                         }
                                         else
                                         {
-                                            if(item.ischeck == 1)
+                                            if (item.ischeck == 1)
                                             {
                                                 <a href="#" onclick="msg('요청하신 메일로 확인바랍니다.<br/>감사합니다.')">[계산서발행완료]</a>
                                             }
@@ -176,13 +230,13 @@
                                     {
                                         //if (item.payoktime < Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-11"))) /*입금확인후 익월 10일 이내까지 요청가능*/
                                         //{
-                                            <a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>
-                                            @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
+                                        <a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>
+                                        @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
                                         @*}
-                                        else
-                                        {
-                                            <a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
-                                        }*@
+                                            else
+                                            {
+                                                <a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
+                                            }*@
                                     }
                                 }
                             }
@@ -195,7 +249,8 @@
                                 {
                                     @*<a href="#" onclick="viewtaxinvoice('@(item.payno)')">[인쇄]</a>*@
                                     <a href="#" onclick="msg('요청하신 메일로 확인바랍니다.<br/>감사합니다.')">[계산서발행완료]</a>
-                                }else if(item.iscancel != 1 && item.taxdate2 != null && item.ischeck == 1)
+                                }
+                                else if (item.iscancel != 1 && item.taxdate2 != null && item.ischeck == 1)
                                 {
                                     <a href="#" onclick="msg('요청하신 메일로 확인바랍니다.<br/>감사합니다.')">[계산서발행완료]</a>
                                 }
@@ -205,7 +260,7 @@
                                 }
                                 else
                                 {
-                                    if(item.ischeck == 1)
+                                    if (item.ischeck == 1)
                                     {
                                         <a href="#" onclick="msg('요청하신 메일로 확인바랍니다.<br/>감사합니다.')">[계산서발행완료]</a>
                                     }
@@ -302,8 +357,8 @@ else
                                         </ul>
                                     </td>
                                 </tr>
-                                 <tr class="pd5">
-                                     <th>계산서날짜</th>
+                                <tr class="pd5">
+                                    <th>계산서날짜</th>
                                     <td><input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="" autocomplete="off" /></td>
                                 </tr>
                             </table>
@@ -360,9 +415,9 @@ else
                                     </td>
                                 </tr>
                                 @*<tr class="pd5" id="file">
-                                    <th>사업자등록증첨부</th>
-                                    <td><input type="file" name="file1" id="file1" value="" /></td>
-                                </tr>*@
+                                        <th>사업자등록증첨부</th>
+                                        <td><input type="file" name="file1" id="file1" value="" /></td>
+                                    </tr>*@
                                 <tr class="pd5">
                                     <th>기재사항</th>
                                     <td><input type="text" name="taxinfo" id="taxinfo" value="" /></td>
@@ -371,7 +426,7 @@ else
                             <ul class="odrPopBtn col1" id="paytaxbtn">
                                 <li><a href="#" onclick="save()" class="bk">계산서 발행요청</a></li>
                             </ul>
-                        </form>                       
+                        </form>
                     </div><!-- clsPopCont -->
                 </div>
             </div><!-- clsPopWrap -->
@@ -425,16 +480,16 @@ else
                                 <td><input type="text" name="tasaddr" id="tasaddr" disabled value="" /></td>
                             </tr>
                             @*<tr class="pd5" id="file">
-                                <th style="height:51px;">사업자등록증첨부</th>
-                                <td id="tfile" ></td>
-                            </tr>*@
+                                    <th style="height:51px;">사업자등록증첨부</th>
+                                    <td id="tfile" ></td>
+                                </tr>*@
                             <tr class="pd5">
                                 <th>기재사항</th>
                                 <td><input type="text" name="ttaxinfo" id="ttaxinfo" disabled value="" /></td>
                             </tr>
                             <tr class="pd5">
                                 <th style="height:51px;">청구구분</th>
-                                <td >
+                                <td>
                                     <ul class="bakRadio">
                                         <li><input type="radio" name="tisreceipt" id="tisreceipt1" value="1" disabled /><label for="isreceipt1">영수</label></li>
                                         <li><input type="radio" name="tisreceipt" id="tisreceipt0" value="0" disabled /><label for="isreceipts0">청구</label></li>
@@ -464,18 +519,18 @@ else
             text-align: center;
             background: #878787;
             color: #fff;
-            width: 120px; 
+            width: 120px;
             right: 0;
             top: 5px;
-            float:right;
-        } 
+            float: right;
+        }
     </style>
 }
 @section scripts{
     @Html.Partial("./Partial/ScriptPost")
     @Html.Partial("./Partial/ScriptDate")
-<script src="~/js/moment.js"></script>
-<script>
+    <script src="~/js/moment.js"></script>
+    <script>
         function certification(lectno) {
             var pop = window.open('@ViewBag.reporturl/certification.aspx?lectno='+lectno, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
             if (pop == null) {
@@ -646,7 +701,7 @@ else
                     //    $("#tfile").html(file);
                     //}
                     $("input:radio[name='tisreceipt']:radio[value='" + paytax.isreceipt + "']").prop('checked', true);
-                    $("#ttaxdatereq").val(moment(paytax.taxdatereq).isValid() ? moment(paytax.taxdatereq).format('YYYY-MM-DD') : "");                    
+                    $("#ttaxdatereq").val(moment(paytax.taxdatereq).isValid() ? moment(paytax.taxdatereq).format('YYYY-MM-DD') : "");
                     $("#pop2").fadeIn("fast", function () {
                         $(".pop2box").scrollTop(0);
                     });
@@ -664,11 +719,12 @@ else
                 $("#dform").submit();
             }
         }
-</script>
+    </script>
     @if (ViewBag.isPayTest == "1")
     {
         //테스트일 경우
-        <script language="JavaScript" src="https://pgweb.tosspayments.com:7086/WEB_SERVER/js/receipt_link.js"></script>        
+        <script language="JavaScript" src="https://pgweb.tosspayments.com:7086/WEB_SERVER/js/receipt_link.js"></script>
+
     }
     else
     {
diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml
index fb9708c..fcbb428 100644
--- a/FO/Views/My/Index.cshtml
+++ b/FO/Views/My/Index.cshtml
@@ -45,11 +45,11 @@
     <div class="mpgClass">
         <div class="mpgcCont">
             <div class="mpgTitle">
-                <h5>수강 가능한 과정 (입금이 완료되어 교육진행이 가능한 과정입니다.)</h5>
+                <h5>■ 수강 가능한 과정 (입금이 완료되어 교육진행이 가능한 과정입니다.)</h5>
                 <a href="/My/Lecture">더보기</a>
             </div><!-- mpgTitle -->
-            <p class="mpgDesc">※ <span style="color:red;">이미 수료된 과정은 수강과정 메뉴에서</span> 확인 가능합니다.</p>
-            <p class="mpgDesc">※ 교육비 환불 신청은 결제관리 메뉴에서 가능합니다.</p>
+            <p class="mpgDesc">※ <span style="color:red;">이미 수료된 과정은 수강과정 메뉴에서</span> 확인 가능합니다.<br />※ 교육비 환불 신청은 결제관리 메뉴에서 가능합니다.</p>
+
             <ul class="mpgcList">
 
                 @foreach (var d in Model.Datas.Where(w => w.dtype == 2))
@@ -59,20 +59,37 @@
                         <li>
                             <a href="/CRoom/Index?croomlectno=@d.longval" data-cshape=@d.intval3 class="gocroom">
                                 <h5>
-                                    <em>@d.intval-@(d.intval2)기</em>
-                                    <span class="nav">@(d.intval3 == 0 ? "온라인" : d.intval3 == 1 ? "교육장" : "온라인")</span>
-                                    @Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")
+                                    <span  class="@(d.intval3 == 0 ? "org" : d.intval3 == 1 ? "nav_grn" : "nav_blu")">@(d.intval3 == 0 ? "온라인교육" : d.intval3 == 1 ? "교육장교육" : "온라인교육")</span>
+                                    @if (d.studyplace == null)
+                                    {
+                                        <span style="display:none;">@d.studyplacename 교육장</span>
+                                    }
+                                    else if (d.studyplace != null)
+                                    {
+                                        <span style=" font-weight: 400; font-size: 11pt; line-height: 20px; vertical-align: middle; color: #0000ff; background-color: #fff; padding: 0;">@d.studyplacename 교육장</span>
+                                    }
+                                    @* @Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")*@
                                     <b>@d.strval</b>
                                 </h5>
                                 <dl>
-                                    <dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
+                                    @*<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>*@
+                                    @*<dt class="mpglSta@(d.intval5 == 0 && d.intval4 == 1 ? 3 : 1)">@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "미입금" : d.intval4 == 51 ? "심사중" : d.intval4 == 55 ? "승인대기" : "")</dt>*@
+                                   @* <dt class="@(d.pstatus == 1 && d.rfdstatus < 1 ? "ltaDlbk":"ltaDlred")">@(d.pstatus == 55 ? "승인대기" : d.pstatus == 51 ? "심사중" : d.pstatus == 21 ? "결제대기" : d.pstatus == 22 ? "미입금" : d.pstatus == 1 && d.rfdstatus > 0 ? "환불요청" : d.pstatus == 1 ? "결제완료" : d.rstatus == 1 ? "부분환불" : d.rstatus == 2 ? "전액환불" : "-")</dt>*@
+                                   <dt class="mpglSta3">@d.lectStatus</dt>
                                     @*<dt style="color:#888888">교육기간 : @(d.intval3 == 1 ? d.time.ToString("yy-MM-dd") : d.time5.ToString("yy-MM-dd")) ~ @(d.intval3 == 1 ? d.time2.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))</dt>*@
-                                    <dt style="color:#888888">교육기간 : @(d.time.ToString("yy-MM-dd")) ~ @(d.time2.ToString("yy-MM-dd"))</dt>
-                                    <dd>복습기간 : @(d.time2.AddYears(1).ToString("yy-MM-dd"))</dd>
-                                    @if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01"))
+                                    <dt style="color:#888888">교육기간 : @(d.time.ToString("yyyy년 MM월 dd일")) ~ @(d.time2.ToString("yyyy년 MM월 dd일"))</dt>
+                                    @if (d.intval3 != 1)
                                     {
-                                        <dd>집체교육 : @d.time3.ToString("yy/MM/dd")</dd>
+                                        <dt style="color:red;">교육종료일 : @(string.Format("{0}", d.time2.ToString("yyyy년 MM월 dd일")))</dt>
                                     }
+                                    <dt style="color:black;">@d.studytime<span>시간과정</span></dt>
+                                    @Html.Raw(d.intval3 == 1 ? "<span class=\"grn\" style='color: red;'>환급과정</span>" : "<span class=\"grn\" style='color: red;'>비환급과정</span>")
+
+                                    @* <dd>복습기간 : @(d.time2.AddYears(1).ToString("yy-MM-dd"))</dd>*@
+                                    @*  @if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01"))
+        {
+            <dd>집체교육 : @d.time3.ToString("yy/MM/dd")</dd>
+        }*@
                                 </dl>
 
                             </a>
@@ -99,7 +116,7 @@
                             <a href="/Course/@d.cgcode.Replace("Test", "Cert")Detail?cmno=@d.cmno">
                                 <h5>
                                     <em>@(d.tyear)-@(d.tseq)기</em>
-                                    <span class="nav">@(d.cshape == 0 ? "온라인" : d.cshape == 1 ? "교육장" : "온라인")</span>
+                                    <span class="@(d.cshape == 0 ? "org" : d.cshape == 1 ? "nav_grn" : "nav_blu")">@(d.cshape == 0 ? "온라인교육" : d.cshape == 1 ? "교육장교육" : "온라인교육")</span>
                                     @Html.Raw(d.isrefund == 1 ? "<span class=\"grn\">환급</span>" : "")
                                     <b>@d.cname</b>
                                 </h5>
@@ -114,9 +131,9 @@
             </div>
         }
         <div class="mpgcCont">
-            <div class="mpgTitle"><h5>신청중인 과정 (신청되어 있는 과정이며 입금완료 시 수강 중인 과정으로 이동합니다.)</h5><a href="/My/Ready">더보기</a></div>
-            <p class="mpgDesc">※ <span style="color:red;">온라인교육은 입금완료 시 바로 동영상 강의 시청이 가능합니다.</span></p>
-            <p class="mpgDesc">※ 교육신청 취소는 신청과정 메뉴에서 가능 합니다.</p>
+            <div class="mpgTitle"><h5>■ 신청중인 과정 (신청되어 있는 과정이며 입금완료 시 수강 중인 과정으로 이동합니다.)</h5><a href="/My/Ready">더보기</a></div>
+            <p class="mpgDesc">※ <span style="color:red;">온라인교육은 입금완료 시 바로 동영상 강의 시청이 가능합니다.</span><br />※ 교육신청 취소는 신청과정 메뉴에서 가능 합니다.</p>
+            
             <ul class="mpgcList">
                 @foreach (var d in Model.Datas.Where(w => w.dtype == 1))
                 {
@@ -148,18 +165,40 @@
                             }
                             @*<a href="@(d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 1 ? "/CRoom/Index?croomlectno=" + d.longval : d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 0
                                 ? "/My/Ready" : d.intval5 != 1 && d.intval4 == 51 ? "/Course/ApplyPay" : d.intval5 != 1 && d.intval4 == 21 ? "/Course/ApplyPay?payno=" + d.longval2 : "/My/PayInfo?payno=" + d.longval2)" class="gocroom">*@
-                            <a href=@(strUrl) class="gocroom">
+                            <a href="/MY/Paies" data-cshape=@d.intval3 class="gocroom">
                                 <h5>
-                                    <em>@d.intval-@(d.intval2)기</em>
-                                    <span class="nav">@(d.intval3 == 0 ? "온라인" : d.intval3 == 1 ? "교육장" : "온라인")</span>
-                                    @Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")
+                                    <span class="@(d.intval3 == 0 ? "org" : d.intval3 == 1 ? "nav_grn" : "nav_blu")">@(d.intval3 == 0 ? "온라인교육" : d.intval3 == 1 ? "교육장교육" : "온라인교육")</span>
+                                    @if (d.studyplace == null)
+                                    {
+                                        <span style="display:none;">@d.studyplacename 교육장</span>
+                                    }
+                                    else if (d.studyplace != null)
+                                    {
+                                        <span style=" font-weight: 400; font-size: 11pt; line-height: 20px; vertical-align: middle; color: #0000ff; background-color: #fff; padding:0;">@d.studyplacename 교육장</span>
+                                    }
+                                    @* @Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")*@
                                     <b>@d.strval</b>
                                 </h5>
                                 <dl>
-                                    <dt class="mpglSta@(d.intval5 == 0 && d.intval4 == 1 ? 3 : 1)">@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "미입금" : d.intval4 == 51 ? "심사중" : d.intval4 == 55 ? "승인대기" : "")</dt>
-                                    @*<dd>교육기간 : @(d.time2.Year == 2099 ? "결제완료일로부터 "+d.intval9+"일" : (d.intval3 == 1 ? d.time5.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))+ " ~ "+ (d.intval3 == 1 ? d.time6.ToString("yy-MM-dd") : d.time4.ToString("yy-MM-dd")))</dd>*@
-                                    <dd>교육기간 : @(d.time2.Year == 2099 ? "신청일부터 선택한 교육종료일까지" : (d.intval3 == 1 ? d.time5.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))+ " ~ "+ (d.intval3 == 1 ? d.time6.ToString("yy-MM-dd") : d.time4.ToString("yy-MM-dd")))</dd>
+                                    @*<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>*@
+                                    @*<dt>@(d.intval4 == 55 ? "승인대기" : d.intval14 == 51 ? "심사중" : d.intval14 == 21 ? "결제대기" : d.intval14 == 22 ? "미입금" : d.intval14 == 1)</dt>*@
+                                    <dt>@d.lectStatus</dt>
+                                    @*<dt style="color:#888888">교육기간 : @(d.intval3 == 1 ? d.time.ToString("yy-MM-dd") : d.time5.ToString("yy-MM-dd")) ~ @(d.intval3 == 1 ? d.time2.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))</dt>*@
+                                    <dt style="color:#888888">교육기간 : @(d.time.ToString("yyyy년 MM월 dd일")) ~ @(d.time2.ToString("yyyy년 MM월 dd일"))</dt>
+                                    @if (d.intval3 != 1)
+                                    {
+                                        <dt style="color:red;">교육종료일 : @(string.Format("{0}", d.time2.ToString("yyyy년 MM월 dd일")))</dt>
+                                    }
+                                    <dt style="color:black;">@d.studytime<span>시간과정</span></dt>
+                                    @Html.Raw(d.intval3 == 1 ? "<span class=\"grn\" style='color: red;'>환급과정</span>" : "<span class=\"grn\" style='color: red;'>비환급과정</span>")
+
+                                    @* <dd>복습기간 : @(d.time2.AddYears(1).ToString("yy-MM-dd"))</dd>*@
+                                    @*  @if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01"))
+        {
+            <dd>집체교육 : @d.time3.ToString("yy/MM/dd")</dd>
+        }*@
                                 </dl>
+
                             </a>
                         </li>
                         status1CNT++;
diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml
index d794055..f21ba00 100644
--- a/FO/Views/My/Lecture.cshtml
+++ b/FO/Views/My/Lecture.cshtml
@@ -19,11 +19,11 @@
 </style>
 <div class="mpgInfo">			
     <ul>
-        <li> - 2021년 7월 이후 과정 중 <span class="guidepoint">수강이 확정 된 과정</span>을 확인할 수 있습니다.</li>
-        <li> - 2021년 7월 이전 교육과정의 수료증 출력은 <span class="guidepoint">증빙서류출력 메뉴의 이전과정 탭</span>에서 가능합니다.</li>
-        <li> - 결제완료 된 교육을 취소 하실 경우 <span class="guidepoint">결제관리 메뉴에서 환불요청을</span> 해주셔야 합니다.</li>
-        <li> - 교육장교육은 <span class="guidepoint">교육기간 시작일에 교육장으로 입교</span>하시면 됩니다.</li>
-        <li> - 온라인교육은 해당과정 클릭 시 강의장으로 이동되며 <span class="guidepoint">강의 시청이 바로 가능합니다.</span></li>
+        <li  style="font-weight:bold;"> - 2021년 7월 이후 과정 중 <span class="guidepoint">수강이 확정 된 과정</span>을 확인할 수 있습니다.</li>
+        <li style="font-weight:bold;"> - 2021년 7월 이전 교육과정의 수료증 출력은 <span class="guidepoint">증빙서류출력 메뉴의 이전과정 탭</span>에서 가능합니다.</li>
+        <li  style="font-weight:bold;"> - 결제완료 된 교육을 취소 하실 경우 <span class="guidepoint">결제관리 메뉴에서 환불요청을</span> 해주셔야 합니다.</li>
+        <li  style="font-weight:bold;"> - 교육장교육은 <span class="guidepoint">교육기간 시작일에 교육장으로 입교</span>하시면 됩니다.</li>
+        <li  style="font-weight:bold;"> - 온라인교육은 해당과정 클릭 시 강의장으로 이동되며 <span class="guidepoint">강의 시청이 바로 가능합니다.</span></li>
     </ul>
 </div>			    
 <div class="lctQr">
@@ -59,39 +59,34 @@
                     }
                     <a href="@(d.isgroup == 0 || (d.isgroup == 1 && Model.Lects.Where(w=>w.payno == d.payno && w.userno==ViewBag.SSUserNo).Count() > 0) ? string.Format("/CRoom/Index?croomlectno={0}", d.isgroup == 0 ? d.lectno : Model.Lects.Where(w=>w.payno == d.payno && w.userno==ViewBag.SSUserNo).First().lectno, d.cmno) : "#")" @strComplete class="gocroom">
                         <h5>
-                            @if(d.cshape == 1)
+
+                            <span class="@(d.cshape == 0 ? "org" : d.cshape == 1 ? "nav_grn" : "nav_blu")">@d.cshapename</span>
+                            @if (d.studyplace == null)
                             {
-                                <em>@d.tyear-@(d.tseq)기</em>
+                                <strong style="display:none;">@d.studyplacename 교육장</strong>
+                            } else if(d.studyplace != null){
+                                  <strong>@d.studyplacename 교육장</strong>
                             }
-                            <span class="nav">@d.cshapename</span>
-                            @Html.Raw(d.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
-                            <b>@d.cname (@(d.classno))</b>
-                        </h5>
+                                <b>@d.cname (@(d.classno))</b>
+                            </h5>
                         <dl class="ltaDl">
-                            <dt class="@(d.edate > DateTime.Now ? "ltaDlblue" : d.edate.Value.AddYears(1) > DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")</dt>
-                            <dt style="color:#888888">
-                                @*교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))*@
-                                교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))
+                            <dt class="lectstatus">
+                                @d.lectStatus
                             </dt>
-                            @if(d.cshape != 1)
-                            {
-                                <dt style="color:#888888">복습기간 : @(d.edate.Value.AddYears(1).ToString("yy-MM-dd"))까지</dt>
-                            }
-                            @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01"))
-                            {
-                                <dd>@(d.scdtype == 1 ? "교육종료일" : "집체교육일") : @(string.Format("{0}", d.estart.ToString("yy-MM-dd")))</dd>
-                            }
+                            <dt style="color:#888888">
+                                 교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yyyy년 MM월 dd일") , d.edate.Value.ToString("yyyy년 MM월 dd일")))
+                            </dt>
+                                @if (d.cshape != 1) { 
+                                <dd style="color:red;">교육종료일 : @(string.Format("{0}", d.estart.ToString("yyyy년 MM월 dd일")))</dd>
+                                <dt></dt>
+                                }
+                                <dt>@d.studytime 시간과정</dt>
+                                @Html.Raw(d.isrebate == 1 ? "<span class=\"red\" style='vertical-align: middle;'>환급과정</span>" : "<span class=\"red\" style='vertical-align: middle'>비환급과정</span>")
+                             
+                            
                         </dl>
                     </a>
-                    @*@if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01") && d.iscomplete != 1 && Convert.ToDateTime(d.estart) > DateTime.Now)
-                    {
-                        <dl class="ltaDl" style="display:none;">
-                            <dd>
-                                &nbsp;&nbsp;&nbsp;
-                                <input type="button" value="교육일정변경" onclick="javscript:openScd(@d.cmno,@d.lectno);" />
-                            </dd>
-                        </dl>
-                    }*@
+                 
                 </div>
 			</th>
             <td class="ltaBtn" data-th="강의실 : ">
diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml
index ea810c8..9d11bdd 100644
--- a/FO/Views/My/LectureOn.cshtml
+++ b/FO/Views/My/LectureOn.cshtml
@@ -7,7 +7,7 @@
     <p style="color: red; font-size:20px;">※ 온라인교육은 관련 법령에 의해 일일 최대 학습시간이 학습중인 모든 과정에 대하여 10시간(10차시)이오니 일정변경에 참고하시기 바랍니다.</p>
 </div>
 <div style="margin-bottom:20px;">
-    <button onclick="warningdate()">일정변경 시 주의사항</button>
+    <button onclick="warningdate()" class="warningbutton">일정변경 시 주의사항</button>
 </div>
 <table class="lctAply">
 	<thead>
@@ -23,28 +23,34 @@
 			<th>
                 <div class="ltaList">
                     <h5>
-                        @if(d.cshape == 1)
+
+                        <span class="@(d.cshape == 0 ? "org" : d.cshape == 1 ? "nav_grn" : "nav_blu")">@d.cshapename</span>
+                        @if (d.studyplace == null)
                         {
-                            <em>@d.tyear-@(d.tseq)기</em>
+                            <strong style="display:none;">@d.studyplacename 교육장</strong>
                         }
-                        <span class="nav">@d.cshapename</span>
-                        @Html.Raw(d.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
+                        else if (d.studyplace != null)
+                        {
+                            <strong>@d.studyplacename 교육장</strong>
+                        }
+
                         <b>@d.cname (@(d.classno))</b>
                     </h5>
                     <dl class="ltaDl">
-                        <dt class="@(d.edate > DateTime.Now ? "ltaDlblue" : d.edate.Value.AddYears(1) > DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")</dt>
+                        <dt class="lectstatus">
+                            @d.lectStatus
+                        </dt>
                         <dt style="color:#888888">
                             @*교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))*@
-                            교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yy-MM-dd"), d.edate.Value.ToString("yy-MM-dd")))
+                            교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yyyy년 MM월 dd일"), d.edate.Value.ToString("yyyy년 MM월 dd일")))
                         </dt>
-                        @if(d.cshape != 1)
+                        @if (d.cshape != 1)
                         {
-                            <dt style="color:#888888">복습기간 : @(d.edate.Value.AddYears(1).ToString("yy-MM-dd"))까지</dt>
-                        }
-                        @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01"))
-                        {
-                            <dd>@(d.scdtype == 1 ? "교육종료일" : "집체교육일") : @(string.Format("{0}", d.estart.ToString("yy-MM-dd")))</dd>
+                            <dd style="color:red;">교육종료일 : @(string.Format("{0}", d.estart.ToString("yyyy년 MM월 dd일")))</dd>
+                            <dt></dt>
                         }
+                        <dt>@d.studytime 시간과정</dt>
+                        @Html.Raw(d.isrebate == 1 ? "<span class=\"red\" style='vertical-align: middle;'>환급과정</span>" : "<span class=\"red\" style='vertical-align: middle;'>비환급과정</span>")
                     </dl>
                 </div>
 			</th>
@@ -69,7 +75,14 @@
         <div>
             <div class="mpgPopWrap">
                 <div class="mpgPopTitle">
-                    <h5>교육일정변경</h5>
+                     @if (Model.cmm.cshape == 1)
+                        {
+                            <h5>교육장교육 일정변경</h5>
+                        }
+                        else if (Model.cmm.cshape == 2)
+                        {
+                            <h5>교육종료일(수료일자) 변경</h5>
+                        }   
                     <a href="javascript:mpgPopClose();"></a>
                 </div>
                 <div class="mpgPopCont">
@@ -87,11 +100,11 @@
 
 }
 @section scripts{
-<script>
-    function warningdate() {
-        $('#layermessage').width('600');
-        msg("<sapn style='font-size: 15pt; text-align: left; margin:auto; display: inherit;'>■ 일정변경은 같은 교육과정에서만 가능합니다<br><br> - <span style='color:blue;'>일정변경 가능</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문B교육<br><br> -  <span style='color:red;'>일정변경 불가</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문A교육 <br><br>■ 변경 할 일정이  <span style='color:red;'>접수마감</span> 인 경우 해당 일정으로  <span style='color:red;'>변경이 불가능 합니다.</span></span>");
-    }
+    <script>
+        function warningdate() {
+            $('#layermessage')
+            msg("<sapn style='font-size: 15pt; text-align: left; margin:auto; display: inherit;'>■ 일정변경은 같은 교육과정에서만 가능합니다<br><br> - <span style='color:blue;'>일정변경 가능</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문B교육<br><br> -  <span style='color:red;'>일정변경 불가</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문A교육 <br><br>■ 변경 할 일정이  <span style='color:red;'>접수마감</span> 인 경우 해당 일정으로  <span style='color:red;'>변경이 불가능 합니다.</span></span>");
+        }
     var vLectno;
 
     function pc(lectno,userno) {
@@ -103,19 +116,17 @@
     }
     function ps() {
         window.open("/My/CertSet");
-        }
-
+    }
     function openScd(cmno, lectno) {
         vLectno = lectno
         $(".mpgPop").show();
         setScd(cmno);
     }
-
     function setScd(cmno) {
         capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScdInning(" + cmno + ")");
         //20220809
         // capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd");
-        }
+    }
 
     function renderScdInning(cmno) {
         
@@ -151,7 +162,7 @@
             }
 
             if (d.isEnd == true) {
-                pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
+                pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
             }
             else {
                 if (d.quota != 0) {
@@ -162,12 +173,12 @@
                         if (d.isselected == 1) {
                             //spanApplyClass.text("수강신청");
                             //aApplyClass.append(spanApplyClass);
-                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
+                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중]&nbsp;&nbsp;&nbsp; </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
                         }
                         else {
                             //spanApplyClass.text("수강신청");
                             //aApplyClass.append(spanApplyClass);
-                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
+                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] &nbsp;&nbsp;&nbsp;</label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
                             //pData.append(aApplyClass);
                         }
                     }
diff --git a/FO/Views/My/Paies.cshtml b/FO/Views/My/Paies.cshtml
index 695c007..f1d8a82 100644
--- a/FO/Views/My/Paies.cshtml
+++ b/FO/Views/My/Paies.cshtml
@@ -1,6 +1,6 @@
 @model NP.Model.VMPay
 @{
-
+    string className = "";
 }
 <dl class="payTab">
 	<dt>기간별 조회</dt>
@@ -30,6 +30,7 @@
     {
         d = Model.Paies.Where(w => w.payno == payno && w.piptype == 1).FirstOrDefault();
     }
+    className = (d.cshape == 0 ? "org" : d.cshape == 1 ? "nav_grn" : "nav_blu");
 <table class="payTable">
 	<tr class="payTlist">
 		<td>
@@ -40,8 +41,8 @@
 				</dl>
 				<h5>
 					<span class="blu">@(d.piptype == 0 || d.piptype == 4 ? "강좌" : d.piptype == 3 ? "시험" : "교재")</span>
-					@Html.Raw(d.piptype == 0 || d.piptype == 4 ? string.Format("<span class=\"ppl\">{0}</span>", d.cshapename) : "")
-					@Html.Raw((d.piptype == 0 || d.piptype == 4) && d.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
+					@Html.Raw(d.piptype == 0 || d.piptype == 4 ? string.Format("<span class=\"{1}\">{0}</span>", d.cshapename, className) : "")
+					@Html.Raw((d.piptype == 0 || d.piptype == 4) && d.isrebate == 1 ? "<span class=\"grn\">환급과정</span>" : "")
 					<b>@(d.itemname)@(Model.Paies.Where(w => w.payno == payno).Count() > 1 ? (" 외 " + (Model.Paies.Where(w => w.payno == payno).Count() - 1).ToString()+" 건") : "")</b>
 				</h5>
 			</a>
diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml
index 81628a1..0db5723 100644
--- a/FO/Views/My/PayInfo.cshtml
+++ b/FO/Views/My/PayInfo.cshtml
@@ -15,7 +15,7 @@
             <td>
                 <h5>
                     <span class="blu">강좌</span>
-                    <span class="ppl" style="width:auto">@Model.PayItem.cshapename</span>
+                    <span class="@(Model.PayItem.cshape == 0 ? "org" : Model.PayItem.cshape == 1 ? "nav_grn" : "nav_blu")">@Model.PayItem.cshapename</span>
                     @Html.Raw(Model.PayItem.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
                     <b style="color:@(Model.PayItem.pstatus == 22 ? "red" : "")">@Model.PayItem.itemname</b>
                 </h5>
@@ -99,14 +99,18 @@
                     {
                         <label>접수완료</label><label id="rfdDate">(@Model.PayRfd.udt) 서류심사중</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회/취소]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a>
                     }
-                    else if (Model.PayRfd.rstatus == 1 && Model.PayRfd.fgnor != null && (Model.PayRfd.ptype != 3 || (Model.PayRfd.ptype==3 && Model.PayRfd.fgnob != null)))
+                    else if (Model.PayRfd.rstatus == 1 && Model.PayRfd.fgnor != null && (Model.PayRfd.ptype != 3 || (Model.PayRfd.ptype == 3 && Model.PayRfd.fgnob != null)))
                     {
                         <label>환불불가</label><label id="rfdDate">(@Model.PayRfd.udt)</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a>
                     }
                     else if (Model.PayRfd.rstatus == 2 && Model.PayRfd.fgnor != null && (Model.PayRfd.ptype != 3 || (Model.PayRfd.ptype == 3 && Model.PayRfd.fgnob != null)))
                     {
                         <label>환불완료</label><label id="rfdDate">(@Model.PayRfd.udt)</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a>
+                    } else if(Model.PayRfd.rstatus == 1) { 
+                    <label>환불 거절</label>
                     }
+                        
+                        
                 }
             </td>
         </tr>
@@ -634,7 +638,7 @@
             }
         }
         function cancelpay() {
-            confirmtoggle(true, "결제취소는 동일결제 건 모두 취소됩니다.<br />수강신청을 취소하시겠습니까?", "gocancel()");
+            confirmtoggle(true, "수강신청을 취소하시겠습니까?", "gocancel()");
         }
         function gocancel() {
             capp("/fcommon/paycancel", { payno: @Model.Pay.payno}, "cbgogo");
diff --git a/FO/Views/My/Ready.cshtml b/FO/Views/My/Ready.cshtml
index 8eb91b4..f457184 100644
--- a/FO/Views/My/Ready.cshtml
+++ b/FO/Views/My/Ready.cshtml
@@ -18,10 +18,10 @@
 </style>
 <div class="mpgInfo">
     <ul>
-        <li> - 현재 신청한 과정을 확인할 수 있으며 <span style="color:red;">입금완료 시 수강과정 메뉴에서 확인</span> 가능합니다.</li>
-        <li> - 교육신청 취소, 환불신청 및 환불완료 된 과정은 <span style="color: red;">결제관리에서 확인</span> 가능합니다.</li>
+        <li  style="font-weight:bold;"> - 현재 신청한 과정을 확인할 수 있으며 <span style="color:red;">입금완료 시 수강과정 메뉴에서 확인</span> 가능합니다.</li>
+        <li  style="font-weight:bold;"> - 교육신청 취소, 환불신청 및 환불완료 된 과정은 <span style="color: red;">결제관리에서 확인</span> 가능합니다.</li>
         <li>&nbsp;</li>
-        <li>
+        <li  style="font-weight:bold;">
             ■ 교육비 입금기한<br />
 
             - 교육장교육 :  교육시작 7일 전까지 입금<br />
@@ -53,13 +53,17 @@
                     <div class="ltaList">
                         <a href="#" style="cursor: default">
                             <h5>
-                                <em>@d.tyear-@(d.tseq)기</em>
-                                <span class="nav">@d.cshapename</span>
-                                @if (d.studyplacename != null)
+
+                                <span class="@(d.cshape == 0 ? "org" : d.cshape == 1 ? "nav_grn" : "nav_blu")">@d.cshapename</span>
+                                @if (d.studyplace == null)
                                 {
-                                    <span>[@d.studyplacename 교육장]</span>
+                                    <strong style="display:none;">@d.studyplacename 교육장</strong>
                                 }
-                         
+                                else if (d.studyplace != null)
+                                {
+                                    <strong>@d.studyplacename 교육장</strong>
+                                }
+
                                 <b class="payno@(d.payno)-@(d.itemno)"> @d.cname</b>
                                 @Html.Raw(d.pstatus == 21 ? string.Format("<b><a href=\"#\" class=\"paybtn\" onclick=\"gopay({0})\">교육비납부</a></b>", d.payno) : "")
                             </h5>
@@ -69,14 +73,17 @@
                                     @*신청기간 : @(d.retime.Value.Year == 2099 ? "상시운영" : d.rstime.Value.ToString("yy/MM/dd") + " ~ " + d.retime.Value.ToString("yy/MM/dd"))*@
                                     @*교육기간 : @(d.retime.Value.Year == 2099 ? "결제완료일로부터 "+d.studydays+"일" : (d.cshape != 1 ? d.cdt.ToString("yy-MM-dd") : d.sdate.Value.ToString("yy-MM-dd")) +" ~ "+ (d.cshape != 1 ? d.cmiestart != null ? d.cmiestart.Value.ToString("yy-MM-dd") : "" : d.edate.Value.ToString("yy-MM-dd")))*@
                                     @*교육기간 : @(d.retime.Value.Year == 2099 ? "신청일부터 선택한 교육종료일까지" : (d.cshape != 1 ? d.cdt.ToString("yyyy년 MM월 dd일") : d.sdate.Value.ToString("yyyy년 MM월 dd일")) +" ~ "+ (d.cshape != 1 ? d.cmiestart != null ? d.cmiestart.Value.ToString("yyyy년 MM월 dd일") : "" : d.edate.Value.ToString("yyyy년 MM월 dd일")))
-                                    *@교육기간 : @d.setime 
+                                    *@교육기간 : @d.sdateymd ~ @d.edateymd
+
                                     @if (false && d.cshape == 2)
                                     {
                                         @:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.Value.ToString("yy-MM-dd"))))
 
                                     }
+                                @if (d.cshape != 1) { 
                                     <dt></dt>
-                                 <dd style="color:red;">교육종료일 : @(string.Format("{0}", d.cmieend))</dd>
+                                 <dd style="color:red;">교육종료일 : @d.cmieendymd</dd>
+                                }
                                 <dt></dt>
                                 <dt>@d.studytime<span>시간과정</span></dt>
                                 @Html.Raw(d.isrebate == 1 ? "<span class=\"grn\" style='color: red;'>환급과정</span>" : "<span class=\"grn\" style='color: red;'>비환급과정</span>")
@@ -152,6 +159,16 @@
                     $('.ltaDown' + atdNum).addClass('on');
                 }
             });
+            $(".lctQr > span").click(function () {
+                $(".lctQr > span").removeClass("current");
+                $(this).addClass("current");
+                var id = $(this).attr("id");
+                if (id == "lblAll") { $("#stringval").val(null) }
+                if (id == "lblOff") { $("#stringval").val("1") }
+                if (id == "lblMix") { $("#stringval").val("2") }
+                if (id == "lblOn") { $("#stringval").val("0") }
+                submit();
+            });
         });
         var _a;
         var _pino;
@@ -160,7 +177,7 @@
                 _payno = payno;
                 _pino = pino;
                 _a = a;
-                confirmtoggle(true, "수강취소는 동일결제 건 모두 취소됩니다.<br />수강신청을 취소하시겠습니까?", "gogo()");
+                confirmtoggle(true, "수강신청을 취소하시겠습니까?", "gogo()");
             } else {
                 location.href = "/My/PayInfo?payno=" + payno;
             }
@@ -179,18 +196,7 @@
         function gopay(payno) {
             location.href = "/Course/ApplyPay?payno=" + payno;
         }
-        $(function () {
-            $(".lctQr > span").click(function () {
-                $(".lctQr > span").removeClass("current");
-                $(this).addClass("current");
-                var id = $(this).attr("id");
-                if (id == "lblAll") { $("#stringval").val(null) }
-                if (id == "lblOff") { $("#stringval").val("1") }
-                if (id == "lblMix") { $("#stringval").val("2") }
-                if (id == "lblOn") { $("#stringval").val("0") }
-                submit();
-            });
-        });
+        
 
      
     </script>
diff --git a/FO/css/mypage.css b/FO/css/mypage.css
index 85e1fe5..d2bad56 100644
--- a/FO/css/mypage.css
+++ b/FO/css/mypage.css
@@ -86,18 +86,20 @@
 .mpgcList li a h5 b {display:block; height:20px; line-height:20px; float:left;}
 .mpgcList li a h5 span.inline {display: inline-block; float: none; vertical-align: middle; margin-top: -3px;}
 .mpgcList li a h5 em {font-size:14pt; color:#238dfa; margin-right:10px; font-style:normal;}
-.mpgcList li a h5 span {padding:0 10px; color:#fff; margin-right:5px; font-weight:300; font-size:10pt;background-color: #333583}
+.mpgcList li a h5 span {padding:0 10px; color:#fff; margin-right:5px; font-weight:300; font-size:10pt;/*background-color: #333583*/}
 .mpgcList li a h5 span.mpglLable1 {background:#333583;}
 .mpgcList li a h5 span.mpglLable2 {background:#77b743;}
+.mpgcList li a h5 span.nav_blu {background-color:#333583;}
+.mpgcList li a h5 span.nav_grn {background-color:#77b743;}
 .mpgcList li a h5 b {font-size:14pt; font-weight:400;}
 .mpgcList li a dl {padding-top:10px;}
 .mpgcList li a dl:after {content:""; display:table; clear:both;}
-.mpgcList li a dl dt {float:left; font-size:11pt; padding-right:10px; margin-right:10px; position:relative; color:#238dfa;}
+.mpgcList li a dl dt {float:left; font-size:11pt; padding-right:10px; margin-right:10px; position:relative; color:/*#238dfa*/red;}
 .mpgcList li a dl dt:after {content:""; display:block; width:1px; height:14px; background:#d6d6d6; position:absolute; right:0; top:50%; margin-top:-7px;}
 .mpgcList li a dl dd {float:left; font-size:11pt; color:#888}
 .mpgcList li a dl dt.mpglSta1 {color:#ff0000;}
 .mpgcList li a dl dt.mpglSta2 {color:#333;}
-.mpgcList li a dl dt.mpglSta3 {color:#00aeea;}
+.mpgcList li a dl dt.mpglSta3 {color:/*#00aeea*/red;}
 .mpgnCont {background:#f9f9f9; margin-bottom:50px; padding:30px 20px;}
 .mpgNoti .mpgnCont:last-child {margin-bottom:0;}
 .mpgnList {}
@@ -275,8 +277,11 @@
 .ltaList h5 span,
 .ltaList h5 b {font-size:13pt; display:inline-block; vertical-align:middle; height:20px; line-height:20px; margin-right:5px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 .ltaList h5 em {color:#238dfa; font-style:normal;}
-.ltaList h5 span {color:#fff; background:#333583; padding:0 10px; font-size:10pt;}
+.ltaList h5 span {color:#fff; /*background:#333583; */padding:0 10px; font-size:10pt;}
+.ltaList h5 span.nav_blu {background-color:#333583;}
+.ltaList h5 span.nav_grn {background-color:#77b743;}
 .ltaList h5 span.ppl {background:#a404b2}
+ .ltaList h5 strong {font-weight: 400;font-size: 11pt;line-height: 20px;vertical-align: middle;color: #0000ff;}
 .ltaList h5 b {font-weight:400; margin-right:0;}
 .ltaList h5 a.tstlTitle {font-size:13pt; display:inline-block; vertical-align:middle; height:20px; line-height:20px; margin-right:5px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 .ltaList h5 a.print {display:inline-block; height:30px; line-height:30px; background:#000; color:#fff; font-size:10pt; padding:0 15px; margin-left:10px;}
@@ -291,7 +296,7 @@
 .ltaDl dt.ltaDlbk {color:#383838;}
 .ltaDl dt.ltaDlppl,
 .ltaDl dt.ltaDlppl a {color:#333583; font-size:12pt; font-weight:500;}
-.ltaDl dd {color:#888; margin-right:20px;}
+.ltaDl dd {color:#888;}
 .ltaDl dd a {font-size:12pt; color:#888;}
 .ltaDl dd span {color:#ff0000; font-size:12pt;}
 .ltaDl dd:last-child {margin-right:0;}
@@ -367,7 +372,7 @@
 	.ltaBtn {text-align:left;}
 	.ltaBtn select {float:left; min-width:80px; height:30px;}
 	.ltaBtn > span,
-	.ltaBtn > a {float:left; font-size:11pt; height:30px; line-height:30px;}
+	.ltaBtn > a {float:left; font-size:11pt; height:30px; line-height:30px; text-align:center;}
 	.ltaBtn dl {width:auto; float:left; padding:5px 0;}
 	.ltaBtn dl:after {content:""; display:table; clear:both;}
 	.ltaBtn dl dd {float:left; margin:0; margin-right:5px;}
@@ -410,7 +415,7 @@
 .mpgPop {position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.7); z-index:100;}
 .mpgPop > div {display:table; width:100%; height:100%;}
 .mpgPop > div > div {display:table-cell; width:100%; vertical-align:middle;}
-.mpgPopWrap {width:100%; max-width:440px; max-height:100%; margin:0 auto; background:#fff; position:relative;}
+.mpgPopWrap {width:100%;max-width:500px; max-height:100%; margin:0 auto; background:#fff; position:relative;}
 .mpgPopWrap.wdth430 {max-width:430px;}
 .mpgPopWrap.wdth580 {max-width:580px;}
 .mpgPopWrap.wdth650 {max-width:650px;}
@@ -532,9 +537,11 @@
 .bskList tbody td h5 span,
 .bskList tbody td h5 b {display:inline-block; vertical-align:middle; height:20px; line-height:20px; font-weight:400;}
 .bskList tbody td h5 a {height:30px; line-height:30px; display:inline-block; vertical-align:middle; margin-left:10px; background:#000; color:#fff; font-size:10pt; width:100px; text-align:center;}
-.bskList tbody td h5 span {margin-right:5px; width:40px; text-align:center; color:#fff; font-size:10pt;}
+.bskList tbody td h5 span {margin-right:5px; text-align:center; color:#fff; font-size:10pt;padding: 0 3px;}
 .bskList tbody td h5 span.blu {background:#238dfa;}
-.bskList tbody td h5 span.ppl {background:#333583;}
+/*.bskList tbody td h5 span.ppl {background:#333583;}*/
+.bskList tbody td h5 span.nav_blu {background-color:#333583;}
+.bskList tbody td h5 span.nav_grn {background-color:#77b743;}
 .bskList tbody td h5 span.grn {background:#77b743;}
 .bskList tbody td h5 span.org {background:#f36f21;}
 .bskList tbody td h5 span.bk {background:#000;}
@@ -719,9 +726,11 @@
 .payTlist h5 {white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 .payTlist h5 span,
 .payTlist b {display:inline-block; vertical-align:middle; height:20px; line-height:20px; font-weight:400;}
-.payTlist h5 span {margin-right:5px; width:40px; text-align:center; color:#fff; font-size:10pt;}
+.payTlist h5 span {margin-right:5px; /*width:40px;*/ text-align:center; color:#fff; font-size:10pt; padding:0 8px;}
 .payTlist h5 span.blu {background:#238dfa;}
-.payTlist h5 span.ppl {background:#333583;}
+/*.payTlist h5 span.ppl {background:#333583;}*/
+.payTlist h5 span.nav_blu {background-color:#333583;}
+.payTlist h5 span.nav_grn {background-color:#77b743;}
 .payTlist h5 span.grn {background:#77b743;}
 .payTlist h5 span.org {background:#f36f21;}
 .payTlist h5 span.bk {background:#000;}
@@ -1025,8 +1034,8 @@
 	.mpgpBtn {width: 50px; height: 30px; line-height: 28px; font-size: 10pt;}
 
 }
-
-
+.warningbutton {padding: 5px 10px; background: #ffffff; border: 1px solid black;}
+.lectstatus{color:red;}
 
 
 
diff --git a/FO/css/style.css b/FO/css/style.css
index d6d67a3..5993d4b 100644
--- a/FO/css/style.css
+++ b/FO/css/style.css
@@ -78,6 +78,13 @@ body {
 .mt0 {
 	margin-top: 0 !important;
 }
+.red {
+	color: red;
+}
+
+.blu {
+	color: #0047a7;
+}
 
 
 /* GNB */
@@ -9918,7 +9925,8 @@ span.org {
 .smtlCont {
 	position: relative;
 	padding: 30px 20px;
-	padding-right: 240px;
+	padding-right: 300px;
+	word-break: keep-all;
 }
 
 .smtList.pop .smtlCont {
@@ -9995,7 +10003,7 @@ span.org {
 	position: absolute;
 	right: 20px;
 	top: 50%;
-	margin-top: -25px;
+	/*margin-top: -25px;*/
 }
 
 	.smtlBtn:after {
@@ -10007,6 +10015,7 @@ span.org {
 	.smtlBtn li {
 		float: left;
 		margin-right: 10px;
+		font-size: 18px
 	}
 
 		.smtlBtn li:last-child {
@@ -10026,7 +10035,10 @@ span.org {
 				border: solid 1px #0047a7;
 				color: #0047a7;
 			}
-
+.smtlChk label {
+	cursor: auto;
+	font-size: 15pt;
+}
 			.smtlBtn li a.smtlBtn02 {
 				border: solid 1px #383838;
 				background: #383838;
@@ -10084,42 +10096,50 @@ span.org {
 	padding: 0 20px;
 }
 
-	.smtlChk > li {
-		padding: 30px 0;
+	.smtlChk li {
+		padding: 30px;
 		border-bottom: solid 1px #eaeaea;
 		position: relative;
-		padding-left: 30px;
-		padding-right: 140px;
+		line-height: 1.8em;
 	}
 
-		.smtlChk > li:last-child {
+		.smtlChk  li:last-child {
 			border-bottom: none;
 		}
 
-		.smtlChk > li input[type="checkbox"] {
+		.smtlChk  li input[type="checkbox"] {
 			position: absolute;
 			left: 0;
 			top: 50%;
 			margin-top: -9px;
 		}
 
-		.smtlChk > li > p {
+		.smtlChk  li  p {
 		}
 
-			.smtlChk > li > p span {
+			.smtlChk  li  p span {
 			}
 
-				.smtlChk > li > p span.blu {
+				.smtlChk  li  p span.blu {
 					color: #0047a7;
 				}
 
-				.smtlChk > li > p span.gry {
+				.smtlChk  li  p span.gry {
 					color: #666;
 				}
 
-				.smtlChk > li > p span.red {
+				.smtlChk  li  p span.red {
 					color: #f00;
 				}
+				.smtlChk  li  p span.cshapelabel {
+					color: #fff;
+				/*	background: #333583;*/
+					padding: 0 10px;
+					font-size: 10pt;
+					margin-left: 5px;
+				}
+				.smtlChk  li  p span.nav_blu {background-color:#333583;color: #fff;padding: 0 10px;	font-size: 11pt;margin-left: 5px;}
+				.smtlChk  li  p span.nav_grn {background-color:#77b743;color: #fff;padding: 0 10px;	font-size: 11pt; margin-left: 5px;}
 
 .smtlChkBtn {
 	display: block;
@@ -10154,6 +10174,11 @@ span.org {
 		background: #f4f4f4;
 		color: #929292;
 	}
+	.smtlChkBtn.smtlChk05 {
+		border: solid 1px #f4f4f4;
+		background: red;
+		color: #fff;
+	}
 
 
 @media (max-width:900px) {
@@ -10299,19 +10324,19 @@ span.org {
 		padding: 0 10px;
 	}
 
-		.smtlChk > li {
+		.smtlChk  li {
 			padding: 20px 0;
 			padding-right: 0;
 		}
 
-			.smtlChk > li input[type="checkbox"] {
+			.smtlChk  li input[type="checkbox"] {
 				position: absolute;
 				left: 0;
 				top: 20px;
 				margin-top: 3px;
 			}
 
-			.smtlChk > li > p {
+			.smtlChk  li  p {
 				padding-left: 30px;
 			}
 
diff --git a/FO/js/mypage.js b/FO/js/mypage.js
index 8ec4efd..5d7b91a 100644
--- a/FO/js/mypage.js
+++ b/FO/js/mypage.js
@@ -65,18 +65,21 @@ $(document).ready(function () {
 
         if (complete != undefined && complete == 0)
         {
-            msg("해당 과정은 미 수료 상태 입니다." +
-                "교육일정변경 메뉴에서 교육일정을 변경 해주세요." +
-                "※ 미 수료 상태로 교육시작일 이후 1년 경과 시 교육이 취소되어 일정변경이 불가합니다." +
-                "※ 확인 클릭 시 교육일정변경 메뉴로 이동합니다."
+            msg("해당 과정은 <span style='color:red;'>미 수료 상태 입니다.</span></br>" +
+                "교육일정변경 메뉴에서 <span style='color:red;'>교육일정을 변경 해주세요.</span></br></br>" +
+                "※ 미 수료 상태로 교육시작일 이후 <span style='color:red;'>1년 경과 시 교육이 취소되어 일정변경이 불가합니다.</span></br>" +
+                "※ 확인 클릭 시 교육일정변경 메뉴로 이동합니다.", null, null, null, "location.href='" + '/My/LectureOn' + "'"
             );
+            
             return false;
         }
         if (href != undefined && href != null && href.toLowerCase().indexOf("croom/index?croomlectno=") != -1) {
             var cshape = $(this).data("cshape");
             if (cshape != undefined && cshape == 1) {
-                msg("해당 과정은 교육장에 직접 오셔서 수강하는 과정 입니다." +
+                msg("해당 과정은 <span style='color: red;'>교육장에 직접 오셔서 수강</span>하는 과정 입니다.</br>" +
                     "교육기간을 확인하시고 시작일에 해당 교육장으로 입교 부탁 드립니다.");
+                /*location.href = '/My/LectureOn';*/
+                
                 return false;
             }
             else if (cshape != undefined && cshape == 2) {
diff --git a/Model/BaseModel.cs b/Model/BaseModel.cs
index 427fd3d..9306011 100644
--- a/Model/BaseModel.cs
+++ b/Model/BaseModel.cs
@@ -490,6 +490,20 @@ namespace NP.Model
 
     public class Data : BaseModel
     {
+        /// <summary>
+        /// 20220804 비교구문 추가
+        /// </summary>
+        public int? iscomplete { get; set; }
+        /// <summary>
+        /// 20220804 비교구문 추가
+        /// </summary>
+        public string lectStatus { get; set; }
+        /// <summary>
+        /// 20220804 비교구문 추가
+        /// </summary>
+        public int studytime { get; set; }
+        public int? studyplace { get; set; }
+        public string studyplacename { get; set; }
         public int dtype { get; set; }
         public int intval { get; set; }
         public int intval2 { get; set; }
diff --git a/Model/CM.cs b/Model/CM.cs
index 8ff0740..d7d1940 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -67,7 +67,7 @@ namespace NP.Model
         public int cmno { get; set; }
         public String cmnos { get; set; }
         public int orgcmno { get; set; }
-
+        public int ccode { get; set; }
         /// <summary>
         /// 과정여부	0:강좌,1:과정,2:패키지
         /// </summary>
@@ -970,6 +970,13 @@ namespace NP.Model
             }
         }
 
+        /// <summary>
+        /// 수강상태
+        /// 20220803
+        /// </summary>
+        public string lectStatus { get; set; }
+        public string studychange { get; set; }
+        
         /// <summary>
         /// 수료여부	null:미처리,0:미수료,1:수료
         /// </summary>
@@ -999,7 +1006,7 @@ namespace NP.Model
         {
             get
             {
-                return isrebate == 1 ? "환급" : "비환급";
+                return isrebate == 1 ? "환급과정" : "비환급과정";
             }
         }
         /// <summary>
diff --git a/Model/Pay.cs b/Model/Pay.cs
index b9e3917..894d98c 100644
--- a/Model/Pay.cs
+++ b/Model/Pay.cs
@@ -538,7 +538,7 @@ namespace NP.Model
         /// <summary>
         /// 학습장소
         /// </summary>
-        public int studyplace { get; set; }
+        public int? studyplace { get; set; }
         /// <summary>
         /// 학습장소명
         /// </summary>
@@ -554,7 +554,7 @@ namespace NP.Model
         {
             get
             {
-                return sdate == null ? "-" : sdate.Value.ToString("yy-MM-dd");
+                return sdate == null ? "-" : sdate.Value.ToString("yyyy년 MM월 dd일");
             }
         }
         /// <summary>
@@ -568,7 +568,7 @@ namespace NP.Model
         {
             get
             {
-                return edate == null ? "-" : edate.Value.ToString("yy-MM-dd");
+                return edate == null ? "-" : edate.Value.ToString("yyyy년 MM월 dd일");
             }
         }
         /// <summary>
@@ -596,7 +596,7 @@ namespace NP.Model
         {
             get
             {
-                return cmieend == null ? "-" : cmieend.Value.ToString("yy-MM-dd");
+                return cmieend == null ? "-" : cmieend.Value.ToString("yyyy년 MM월 dd일");
             }
         }
         /// <summary>
@@ -639,6 +639,7 @@ namespace NP.Model
         public int attrate { get; set; }
 
         public String userpno { get; set; }
+        public string studytime { get; set; }
     }
 
     /// <summary>