diff --git a/BO/Views/Shared/Partial/ScdScript.cshtml b/BO/Views/Shared/Partial/ScdScript.cshtml
new file mode 100644
index 0000000..b7b396c
--- /dev/null
+++ b/BO/Views/Shared/Partial/ScdScript.cshtml
@@ -0,0 +1,103 @@
+
+    <script type="text/javascript">
+        var selectedcmno;
+        var selectedLectno;
+        var selectedCmisno;
+
+        function setScd2(cmno) {
+            capp("/acommon/GetScdForMixEdu", { cmno: cmno, iscmlects : 1 }, "renderScd2");
+        }
+
+        function renderScd2() {
+            var divedudate = $("#divedudate");
+            var select = $("<select />", { "class": "form-control dev" , "id": "addstringval4" , "name": "addstringval4" , "onchange": "submit()" });
+            divedudate.empty();
+            select.append("<option value=''>교육일정</option>");
+                $.each(capResult.obj, function (i, d) {
+                    if ("2099-12-31" != "2099-12-31") {
+                        if (d.estartShortDateString == "2099-12-31") {
+                            select.append("<option value='" + d.estartShortDateString + "' selected> " + d.estartShortDateString + "</option > ");
+                        }
+                        else {
+                            select.append("<option value='" + d.estartShortDateString + "'> " + d.estartShortDateString + "</option > ");
+                        }
+                    }
+                    else {
+                        select.append("<option value='" + d.estartShortDateString + "'> " + d.estartShortDateString + "</option > ");
+                    }
+            });
+            divedudate.append(select);
+        }
+
+        function setScd() {
+            capp("/acommon/GetScdForMixEdu", { cmno: selectedcmno }, "renderScd");
+        }
+        function renderScd() {
+            var ulScd = $("#ulScd");
+            ulScd.empty();
+            var seq = 0;
+            $.each(capResult.obj, function (i, d) {
+                var li = $("<li />");
+                //if (d.isEnd == true) {
+                    //li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
+                //}
+                //else {
+                    if (d.quota != 0) {
+                        if (d.remainPeople <= 0) {
+                            //li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
+                        }
+                        else {
+                            if (seq == 0) {
+                                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
+                            }
+                            else {
+                                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
+                            }
+                        }
+                    }
+                    else {
+                        if (seq == 0) {
+                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
+                        }
+                        else {
+                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
+                        }
+                    }
+                //}
+                seq++;
+                ulScd.append(li);
+            });
+
+            $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
+        }
+        function openScd(cmno, lectno, cmisno) {
+            selectedcmno = cmno;
+            selectedLectno = lectno;
+            selectedCmisno = cmisno;
+            $.when(
+                setScd()
+            ).done(function () {
+                setTimeout(function () {
+                    bglayer();
+                    $("#scdbox").slideDown("fast");
+                }, 200);
+            });
+        }
+
+        function updateScd() {
+            if (confirm("교육일정을 변경하시겠습니까?")) {
+                var cmisno = $("input:radio[name=rdoScds]:checked").val();
+                capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
+            }
+        }
+        function afterUpdateScd() {
+            if (capResult.code > 0) {
+                msgok(1, "", true);
+                submit("mform", 800, true);
+            }
+            else {
+                msg("관리자에게 문의하세요.");
+                return;
+            }
+        }
+    </script>
\ No newline at end of file
diff --git a/BO/Views/croom/attscds.cshtml b/BO/Views/croom/attscds.cshtml
index 09a2b2a..38842e7 100644
--- a/BO/Views/croom/attscds.cshtml
+++ b/BO/Views/croom/attscds.cshtml
@@ -1,130 +1,130 @@
 @model NP.Model.VMLect
-    <form id="mform" method="post">
-        <input type="hidden" id="mform_tabidx" name="tabidx" value="@Model.tabidx" />
-        <section class="panel panel-default clearfix devsearch" data-cleartbody="tbody1">
-            @*@Html.Partial("./Partial/SearchCaption")*@
-            <div class="table-responsive">
-                <table class="table b-t b-light viewtable">
-                    <colgroup>
-                        <col width="15%" />
-                        <col width="35%" />
-                        <col width="15%" />
-                        <col width="*" />
-                        <col />
-                    </colgroup>
-                    <tbody id="searchtbody">
-                        <tr>
-                            <th>교육종료일</th>
-                            <td>
-                                <div class="col-md-6">
-                                    @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } })
-                                </div>
-                            </td>
-                            <th>교육생</th>
-                            <td>
-                                <div class="col-md-12">
-                                    @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "searchtype" }, { "selected", Model.searchtype }, { "valuetext", "usernamestr:이름;useridstr:ID" } })
-                                    @Html.Partial("./Partial/Text", Model.searchtext, Helpers.DicText(new NP.Model.TextDic() { Name = "searchtext", Style = "width:70%; display:inline-block;", Value = Model.searchtext, CssClass = "ff" }))
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>과정명</th>
-                            <td>
-                                <div class="col-md-12">
-                                    @Html.Partial("./Partial/Text", Model.stringval2, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval2", Value = Model.stringval2 }))
-                                </div>
-                            </td>
-                            <th>교육장</th>
-                            <td>
-                                <div class="col-md-12">
-                                    @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":교육장선택" } })
-                                </div>
-                            </td>
-                        </tr>
-                </table>
-            </div>
-        </section>
-        <div style="text-align: left; border-bottom: 1px solid #ddd; padding-bottom: 5px;">
-            <span style="color:red; font-weight:bold;">* 온라인 교육만 해당되며, 교육장교육은 검색되지 않습니다. 교육장교육은 <u>성적처리</u> 기능을 이용해주세요.</span>
-            <div style="text-align:right;">
-                <button class="btn btn-default btn-s-xs" type="button" onclick="javascript:submit();"><i class="fa fa-search"></i></button>
-            </div>
+<form id="mform" method="post">
+    <input type="hidden" id="mform_tabidx" name="tabidx" value="@Model.tabidx" />
+    <section class="panel panel-default clearfix devsearch" data-cleartbody="tbody1">
+        @*@Html.Partial("./Partial/SearchCaption")*@
+        <div class="table-responsive">
+            <table class="table b-t b-light viewtable">
+                <colgroup>
+                    <col width="15%" />
+                    <col width="35%" />
+                    <col width="15%" />
+                    <col width="*" />
+                    <col />
+                </colgroup>
+                <tbody id="searchtbody">
+                    <tr>
+                        <th>교육종료일</th>
+                        <td>
+                            <div class="col-md-6">
+                                @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } })
+                            </div>
+                        </td>
+                        <th>교육생</th>
+                        <td>
+                            <div class="col-md-12">
+                                @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "searchtype" }, { "selected", Model.searchtype }, { "valuetext", "usernamestr:이름;useridstr:ID" } })
+                                @Html.Partial("./Partial/Text", Model.searchtext, Helpers.DicText(new NP.Model.TextDic() { Name = "searchtext", Style = "width:70%; display:inline-block;", Value = Model.searchtext, CssClass = "ff" }))
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>과정명</th>
+                        <td>
+                            <div class="col-md-12">
+                                @Html.Partial("./Partial/Text", Model.stringval2, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval2", Value = Model.stringval2 }))
+                            </div>
+                        </td>
+                        <th>교육장</th>
+                        <td>
+                            <div class="col-md-12">
+                                @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":교육장선택" } })
+                            </div>
+                        </td>
+                    </tr>
+            </table>
         </div>
