diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml
index 8015883..962d73c 100644
--- a/BO/Views/cm/cmreg.cshtml
+++ b/BO/Views/cm/cmreg.cshtml
@@ -382,12 +382,9 @@
                     $("#stime2").show();
                     $("#gtime").hide();
                     setv("CM_retime", "2099-12-31");
-                    setv("CM_getime", "2099-12-31");
-                    setv("CM_sstime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
                 } else {
                     var date = new Date();
                     setv("CM_retime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
-                    setv("CM_getime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
                     $("#rtime").show();
                     $("#stime").show();
                     $("#stime2").hide();
diff --git a/Base/Controller/ACommonCM.cs b/Base/Controller/ACommonCM.cs
index e1e7b5e..2bfcee7 100644
--- a/Base/Controller/ACommonCM.cs
+++ b/Base/Controller/ACommonCM.cs
@@ -119,11 +119,9 @@ namespace NP.Base.Controllers
                 {
                     vm.CM.sstime = null;
                     vm.CM.setime = null;
-                }
-                if (vm.CM.retime.Value.ToString("yyyyMMdd") == "20991231")
-                {
-                    vm.CM.rstime = Convert.ToDateTime(DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd 00:00:00"));
-                    vm.CM.gstime = Convert.ToDateTime(DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd 00:00:00"));
+                    vm.CM.gstime = null;
+                    vm.CM.getime = null;
+                    vm.CM.rstime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
                 }
             }
             if (vm.CM.isrefund == 0)
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 3da8598..39490a5 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -1281,14 +1281,17 @@
         </select>
         <insert id="cm.cmcopy0" parameterClass="cm">
             insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
-                ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isseq,iscertificate,isdel,<include refid="sql.inc"></include>)
+                ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isseq,iscertificate,isdel,studydays,<include refid="sql.inc"></include>)
             select #ismaster#,cgno,case when a.ismaster = 1 and #ismaster# = 0 then a.cmno else a.pcmno end,ifnull(#cname#, concat('사본_', cname)),a.kname,#tmno#
                 ,case when #tmno# is null then null else ifnull(b.classno,0)+1 end
-                ,t.rstime,date_format(t.retime,'%Y-%m-%d 23:59:59') retime
-                ,t.sstime,date_format(t.setime,'%Y-%m-%d 23:59:59') setime
-                ,t.gstime,date_format(t.getime,'%Y-%m-%d 23:59:59') getime
+                ,t.rstime
+                ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then '2099-12-31 23:59:59' else date_format(t.retime,'%Y-%m-%d 23:59:59') end
+                ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else t.sstime end
+                ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else date_format(t.setime,'%Y-%m-%d 23:59:59') end
+                ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else t.gstime end
+                ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else date_format(t.getime,'%Y-%m-%d 23:59:59') end
                 ,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
-                ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,1,isseq,a.iscertificate,0,<include refid="sql.inv"></include>
+                ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,1,isseq,a.iscertificate,0,studydays,<include refid="sql.inv"></include>
             from cm a
             left outer join (
                 select max(b.classno) classno
@@ -1752,7 +1755,7 @@
         ,a.tmno,a.classno,a.rstime,a.retime,a.sstime,a.setime,a.gstime,a.getime
         ,a.cshape,a.infee,a.outfee,a.accommofee,a.quota
         ,a.introhtml,a.targethtml,a.goalhtml,a.contenthtml
-        ,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm
+        ,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm,a.studydays
         ,a.typeman,a.typeedu,a.typegrade,a.typejob,a.iscertificate
         ,b.pcgno,b.cgcode cgcode
         ,b.cgname,c.cgname pcgname
diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml
index 83c3572..a940824 100644
--- a/FO/Views/Course/ApplyEdu.cshtml
+++ b/FO/Views/Course/ApplyEdu.cshtml
@@ -1,4 +1,7 @@
 @model NP.Model.VMCourse
+@{ 
+    var isallday = Model.CM.retimeymd == "2099-12-31" ? true : false;
+}
 <form id="applyEduForm" method="post">
     <input type="hidden" name="cmno" id="cmno" value="@Model.cmno" /> @*강좌번호*@
     <input type="hidden" name="stringval" id="stringval" value="@Model.stringval" /> @*법정교육/기타교육*@
@@ -18,15 +21,36 @@
                 <li>
                     @if (Model.CM.cshape == 0)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원</span></label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p>
+                        }
                     }
                     else if (Model.CM.cshape == 1)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원</span></label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p>
+                        }
                     }
                     else if (Model.CM.cshape == 2)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원 ※ 집체교육 선택 필수</span></label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname  | <span class='red'><span id="spninfee"></span>원 ※ 집체교육 선택 필수</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원 ※ 집체교육 선택 필수</span></label></p>
+                        }
                     }
 
                     @if (Model.CM.applicableCM == "정상접수")
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index 8e0d00d..afd8f72 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -1,6 +1,9 @@
 @model NP.Model.VMCourse