-        <br />
-        <section class="panel panel-default">
-            <div style="padding:5px 10px; text-align:right;">
-                @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-                <a href="#" class="btn btn-primary" onclick="save(2);">출석처리</a>
-                <a href="#" class="btn btn-danger" onclick="save(0);">결석처리</a>
-                <a href="#" class="btn btn-danger" onclick="save(-1);">미입력처리</a>
-            </div>
-            <div class="table-responsive" id="excel1">
-                <table class="table table-striped b-t b-light">
-                    <thead>
+    </section>
+    <div style="text-align: left; border-bottom: 1px solid #ddd; padding-bottom: 5px;">
+        <span style="color:red; font-weight:bold;">* 온라인 교육만 해당되며, 교육장교육은 검색되지 않습니다. 교육장교육은 <u>성적처리</u> 기능을 이용해주세요.</span>
+        <div style="text-align:right;">
+            <button class="btn btn-default btn-s-xs" type="button" onclick="javascript:submit();"><i class="fa fa-search"></i></button>
+        </div>
+    </div>
+    <br />
+    <section class="panel panel-default">
+        <div style="padding:5px 10px; text-align:right;">
+            @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
+            <a href="#" class="btn btn-primary" onclick="save(2);">출석처리</a>
+            <a href="#" class="btn btn-danger" onclick="save(0);">결석처리</a>
+            <a href="#" class="btn btn-danger" onclick="save(-1);">미입력처리</a>
+        </div>
+        <div class="table-responsive" id="excel1">
+            <table class="table table-striped b-t b-light">
+                <thead>
+                    <tr>
+                        <th><input type="checkbox" onclick="javascript: checkall('excel1', this);" /></th>
+                        <th width="20">No</th>
+                        <th width="30">운영기수</th>
+                        <th>교육장</th>
+                        <th>과정명</th>
+                        <th>교육생(ID)</th>
+                        <th>교육시작일</th>
+                        <th>교육종료일</th>
+                        <th>집합교육출석여부</th>
+                        <th>수료여부</th>
+                    </tr>
+                </thead>
+                <tbody class="data" id="tbody1">
+                    @foreach (var d in Model.Lects)
+                    {
                         <tr>
-                            <th><input type="checkbox" onclick="javascript: checkall('excel1', this);" /></th>
-                            <th width="20">No</th>
-                            <th width="30">운영기수</th>
-                            <th>교육장</th>
-                            <th>과정명</th>
-                            <th>교육생(ID)</th>
-                            <th>교육시작일</th>
-                            <th>교육종료일</th>
-                            <th>집합교육출석여부</th>
-                            <th>수료여부</th>
+                            <td><input type="checkbox" class="autocheck" value="@d.lectno" data-usernameid="@d.usernameid" data-userno="@d.userno" data-cmino="@d.cmino" /></td>
+                            <td>@d.rnorvt</td>
+                            @if (d.cshape == 2)
+                            {
+                                <td>@d.sseq</td>
+                            }
+                            else
+                            {
+                                <td>-</td>
+                            }
+                            <td>@d.studyplacename</td>
+                            <td>@d.cname</td>
+                            <td>@d.usernameid</td>
+                            <td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
+                            @if (d.cshape == 2)
+                            {
+                                if (d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
+                                {
+                                    <td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
+                                }
+                                else
+                                {
+                                    <td>@d.eend.ToShortDateString()</td>
+                                }
+                            }
+                            else
+                            {
+                                <td>@d.edate.Value.ToShortDateString()</td>
+                            }
+                            <td>@d.istatusname</td>
+                            @if (!ViewBag.IsSubAdmin96)
+                            {
+                                <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("<a href=\"#\" onclick=\"viewcert({0})\">{1}</a>", d.lectno, "수료") : d.iscompletename)</td>
+                            }
+                            else
+                            {
+                                <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)</td>
+                            }
                         </tr>
-                    </thead>
-                    <tbody class="data" id="tbody1">
-                        @foreach (var d in Model.Lects)
-                        {
-                            <tr>
-                                <td><input type="checkbox" class="autocheck" value="@d.lectno" data-usernameid="@d.usernameid" data-userno="@d.userno" data-cmino="@d.cmino" /></td>
-                                <td>@d.rnorvt</td>
-                                @if (d.cshape == 2)
-                                {
-                                    <td>@d.sseq</td>
-                                }
-                                else
-                                {
-                                    <td>-</td>
-                                }
-                                <td>@d.studyplacename</td>
-                                <td>@d.cname</td>
-                                <td>@d.usernameid</td>
-                                <td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
-                                @if (d.cshape == 2)
-                                {
-                                    if (d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
-                                    {
-                                        <td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
-                                    }
-                                    else
-                                    {
-                                        <td>@d.eend.ToShortDateString()</td>
-                                    }
-                                }
-                                else
-                                {
-                                    <td>@d.edate.Value.ToShortDateString()</td>
-                                }
-                                <td>@d.istatusname</td>
-                                @if (!ViewBag.IsSubAdmin96)
-                                {
-                                    <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("<a href=\"#\" onclick=\"viewcert({0})\">{1}</a>", d.lectno, "수료") : d.iscompletename)</td>
-                                }
-                                else
-                                {
-                                    <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)</td>
-                                }
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
-        </section>
-    </form>
+                    }
+                </tbody>
+            </table>
+        </div>
+        @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
+    </section>
+</form>
 <div id="scdbox" class="findbox draggable regbox" style="width: 400px; z-index: 1041; top: 60px; overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">교육일정변경</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <ul id="ulScd"></ul>
@@ -139,6 +139,7 @@
 @section scriptsHeader{
     @Html.Partial("./Partial/FileScript")
     @Html.Partial("./Partial/ScriptDate")
+    @Html.Partial("./Partial/ScdScript")
 }
 @section scripts{
     <script>
@@ -158,81 +159,6 @@
             }
         }
 
-        var selectedcmno;
-        var selectedLectno;
-        var selectedCmisno;
-        function setScd() {
-            capp("/acommon/GetScdForMixEdu", { cmno: selectedcmno }, "renderScd");
-        }
-        function renderScd() {
-            var ulScd = $("#ulScd");
-            ulScd.empty();
-            var seq = 0;
-            $.each(capResult.obj, function (i, d) {
-                var li = $("<li />");
-                if (d.isEnd == true) {
-                    li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-                }
-                else {
-                    if (d.quota != 0) {
-                        if (d.remainPeople <= 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                        }
-                        else {
-                            if (seq == 0) {
-                                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                            }
-                            else {
-                                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                            }
-                        }
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                        }
-                    }
-                }
-                seq++;
-                ulScd.append(li);
-            });
-
-            $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-        }
-        function openScd(cmno, lectno, cmisno) {
-            selectedcmno = cmno;
-            selectedLectno = lectno;
-            selectedCmisno = cmisno;
-            $.when(
-                setScd()
-            ).done(function () {
-                setTimeout(function () {
-                    bglayer();
-                    $("#scdbox").slideDown("fast");
-                }, 200);
-            });
-        }
-
-        function updateScd() {
-            if (confirm("교육일정을 변경하시겠습니까?")) {
-                var cmisno = $("input:radio[name=rdoScds]:checked").val();
-                capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-            }
-        }
-        function afterUpdateScd() {
-            if (capResult.code > 0) {
-                msgok(1, "", true);
-                submit("mform", 800, true);
-            }
-            else {
-                msg("관리자에게 문의하세요.");
-                return;
-            }
-        }
-
         var amsg;
         function save(no) {
             if (no == 2) { amsg = "출석"; }
@@ -241,9 +167,9 @@
 
             if ($("#tbody1 tr input.autocheck:checked").length < 1) {
                 msg(amsg + "처리할 교육생을 선택해주세요.");
-            } else if (confirm("선택한 교육생을 "+amsg+"처리하시겠습니까?")) {
-                var userinfos ="";
-                var cuis="";
+            } else if (confirm("선택한 교육생을 " + amsg + "처리하시겠습니까?")) {
+                var userinfos = "";
+                var cuis = "";
                 $.each($("#tbody1 tr input.autocheck:checked"), function (i, c) {
                     if ($(c).attr("data-cmino") == "" || $(c).attr("data-cmino") < 1) {
                         cuis += "," + $(c).attr("data-usernameid");
@@ -256,7 +182,7 @@
                 if (cuis != "") {
                     msg(cuis + "교육생들은 " + amsg + "처리가 불가능합니다.");
                 } else {
-                    capp("/acommon/offattscdsave", { userinfos : userinfos,istatus:no }, "cboffattscdsave");
+                    capp("/acommon/offattscdsave", { userinfos: userinfos, istatus: no }, "cboffattscdsave");
                 }
             }
         }
diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml
index 4eaae82..0f1de11 100644
--- a/BO/Views/croom/cmlects.cshtml
+++ b/BO/Views/croom/cmlects.cshtml
@@ -103,7 +103,7 @@
                                 <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
                                 @if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면
                                 {
-                                    <td class="link text-center"><a href="#" onclick="javascript: openScd(@d.lectno, @d.cmisno);">@d.estart.ToShortDateString()</a></td>
+                                    <td class="link text-center"><a href="#" onclick="javascript: openScd(@Model.CM.cmno,@d.lectno, @d.cmisno);">@d.estart.ToShortDateString()</a></td>
                                 }
                                 else
                                 {
@@ -269,7 +269,7 @@
     @Html.Partial("./Partial/ScriptDate")
     @Html.Partial("./Partial/FileScript")
     @Html.Partial("./Partial/ScriptDate")
-
+    @Html.Partial("./Partial/ScdScript", null, new ViewDataDictionary() { { "cmno", Model.CM.cmno } })
 }
 @section scripts{
     <script>
@@ -281,7 +281,7 @@
                 submit();
             }
         });
-        setScd2();
+        setScd2(@Model.CM.cmno);
     });
     function leave() {
         if ($("#tbody1 tr input.autocheck:checked").length < 1) {
@@ -432,102 +432,6 @@
         }
     }
 