+@{
+    var isallday = Model.CM.retimeymd == "2099-12-31" ? true : false;
+}
 <form id="mform" name="mform" method="post" action="/Course/XpayREQ">
-    @Html.HiddenFor(m=>m.payno)
+    @Html.HiddenFor(m => m.payno)
     <input type="hidden" name="cmno" id="cmno" value="@Model.cmno" /> @*강좌번호*@
     <input type="hidden" name="stringval" id="stringval" value="@Model.stringval" /> @*법정교육/기타교육*@
     <input type="hidden" name="stringval2" id="stringval2" value="@Model.stringval2" />@*교육유형*@
@@ -18,26 +21,47 @@
                 <li>
                     @if (Model.CM.cshape == 0)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
+                        }
                     }
                     else if (Model.CM.cshape == 1)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
+                        }
                     }
                     else if (Model.CM.cshape == 2)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원 ※ 집체교육 선택 필수</span></label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname  | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
+                        }
                     }
                 </li>
             </ul>
             <div class="apyCost">
                 @if (Model.PPLog.isaccommodation != 1)
                 {
-                <span>결제금액:<span class="red">@Model.CM.infee.ToString("#,0")</span>원</span>
+                    <span>결제금액:<span class="red">@Model.CM.infee.ToString("#,0")</span>원</span>
                 }
                 else
                 {
-                <span>결제금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span>원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
+                    <span>결제금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span>원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
                 }
             </div>
         </li>
@@ -47,12 +71,12 @@
     <ul class="apyRdo">
         @if (Model.CM.infee > 0)
         {
-        <li><input type="radio" name="ptype" id="pay0101" value="1"><label for="pay0101">신용카드</label></li>
-        <li><input type="radio" name="ptype" id="pay0102" value="3"><label for="pay0102">무통장입금(가상계좌)</label></li>
+            <li><input type="radio" name="ptype" id="pay0101" value="1"><label for="pay0101">신용카드</label></li>
+            <li><input type="radio" name="ptype" id="pay0102" value="3"><label for="pay0102">무통장입금(가상계좌)</label></li>
         }
         else
         {
-        <li><input type="radio" name="ptype" id="pay0101" value="6" checked><label for="pay0101">무료</label></li>
+            <li><input type="radio" name="ptype" id="pay0101" value="6" checked><label for="pay0101">무료</label></li>
         }
     </ul>
     <div id="cashbox" style="display:none">
@@ -111,7 +135,9 @@
 </form>
 @section scriptsHeader{
     <style type="text/css">
-        .hide{display: none;}
+        .hide {
+            display: none;
+        }
     </style>
 }
 <script type="text/javascript">
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index aec45f5..414de94 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -263,13 +263,13 @@
             }
 
             if (d.cshape == 0) {
-                p.html("<label style='font-size:18px'>" + d.tseq + "기  | " + d.cname +" | <span class='gry'>" + d.ssrename + "</span><span class='red'>  (" + d.ssretimeToDay + "일) | " + bindComma(d.infee) + "원</span></label>");
+                p.html("<label style='font-size:18px'>" + d.tseq + "기  | " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='gry'>" + d.ssrename + "</span></span><span class='red'> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studydays * 24 + " 시간)" : "(" + d.ssretimeToDay * 24 + "시간)") + "</span> | <span class=red>" + bindComma(d.infee) + "원</span></label>");
             }
             else if (d.cshape == 1) {
-                p.html("<label style='font-size:18px'>" + d.tseq + "기  | <span class='blu'>[" + d.studyplacename + "교육장] | </span>" + d.cname +" | <span class='gry'>" + d.ssrename + "</span><span class='red'>  (" + d.ssretimeToDay + "일) | " +bindComma(d.infee)+"원</span></label>");
+                p.html("<label style='font-size:18px'>" + d.tseq + "기  | <span class='blu'>[" + d.studyplacename + "교육장]</span> " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='gry'>" + d.ssrename + "</span></span><span class='red'> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studydays * 24 + " 시간)" : "("+d.ssretimeToDay +"일)") + "</span> | <span class=red>" +bindComma(d.infee)+"원</span></label>");
             }
             else if (d.cshape == 2) {
-                p.html("<label style='font-size:18px'>" + d.tseq + "기  | " + d.cname +" | <span class='gry'>" + d.ssrename + "</span><span class='red'>  (" + d.ssretimeToDay + "일) | " + bindComma(d.infee) + "원 ※ 집체교육 선택 필수</span></label>");
+                p.html("<label style='font-size:18px'>" + d.tseq + "기  | " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='gry'>" + d.ssrename + "</span></span><span class='red'> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studydays * 24 + " 시간)" : "("+d.ssretimeToDay * 24 + "시간)") + "</span> | <span class=red>" + bindComma(d.infee) + "원 ※ 집체교육 선택 필수</span></label>");
             }
             spanIntro.text("강좌소개");
             li.append(p);