-    function setScd2() {
-        capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno, iscmlects : 1 }, "renderScd2");
-        }
-    function renderScd2() {
-        var divedudate = $("#divedudate");
-        var select = $("<select />", { "class": "form-control dev" , "id": "addstringval4" , "name": "addstringval4" , "onchange": "submit()" });
-        divedudate.empty();
-        select.append("<option value=''>교육일정</option>");
-            $.each(capResult.obj, function (i, d) {
-                if (@Model.addstringval4.ToString() != "2099-12-31") {
-                    if (d.estartShortDateString == "@Model.addstringval4") {
-                        select.append("<option value='" + d.estartShortDateString + "' selected> " + d.estartShortDateString + "</option > ");
-                    }
-                    else {
-                        select.append("<option value='" + d.estartShortDateString + "'> " + d.estartShortDateString + "</option > ");
-                    }
-                }
-                else {
-                    select.append("<option value='" + d.estartShortDateString + "'> " + d.estartShortDateString + "</option > ");
-                }
-        });
-        divedudate.append(select);
-    }
-    function setScd() {
-        capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno }, "renderScd");
-    }
-    function renderScd() {
-        var ulScd = $("#ulScd");
-        ulScd.empty();
-        var seq = 0;
-        $.each(capResult.obj, function (i, d) {
-            var li = $("<li />");
-            if (d.isEnd == true)
-            {
-                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-            }
-            else
-            {
-                if (d.quota != 0) {
-                    if (d.remainPeople <= 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                    }
-                }
-                else {
-                    if (seq == 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                    else {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                }
-            }
-            seq++;
-            ulScd.append(li);
-        });
-
-        $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-    }
-    function openScd(lectno, cmisno) {
-        selectedLectno = lectno;
-        selectedCmisno = cmisno;
-        $.when(
-            setScd()
-        ).done(function () {
-            setTimeout(function () {
-                bglayer();
-                $("#scdbox").slideDown("fast");
-            },200);
-        });
-    }
-
-    function updateScd() {
-        if (confirm("교육일정을 변경하시겠습니까?")) {
-            var cmisno = $("input:radio[name=rdoScds]:checked").val();
-            capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-        }
-    }
-    function afterUpdateScd() {
-        if (capResult.code > 0) {
-            msgok(1, "", true);
-            submit("mform", 800, true);
-        }
-        else {
-            msg("관리자에게 문의하세요.");
-            return;
-        }
-    }
-
     function viewas(asno) {
         winopen("/croom/asrpop?intval=" + asno, 'asrpop', 1200, screen.height - 500);
     }
diff --git a/BO/Views/croom/grade.cshtml b/BO/Views/croom/grade.cshtml
index 8c7aba2..2207771 100644
--- a/BO/Views/croom/grade.cshtml
+++ b/BO/Views/croom/grade.cshtml
@@ -48,7 +48,8 @@
 @section scriptsHeader{
     @Html.Partial("./Partial/semscript")
     @Html.Partial("./Partial/FileScript")   
-        @Html.Partial("./Partial/ScriptDate")
+    @Html.Partial("./Partial/ScriptDate")
+    @Html.Partial("./Partial/ScdScript")
 }
 @section scripts{
     <script>
diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml
index 67a44eb..adf1bb4 100644
--- a/BO/Views/croom/grade0.cshtml
+++ b/BO/Views/croom/grade0.cshtml
@@ -141,7 +141,7 @@
                         {
                             if(d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
                             {
-                                <td class="link text-center"><a href="#" onclick="javascript: openScd(@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
+                                <td class="link text-center"><a href="#" onclick="javascript: openScd(@Model.CM.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
                             }
                             else
                             {
@@ -386,81 +386,6 @@
             submit("mform", 500, true);
         } else { msgadmin2(); }
     } 
-
-    var selectedLectno;
-    var selectedCmisno;
-    function setScd() {
-        capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno }, "renderScd");
-    }
-    function renderScd() {
-        var ulScd = $("#ulScd");
-        ulScd.empty();
-        var seq = 0;
-        $.each(capResult.obj, function (i, d) {
-            var li = $("<li />");
-            if (d.isEnd == true)
-            {
-                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-            }
-            else
-            {
-                if (d.quota != 0) {
-                    if (d.remainPeople <= 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                    }
-                }
-                else {
-                    if (seq == 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                    else {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                }
-            }
-            seq++;
-            ulScd.append(li);
-        });
-
-        $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-    }
-    function openScd(lectno, cmisno) {
-        selectedLectno = lectno;
-        selectedCmisno = cmisno;
-        $.when(
-            setScd()
-        ).done(function () {
-            setTimeout(function () {
-                bglayer();
-                $("#scdbox").slideDown("fast");
-            },200);
-        });
-    }
-
-    function updateScd() {
-        if (confirm("교육일정을 변경하시겠습니까?")) {
-            var cmisno = $("input:radio[name=rdoScds]:checked").val();
-            capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-        }
-    }
-    function afterUpdateScd() {
-        if (capResult.code > 0) {
-            msgok(1, "", true);
-            submit("mform", 800, true);
-        }
-        else {
-            msg("관리자에게 문의하세요.");
-            return;
-        }
-    }
     function save4() {
         bglayer(); $("#thisbox2").slideDown("fast", function () { $("#thisbox2").scrollTop(0); });
         if ($("#cmino option").length > 1) {
diff --git a/BO/Views/croom/gradeall.cshtml b/BO/Views/croom/gradeall.cshtml
index 831e97d..adcad30 100644
--- a/BO/Views/croom/gradeall.cshtml
+++ b/BO/Views/croom/gradeall.cshtml
@@ -116,6 +116,7 @@
     @Html.Partial("./Partial/semscript")
     @Html.Partial("./Partial/FileScript")
     @Html.Partial("./Partial/ScriptDate")
+    @Html.Partial("./Partial/ScdScript")
 }
 @section scripts{
     <script>
diff --git a/BO/Views/croom/gradeall0.cshtml b/BO/Views/croom/gradeall0.cshtml
index ad36c55..6e1dca6 100644
--- a/BO/Views/croom/gradeall0.cshtml
+++ b/BO/Views/croom/gradeall0.cshtml
@@ -256,83 +256,6 @@
         }
     }
 
-    var selectedcmno;
-    var selectedLectno;
-    var selectedCmisno;
-    function setScd() {
-        capp("/acommon/GetScdForMixEdu", { cmno: selectedcmno }, "renderScd");
-    }
-    function renderScd() {
-        var ulScd = $("#ulScd");
-        ulScd.empty();
-        var seq = 0;
-        $.each(capResult.obj, function (i, d) {
-            var li = $("<li />");
-            if (d.isEnd == true)
-            {
-                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-            }
-            else
-            {
-                if (d.quota != 0) {
-                    if (d.remainPeople <= 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                    }
-                }
-                else {
-                    if (seq == 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                    else {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                }
-            }
-            seq++;
-            ulScd.append(li);
-        });
-
-        $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-    }
-    function openScd(cmno, lectno, cmisno) {
-        selectedcmno = cmno;
-        selectedLectno = lectno;
-        selectedCmisno = cmisno;
-        $.when(
-            setScd()
-        ).done(function () {
-            setTimeout(function () {
-                bglayer();
-                $("#scdbox").slideDown("fast");
-            },200);
-        });
-    }
-
-    function updateScd() {
-        if (confirm("교육일정을 변경하시겠습니까?")) {
-            var cmisno = $("input:radio[name=rdoScds]:checked").val();
-            capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-        }
-    }
-    function afterUpdateScd() {
-        if (capResult.code > 0) {
-            msgok(1, "", true);
-            submit("mform", 800,true);
-        }
-        else {
-            msg("관리자에게 문의하세요.");
-            return;
-        }
-    }
-
     var cmicmno;
     var cmilectno;
     function setcmis(){
diff --git a/BO/Views/croom/gradeall2.cshtml b/BO/Views/croom/gradeall2.cshtml
index 7cdb8e3..4e6d40c 100644
--- a/BO/Views/croom/gradeall2.cshtml
+++ b/BO/Views/croom/gradeall2.cshtml
@@ -320,81 +320,6 @@
             }
         }
     }
-
-    var selectedcmno;
-    var selectedLectno;
-    var selectedCmisno;
-    function setScd() {
-        capp("/acommon/GetScdForMixEdu", { cmno: selectedcmno }, "renderScd");
-    }
-    function renderScd() {
-        var ulScd = $("#ulScd");
-        ulScd.empty();
-        var seq = 0;
-        $.each(capResult.obj, function (i, d) {
-            var li = $("<li />");
-            if (d.isEnd == true) {
-                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-            }
-            else {
-                if (d.quota != 0) {
-                    if (d.remainPeople <= 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                    }
-                }
-                else {
-                    if (seq == 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                    else {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                }
-            }
-            seq++;
-            ulScd.append(li);
-        });
-
-        $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-    }
-    function openScd(cmno, lectno, cmisno) {
-        selectedcmno = cmno;
-        selectedLectno = lectno;
-        selectedCmisno = cmisno;
-        $.when(
-            setScd()
-        ).done(function () {
-            setTimeout(function () {
-                bglayer();
-                $("#scdbox").slideDown("fast");
-            }, 200);
-        });
-    }
-    function updateScd() {
-        if (confirm("교육일정을 변경하시겠습니까?")) {
-            var cmisno = $("input:radio[name=rdoScds]:checked").val();
-            capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-        }
-    }
-    function afterUpdateScd() {
-        if (capResult.code > 0) {
-            msgok(1, "", true);
-            submit("mform", 800, true);
-        }
-        else {
-            msg("관리자에게 문의하세요.");
-            return;
-        }
-    }
-
     var _saveidx = 0;
     function nextex(idx) {
         if (idx != 0) {
diff --git a/BO/Views/croom/gradeall4.cshtml b/BO/Views/croom/gradeall4.cshtml
index 1bc57ae..4885334 100644
--- a/BO/Views/croom/gradeall4.cshtml
+++ b/BO/Views/croom/gradeall4.cshtml
@@ -34,7 +34,7 @@
                     @foreach (var d in Model.LectSDs)
                     {
                         <tr data-sdno="@d.sdno" data-lectno="@d.lectno">
-                            <td><input type="checkbox" class="autocheck" value="@d.lectno" data-userno="@d.userno" /></td>
+                            <td><input type="checkbox" class="autocheck" value="@d.lectno" data-userno="@d.userno" data-tpoint="@d.tpoint" /></td>
                             <td>@d.rnorvt</td>
                             @if(d.cshape== 2)
                             {
@@ -64,7 +64,7 @@
                                 <td>@d.edate.Value.ToShortDateString()</td>
                             }
                             <td class="estate@(d.sdstate)">@d.sdstatename</td>
-                            <td><a class="btn btn-xxs btn-select" onclick="viewsd(@d.sdno, @d.lectno, @(idx++))" href="#">@d.cpoint2</a></td>
+                            <td><a class="btn btn-xxs btn-select" onclick="viewsd(@d.sdno, @d.lectno,@d.tpoint, @(idx++))" href="#">@d.cpoint2</a></td>
                             <td>@d.feedbox</td>
                             <td><a class="btn btn-xxs btn-select iscopy@(d.iscopy)" onclick="viewcopy(@d.sdno, @d.lectno)" href="#">@d.copyratename</a></td>
                             <td>@Html.Raw(d.submittimeip)</td>
@@ -95,6 +95,7 @@
 <div id="thisbox" class="findbox draggable regbox" style="height: 850px; width: 800px; z-index: 1041; top: 60px;  overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">개별 과제제출 내용</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <br />
+    <input type="hidden" id="tpoint" value="" />
     <table class="regtable" id="exsummary">
         <tr>
             <th>제출자</th>
@@ -195,7 +196,7 @@
     }
     function cblectsds() {
         $.each(capResult.obj, function (i, d) {
-            $("#tbody1").append(("<tr data-sdno=\"{8}\" data-lectno=\"{0}\">" +
+            $("#tbody1").append(("<tr data-sdno=\"{8}\" data-lectno=\"{0}\" data-tpoint=\"{22}\">" +
                 "<td><input type=\"checkbox\" class=\"autocheck\" value=\"{0}\" data-userno=\"{1}\" /></td>" +
                 "<td>{2}</td>" +
                 "<td>{16}</td>" +
@@ -205,7 +206,7 @@
                 "<td>{19}</td>" +
                 "{20}"+
                 "<td class=\"estate{6}\">{7}</td>" +
-                "<td><a class=\"btn btn-xxs btn-select viewsd\" onclick=\"viewsd({8}, {0}, {15})\" href=\"#\">{9}</a></td>" +
+                "<td><a class=\"btn btn-xxs btn-select viewsd\" onclick=\"viewsd({8}, {0},{22}, {15})\" href=\"#\">{9}</a></td>" +
                 "<td>{10}</td>" +
                 "<td><a class=\"btn btn-xxs btn-select iscopy{11}\" onclick=\"viewcopy({8}, {0})\" href=\"#\">{12}</a></td>" +
                 "<td>{13}</td>" +
@@ -213,19 +214,21 @@
                 "{21}").format(d.lectno, d.userno, d.rnorvt, d.isrebatename, d.asname
                     , d.usernameid, d.sdstate, d.sdstatename, d.sdno, d.cpoint2
                     , d.feedbox, d.iscopy, d.copyratename, d.submittimeip, d.checktimeip, (i + 1), d.cshape == 2 ? d.sseq : '-', d.studyplacename
-                    , d.cname, d.leststr, d.leestr, '@(!ViewBag.IsSubAdmin96)' == 'True' ? d.scomplete : d.scomplete96));
+                    , d.cname, d.leststr, d.leestr, '@(!ViewBag.IsSubAdmin96)' == 'True' ? d.scomplete : d.scomplete96, d.tpoint));
         });
         if (_isprenext) {
-            viewsd($("#tbody1 tr:eq(" + (_ridx + _saveidx - 1) + ")").attr("data-sdno"), $("#tbody1 tr:eq(" + (_ridx + _saveidx - 1) + ")").attr("data-lectno"), _ridx + _saveidx);
+            viewsd($("#tbody1 tr:eq(" + (_ridx + _saveidx - 1) + ")").attr("data-sdno"), $("#tbody1 tr:eq(" + (_ridx + _saveidx - 1) + ")").attr("data-lectno"), $("#tbody1 tr:eq(" + (_ridx + _saveidx - 1) + ")").attr("data-tpoint"), _ridx + _saveidx);
         }
     }
     var _sdno = 0;
     var _lectno = 0;
+    var _tpoint = 0;
     var _ridx=0;
-    function viewsd(sdno, lectno, ridx) {
+    function viewsd(sdno, lectno,tpoint, ridx) {
         ischange = false;
         _sdno = sdno;
         _lectno = lectno;
+        _tpoint = tpoint;
         _ridx = ridx;
         capp("/acommon/lectsd", { lectno: lectno, sdno: sdno }, "cblectsd");
     }
@@ -246,6 +249,7 @@
         setv("cpoint", d.cpoint);
         $("#feedb").val(d.feedb);
         $("#feedb").removeAttr("readonly");
+        $("#tpoint").val(_tpoint);
         //if (getdb(d.feedb) != '') {
         //    $("#feedb").attr("readonly", "readonly");
         //}
@@ -273,12 +277,12 @@
             if (getint($("#cpoint").val()) < 0) {
                 $("#cpoint").focus();
                 msg2("0점 이상으로 입력해주세요.");
-            } else if (getint($("#cpoint").val()) > getint($("#addstringval").find("option:selected").attr("data-tpoint"))) {
+            } else if (getint($("#cpoint").val()) > getint($("#tpoint").val())) {
                 $("#cpoint").focus();
-                msg2(getint($("#addstringval").find("option:selected").attr("data-tpoint")) + "점 이하으로 입력해주세요.");
+                msg2(getint($("#tpoint").val()) + "점 이하으로 입력해주세요.");
             } else if (confirm("저장하시겠습니까?")) {
                 _saveidx = idx;
-                capp("/acommon/lectsdsave", { lectno: _lectno, sdno: val("addstringval"), iscopy: $("#iscopy").prop("checked") ? 1 : 0, cpoint: val("cpoint"), feedb: val("feedb") }, "cbsave", null, null, null, true);
+                capp("/acommon/lectsdsave", { lectno: _lectno, sdno: _sdno, iscopy: $("#iscopy").prop("checked") ? 1 : 0, cpoint: val("cpoint"), feedb: val("feedb") }, "cbsave", null, null, null, true);
             }
         }
     }
@@ -303,9 +307,9 @@
         if (getint($(p).val()) < 0) {
             $(p).focus();
             msg2("0점 이상으로 입력해주세요.");
-        } else if (getint($(p).val()) > getint($("#addstringval").find("option:selected").attr("data-tpoint"))) {
+        } else if (getint($(p).val()) > getint($("#tpoint").val())) {
             $(p).focus();
-            msg2(getint($("#addstringval").find("option:selected").attr("data-tpoint"))+"점 이하으로 입력해주세요.");
+            msg2(getint($("#tpoint").val())+"점 이하으로 입력해주세요.");
         }
     }
     function viewcopy(sdno,lectno) {
@@ -330,79 +334,5 @@
             }
         }
     }
-
-    var selectedcmno;
-    var selectedLectno;
-    var selectedCmisno;
-    function setScd() {
-        capp("/acommon/GetScdForMixEdu", { cmno: selectedcmno }, "renderScd");
-    }
-    function renderScd() {
-        var ulScd = $("#ulScd");
-        ulScd.empty();
-        var seq = 0;
-        $.each(capResult.obj, function (i, d) {
-            var li = $("<li />");
-            if (d.isEnd == true) {
-                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-            }
-            else {
-                if (d.quota != 0) {
-                    if (d.remainPeople <= 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                        }
-                    }
-                }
-                else {
-                    if (seq == 0) {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                    else {
-                        li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                    }
-                }
-            }
-            seq++;
-            ulScd.append(li);
-        });
-
-        $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-    }
-    function openScd(cmno, lectno, cmisno) {
-        selectedcmno = cmno;
-        selectedLectno = lectno;
-        selectedCmisno = cmisno;
-        $.when(
-            setScd()
-        ).done(function () {
-            setTimeout(function () {
-                bglayer();
-                $("#scdbox").slideDown("fast");
-            }, 200);
-        });
-    }
-    function updateScd() {
-        if (confirm("교육일정을 변경하시겠습니까?")) {
-            var cmisno = $("input:radio[name=rdoScds]:checked").val();
-            capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-        }
-    }
-    function afterUpdateScd() {
-        if (capResult.code > 0) {
-            msgok(1, "", true);
-            submit("mform", 800, true);
-        }
-        else {
-            msg("관리자에게 문의하세요.");
-            return;
-        }
-    }
 </script>
 <iframe id="ifrthis" style="display: none;"></iframe>
diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml
index c539f0e..46b9b9e 100644
--- a/BO/Views/croom/payview.cshtml
+++ b/BO/Views/croom/payview.cshtml
@@ -9,180 +9,184 @@
     <li class="active"><a href="#" data-toggle="tab">기본정보</a></li>
     <li><a href="#" onclick="gotab()" data-toggle="tab">환불관리</a></li>
 </ul>
-<section class="panel panel-default">
-    <header class="panel-heading"><strong><i class="fa fa-bars"></i> 신청자정보<span class=""></span></strong></header>
-    <table class="regtable" style="margin-top: 0;">
-        <colgroup><col width="100" /><col width="150" /><col width="100" /><col width="200" /><col width="100" /><col /></colgroup>
-        <tr>
-            <th>결제번호</th>
-            <td>@p.payno</td>
-            <th>주문날짜</th>
-            <td>@p.cdtymdhms</td>
-            <th>주문자명</th>
-            <td>@p.username</td>
-        </tr>
-        <tr>
-            <th>생년월일</th>
-            <td>@(p.userpno == null || p.userpno.Length < 6 ? "" : p.userpno.Substring(0, 6))</td>
-            <th>일반전화</th>
-            <td>@p.telno</td>
-            <th>휴대폰</th>
-            <td>@p.mobile</td>
-        </tr>
-        <tr>
-            <th>주소</th>
-            <td colspan="3">@p.post @p.address1 @p.address2</td>
-            <th>이메일</th>
-            <td>@p.email</td>
-        </tr>
-    </table>
-</section>
-<section class="panel panel-default">
-    <header class="panel-heading"><strong><i class="fa fa-bars"></i> 결제정보<span class=""></span></strong></header>
-    <table class="regtable" style="margin-top: 0;">
-        <colgroup><col width="100" /><col width="150" /><col width="100" /><col width="200" /><col width="100" /><col /></colgroup>
-        <tr>
-            <th>결제금액</th>
-            <td>@(p.pstatus == 1 ? p.payamt.ToString("#,0") : "0")원</td>
-            <th>결제방식</th>
-            <td>
-                @if (isexamready)
-                {
-                    @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-결제방식선택;4:현금;5:현금+카드;6:무료;9:위탁계약" }, { "name", "ptype" }, { "style", "width:100%;" } })
-                }
-                else if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0)
-                {
-                    @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:신용카드2:계좌이체;3:가상계좌;4:무통장입금;6:무료" }, { "name", "ptype2" }, { "style", "width:100%;" }, { "selected", Model.Pay.ptype } })
-                }
-                else
-                {
-                    @:@p.ptypename
-                }
-            </td>
-            <th>결제상태</th>
-            <td>
-                @if (isexamready)
-                {
-                    @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:결제완료;21:결제대기;41:결제취소" }, { "name", "pstatus" }, { "selected", p.pstatus }, { "style", "width:100%;" } })
-                }
-                else
-                {
-                    @:@p.pstatusname2 @*@(p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 && p.paylimit.Value > DateTime.Now?string.Format("(만료일: {0})", p.paylimit.Value.ToString("yyyy-MM-dd")):"")*@
-                }
-                @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0@*&& p.paylimit.Value < DateTime.Now*@)
-                {
-                    <a href="#" class="btn btn-primary" onclick="unpay(@p.payno)">미수처리</a>
-                    <a href="#" class="btn btn-primary" onclick="abspay(@p.payno)">결제완료처리</a>
-                    <a href="#" class="btn btn-primary" onclick="cancelpay(@p.payno, @p.userno)">취소</a>
-                }
-                else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1)
-                {
-                    @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } })
-                    <a href="#" class="btn btn-primary" onclick="unpaymoney(@p.payno)">미수입금처리</a>
-                }
-                else if (p.isunpay == 2)
-                {
-                    @:(미수입금)
-                }
-                else if (p.isunpay == 3)
-                {
-                    @:(결제변경)
-                }
-            </td>
-        </tr>
-        <tr>
-            <th>신청/승인일</th>
-            <td>@(p.oktime == null ? "" : p.oktime.Value.ToString("yyyy-MM-dd HH:mm:ss"))</td>
-            <th>입금일</th>
-            <td>
-                @if (isexamready)
-                {
-                    @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } })
-                }
-                else
-                {
-                    @:@(p.payoktime == null ? "" : p.payoktime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
-                }
-            </td>
-            <th>LG유플러스 코드</th>
-            <td>@(p.ispg == 0 ? "수동결제" : p.pgkey)</td>
-        </tr>
-        <tr>
-            <th>
-                계산서신청
-            </th>
-            <td>
-                @if (p.taxno != null)
-                {
-                    <a href="#" onclick="gotax(@p.payno)" class="link" style="color:blue">신청</a>
-                }
-                else
-                {
-                    <span>-</span>
-                }
-            </td>
-            <th>
-                계산서발행
-            </th>
-            <td>
-                @if (p.iscancel == null || p.taxdate == null)
-                {
-                    <span>-</span>
-                }
-                else
-                {
-                    if (p.iscancel == 1)
+<form id="mform" method="post">
+    <input type="hidden" name="payno" value="@p.payno" />
+    <input type="hidden" name="userno" value="@p.userno" />
+    <section class="panel panel-default">
+        <header class="panel-heading"><strong><i class="fa fa-bars"></i> 신청자정보<span class=""></span></strong></header>
+        <table class="regtable" style="margin-top: 0;">
+            <colgroup><col width="100" /><col width="150" /><col width="100" /><col width="200" /><col width="100" /><col /></colgroup>
+            <tr>
+                <th>결제번호</th>
+                <td>@p.payno</td>
+                <th>주문날짜</th>
+                <td>@p.cdtymdhms</td>
+                <th>주문자명</th>
+                <td>@p.username</td>
+            </tr>
+            <tr>
+                <th>생년월일</th>
+                <td>@(p.userpno == null || p.userpno.Length < 6 ? "" : p.userpno.Substring(0, 6))</td>
+                <th>일반전화</th>
+                <td>@p.telno</td>
+                <th>휴대폰</th>
+                <td>@p.mobile</td>
+            </tr>
+            <tr>
+                <th>주소</th>
+                <td colspan="3">@p.post @p.address1 @p.address2</td>
+                <th>이메일</th>
+                <td>@p.email</td>
+            </tr>
+        </table>
+    </section>
+    <section class="panel panel-default">
+        <header class="panel-heading"><strong><i class="fa fa-bars"></i> 결제정보<span class=""></span></strong></header>
+        <table class="regtable" style="margin-top: 0;">
+            <colgroup><col width="100" /><col width="150" /><col width="100" /><col width="200" /><col width="100" /><col /></colgroup>
+            <tr>
+                <th>결제금액</th>
+                <td>@(p.pstatus == 1 ? p.payamt.ToString("#,0") : "0")원</td>
+                <th>결제방식</th>
+                <td>
+                    @if (isexamready)
                     {
-                        <span>발행취소</span>
+                        @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-결제방식선택;4:현금;5:현금+카드;6:무료;9:위탁계약" }, { "name", "ptype" }, { "style", "width:100%;" } })
+                    }
+                    else if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0)
+                    {
+                        @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:신용카드2:계좌이체;3:가상계좌;4:무통장입금;6:무료" }, { "name", "ptype2" }, { "style", "width:100%;" }, { "selected", Model.Pay.ptype } })
                     }
                     else
                     {
-                        if (p.taxdate == null)
+                        @:@p.ptypename
+                    }
+                </td>
+                <th>결제상태</th>
+                <td>
+                    @if (isexamready)
+                    {
+                        @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:결제완료;21:결제대기;41:결제취소" }, { "name", "pstatus" }, { "selected", p.pstatus }, { "style", "width:100%;" } })
+                    }
+                    else
+                    {
+                        @:@p.pstatusname2 @*@(p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 && p.paylimit.Value > DateTime.Now?string.Format("(만료일: {0})", p.paylimit.Value.ToString("yyyy-MM-dd")):"")*@
+                    }
+                    @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0@*&& p.paylimit.Value < DateTime.Now*@)
+{
+<a href="#" class="btn btn-primary" onclick="unpay(@p.payno)">미수처리</a>
+<a href="#" class="btn btn-primary" onclick="abspay(@p.payno)">결제완료처리</a>
+<a href="#" class="btn btn-primary" onclick="cancelpay(@p.payno, @p.userno)">취소</a>
+}
+else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1)
+{
+@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } })
+<a href="#" class="btn btn-primary" onclick="unpaymoney(@p.payno)">미수입금처리</a>
+}
+else if (p.isunpay == 2)
+{
+@:(미수입금)
+}
+else if (p.isunpay == 3)
+{
+@:(결제변경)
+}
+                </td>
+            </tr>
+            <tr>
+                <th>신청/승인일</th>
+                <td>@(p.oktime == null ? "" : p.oktime.Value.ToString("yyyy-MM-dd HH:mm:ss"))</td>
+                <th>입금일</th>
+                <td>
+                    @if (isexamready)
+                    {
+                        @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } })
+                    }
+                    else
+                    {
+                        @:@(p.payoktime == null ? "" : p.payoktime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+                    }
+                </td>
+                <th>LG유플러스 코드</th>
+                <td>@(p.ispg == 0 ? "수동결제" : p.pgkey)</td>
+            </tr>
+            <tr>
+                <th>
+                    계산서신청
+                </th>
+                <td>
+                    @if (p.taxno != null)
+                    {
+                        <a href="#" onclick="gotax(@p.payno)" class="link" style="color:blue">신청</a>
+                    }
+                    else
+                    {
+                        <span>-</span>
+                    }
+                </td>
+                <th>
+                    계산서발행
+                </th>
+                <td>
+                    @if (p.iscancel == null && p.taxdate == null)
+                    {
+                        <span>-</span>
+                    }
+                    else
+                    {
+                        if (p.iscancel == 1)
                         {
-                            <span>미발행</span>
+                            <span>발행취소</span>
                         }
                         else
                         {
-                            <span>발행완료</span>
+                            if (p.taxdate == null)
+                            {
+                                <span>미발행</span>
+                            }
+                            else
+                            {
+                                <span>발행완료</span>
+                            }
                         }
                     }
-                }
-            </td>
-            <th>
-                입금계좌
-            </th>
-            <td>
-                @p.vactbankname | @p.vactnum | @p.vactname
-            </td>
-        </tr>
-    </table>
-</section>
-<section class="panel panel-default">
-    <header class="panel-heading"><strong><i class="fa fa-bars"></i> 상품내역<span class=""></span></strong></header>
-    <table class="regtable" style="margin-top: 0;">
-        <thead><tr><th>상품코드</th><th>상품유형</th><th>과정분류</th><th>상품명</th><th>판매가</th><th>수량</th><th>합계금액</th></tr></thead>
-        @foreach (var d in pi)
-        {
-            <tr>
-                <td>@d.itemno</td>
-                <td>@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)</td>
-                <td>@d.cgname</td>
-                <td class="left">@d.itemname</td>
-                <td class="right">@((d.payamt / d.pcnt).ToString("#,0"))</td>
-                <td class="right">@d.pcnt</td>
-                <td class="right">@d.payamt.ToString("#,0")</td>
+                </td>
+                <th>
+                    입금계좌
+                </th>
+                <td>
+                    @p.vactbankname | @p.vactnum | @p.vactname
+                </td>
             </tr>
-        }
-        @if (p.isdvr == 1)
+        </table>
+    </section>
+    <section class="panel panel-default">
+        <header class="panel-heading"><strong><i class="fa fa-bars"></i> 상품내역<span class=""></span></strong></header>
+        <table class="regtable" style="margin-top: 0;">
+            <thead><tr><th>상품코드</th><th>상품유형</th><th>과정분류</th><th>상품명</th><th>판매가</th><th>수량</th><th>합계금액</th></tr></thead>
+            @foreach (var d in pi)
+            {
+                <tr>
+                    <td>@d.itemno</td>
+                    <td>@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)</td>
+                    <td>@d.cgname</td>
+                    <td class="left">@d.itemname</td>
+                    <td class="right">@((d.payamt / d.pcnt).ToString("#,0"))</td>
+                    <td class="right">@d.pcnt</td>
+                    <td class="right">@d.payamt.ToString("#,0")</td>
+                </tr>
+            }
+            @if (p.isdvr == 1)
+            {
+                <tr><td class="left" colspan="7">- 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")</td></tr>
+            }
+            <tr><td class="left" colspan="7">- 최종합계: @p.payamt.ToString("#,0") 원</td></tr>
+        </table>
+        @if (isexamready)
         {
-            <tr><td class="left" colspan="7">- 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")</td></tr>
+            <div style="padding: 5px 10px; text-align: right;"><a href="#" class="btn btn-primary" onclick="save2();">저장</a></div>
         }
-        <tr><td class="left" colspan="7">- 최종합계: @p.payamt.ToString("#,0") 원</td></tr>
-    </table>
-    @if (isexamready)
-    {
-        <div style="padding: 5px 10px; text-align: right;"><a href="#" class="btn btn-primary" onclick="save2();">저장</a></div>
-    }
+</form>
 </section>
 
 @if (pi.FirstOrDefault().isrebate == 1)
@@ -231,7 +235,7 @@
 {
     <section class="panel panel-default">
         <header class="panel-heading"><strong><i class="fa fa-bars"></i> 배송지정보<span class=""></span></strong></header>
-        <form id="mform" method="post">
+        <form id="mform2" method="post">
             <table class="regtable postbox" style="margin-top: 0;">
                 <colgroup><col width="150" /><col width="200" /><col width="100" /><col width="200" /><col width="100" /><col /></colgroup>
                 <tr>
@@ -266,8 +270,6 @@
                     <td>@(p.codetime == null ? "" : p.codetime.Value.ToString("yyyy-MM-dd HH:mm:ss"))</td>
                 </tr>
             </table>
-
-            <input type="hidden" name="payno" value="@p.payno" />
         </form>
         <div style="padding: 5px 10px; text-align: right;"><a href="#" class="btn btn-primary" onclick="save();">저장</a></div>
     </section>
@@ -312,7 +314,7 @@
                 </tr>
             </table>
             <div style="padding: 5px 10px; text-align: right;">
-                <a href="#" class="btn btn-primary" onclick="openScd(@Model.Lect.lectno, @Model.Lect.cmisno);">수정</a><br />
+                <a href="#" class="btn btn-primary" onclick="openScd(@Model.CM.cmno,@Model.Lect.lectno, @Model.Lect.cmisno);">수정</a><br />
             </div>
         </section>
     }
@@ -407,6 +409,7 @@
 @section scriptsHeader{
     @Html.Partial("./Partial/ScriptPost")
     @Html.Partial("./Partial/ScriptDate")
+    @Html.Partial("./Partial/ScdScript")
 }
 @section scripts{
     <script>
@@ -422,7 +425,7 @@
         }
         function save() {
             if (confirm("배송정보를 수정하시겠습니까?")) {
-                cap("/acommon/paydvrsave2", "mform", "cbsave");
+                cap("/acommon/paydvrsave2", "mform2", "cbsave");
             }
         }
         function cbsave() {
@@ -602,75 +605,5 @@
                 $("#thisbox").slideUp('fast'); $('#bglayer').hide();
             }
         }
-        function setScd() {
-            capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno }, "renderScd");
-        }
-        function renderScd() {
-            var ulScd = $("#ulScd");
-            ulScd.empty();
-            var seq = 0;
-            $.each(capResult.obj, function (i, d) {
-                var li = $("<li />");
-                if (d.isEnd == true)
-                {
-                    li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
-                }
-                else
-                {
-                    if (d.quota != 0) {
-                        if (d.remainPeople <= 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
-                        }
-                        else {
-                            if (seq == 0) {
-                                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                            }
-                            else {
-                                li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음)</label></label>");
-                            }
-                        }
-                    }
-                    else {
-                        if (seq == 0) {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                        }
-                        else {
-                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'>" + d.scdInfoSummary + "</label>");
-                        }
-                    }
-                }
-                seq++;
-                ulScd.append(li);
-            });
-
-            $("input:radio[name='rdoScds']:radio[value='" + selectedCmisno + "']").prop('checked', true);
-        }
-        function openScd(lectno, cmisno) {
-            selectedLectno = lectno;
-            selectedCmisno = cmisno;
-            $.when(
-                setScd()
-            ).done(function () {
-                setTimeout(function () {
-                    bglayer();
-                    $("#scdbox").slideDown("fast");
-                }, 200);
-            });
-        }
-        function updateScd() {
-            if (confirm("교육일정을 변경하시겠습니까?")) {
-                var cmisno = $("input:radio[name=rdoScds]:checked").val();
-                capp("/acommon/LectScdChange", { lectno: selectedLectno, cmisno: cmisno }, "afterUpdateScd");
-            }
-        }
-        function afterUpdateScd() {
-            if (capResult.code > 0) {
-                msg2("저장되었습니다.", null, null, "location.href = location.href");
-            }
-            else {
-                msg("관리자에게 문의하세요.");
-                $("#thisbox").slideUp('fast'); $('#bglayer').hide();
-            }
-        }
     </script>
 }
diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs
index 90d7212..8cd5da7 100644
--- a/Base/Controller/ACommonCRoom.cs
+++ b/Base/Controller/ACommonCRoom.cs
@@ -1385,7 +1385,7 @@ namespace NP.Base.Controllers
         [HttpPost]
         public JsonResult GetScdForMixEdu(int cmno, int iscmlects = 0)
         {
-            var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", new System.Collections.Hashtable() { { "cmno", cmno }});
+            var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu.admin", new System.Collections.Hashtable() { { "cmno", cmno }});
             foreach (var item in result)
             {
                 item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm"));
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 9b04864..efd9427 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -1865,6 +1865,35 @@
         <isNotNull property="cmno">and a.cmno=#cmno#</isNotNull>
         <isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull>
       </select>
+      <select id="cm.cminningscds.applyedu.admin" parameterClass="hashtable" resultClass="cminningscd">
+        select a.*
+        from (
+          select
+            a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
+            ,a.remainPeople
+            ,a.isselected
+            ,case when a.remainPeople &lt;= 0 then 0 else 1 end isend
+          from
+          (
+            select  a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
+              ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1  and z.ischanged=0)) remainPeople
+              ,a.studyplace,case when c.scdtype =1 then '온라인' else e.cname end studyplacename
+              ,case when date_format(d.setime,'%Y%m%d') = date_format(a.estart,'%Y%m%d') then 1 else 0 end isselected
+            from cminningscd a
+            left outer join cminning c on c.cmino = a.cmino
+            left outer join cm d on d.cmno = c.cmno
+            left outer join comcode e on e.ccode = a.studyplace
+            <dynamic prepend="where">
+              <isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
+            </dynamic>
+          )a
+          <dynamic prepend="where">
+            <isNotNull property="month" prepend="and">a.startmonth=#month#</isNotNull>
+          </dynamic>
+        ) a
+        where a.isend = 1 and a.remainPeople &gt; 0
+        order by a.estart
+      </select>
       <select id="cm.cminningscds.applyedu" parameterClass="hashtable" resultClass="cminningscd">
         select a.*
         from (
@@ -1872,7 +1901,7 @@
             a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
             ,a.remainPeople
             ,a.isselected
-            ,case when a.estart &lt; date_add(date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval 6 day ),interval -1 second) or a.remainPeople &lt;= 0 then 0 else 1 end isend
+            ,case when a.estart &lt; date_add(date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval 4 day ),interval -1 second) or a.remainPeople &lt;= 0 then 0 else 1 end isend
           from
           (
             select  a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
@@ -1899,7 +1928,7 @@
           a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
           ,a.studyplace, a.studyplacename,a.remainPeople
           ,a.isselected
-          ,case when a.estart &lt; date_add(date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval 6 day ),interval -1 second) or a.remainPeople &lt;= 0 then 0 else 1 end isend
+          ,case when a.estart &lt; date_add(date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval 1 day ),interval -1 second) or a.remainPeople &lt;= 0 then 0 else 1 end isend
         from
         (
           select  a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 96a684b..4c47433 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -833,13 +833,13 @@
           select a.*
           from (
               select a.lectno,a.userno,a.cmno,a.isrebate
-                ,p.payoktime,a.sdate,edate
+                ,p.payoktime,a.sdate,a.edate
                 ,b.exno,b.exname
                 ,b2.cshape,b2.cname
                 ,c.estart,c.eend,c.eip,c.tpoint,c.recount,c.entercount,c.cblock
                 ,d.username,d.userid
                 ,e.asname
-                ,f.estart lestart,f.eend leend,f.sseq
+                ,f.cmisno,f.estart lestart,f.eend leend,f.sseq
                 ,g.cname studyplacename
                 ,a.iscomplete
                 ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">d.username</isNull>) rno
@@ -857,7 +857,7 @@
               <isNotNull property="extype">and b.extype = #extype#</isNotNull>
               <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
               <isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull>
-              <isNotEmpty property="edate">and date_format(a.edate,'%Y%m%d')=date_format(#edate#,'%Y%m%d')</isNotEmpty>
+              <isNotNull property="edate" prepend="and">date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#</isNotNull>
               <isNotNull property="cshape">and b2.cshape = #cshape#</isNotNull>
               <isNotEmpty property="cname">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
               <isNotEmpty property="cnamestr">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
@@ -1079,11 +1079,11 @@
             select a.lectno,a.userno,a.cmno,a.isrebate
               ,p.payoktime,a.sdate,a.edate
               ,g.cname,g.cshape
-              ,b.sdno
+              ,b.sdno,b.tpoint
               ,c.atext,round((f.MAX_SCORE/100)) copyrate,c.iscopy,c.cpoint,c.feedb,c.submittime,c.submitip,c.checktime,c.checkip
               ,d.username,d.userid,d.usertype
               ,e.asname
-              ,h.estart lestart,h.eend leend,h.sseq
+              ,h.cmisno,h.estart lestart,h.eend leend,h.sseq
               ,i.cname studyplacename
               ,a.iscomplete
               ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">d.username</isNull>) rno
@@ -1099,7 +1099,7 @@
             left outer join cminningscd h on h.cmisno = a.cmisno
             left outer join comcode i on i.ccode = h.studyplace and i.isuse=1
             where a.status=1 and a.ischanged=0
-            <isNotEmpty property="edate">and date_format(a.edate,'%Y%m%d')=date_format(#edate#,'%Y%m%d')</isNotEmpty>
+            <isNotNull property="edate" prepend="and">date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') = #edate#</isNotNull>
             <isNotNull property="cshape">and g.cshape = #cshape#</isNotNull>
             <isNotEmpty property="cname">and g.cname like concat('%',#cname#,'%')</isNotEmpty>
             <isNotEmpty property="cnamestr">and g.cname like concat('%',#cname#,'%')</isNotEmpty>
@@ -1504,8 +1504,8 @@
             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="issubtable">
-              and (b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01' and ifnull(a.iscomplete,0) = 0 and scd.estart &gt; now()
-              and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))
+              and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01' and ifnull(a.iscomplete,0) = 0 and scd.estart &gt; now()
+              <!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))-->
               and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59'))
             </isNotNull>
             union all
@@ -1822,7 +1822,7 @@
         
         update lect a
         left outer join cminningscd b on b.cmisno = a.cmisno
-        set a.edate = case when b.eend is not null then b.eend else a.edate end
+        set a.edate = case when a.edate is not null then case when b.eend is not null then b.eend else a.edate end else a.edate end
         where a.lectno = #lectno#;
       </update>
       <select id="lect.checkuser.cmisno" parameterClass="hashtable" resultClass="int">