diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 382ec64..b6a5264 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -141,6 +141,10 @@ namespace NP.BO.Controllers
         }
         public ActionResult cmlects(VMCM vm)
         {
+            if (vm.addstringval4 == null)
+            {
+                vm.addstringval4 = "2099-12-31";
+            }
             //검색조건
             var ht = new System.Collections.Hashtable() { { "cmno", vm.intval} };
             ht.Add("isready", 0);
@@ -189,10 +193,15 @@ namespace NP.BO.Controllers
                 vm.CM = Dao.Get<CM>("cm.cm", new System.Collections.Hashtable() { { "cmno", vm.intval } }).First();
                 ht.Remove("cmno");
                 ht.Add("cmno", vm.CM.cmno);
+                if (vm.addstringval4 != "2099-12-31")
+                {
+                    ht.Add("scdestart", vm.addstringval4);
+                }
                 ht.Add("searchtext", vm.addstringval5);
                 vm.Lects = Dao.Get<Lect>("lect.lects", ht);
             }
 
+            vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob");
             return View(vm);
         }
         public ActionResult asrpop(VMCM vm)
diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml
index 1c40000..7179c3d 100644
--- a/BO/Views/croom/cmlects.cshtml
+++ b/BO/Views/croom/cmlects.cshtml
@@ -58,7 +58,7 @@
         <div style="padding: 5px 20px; background-color: #fff;">
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-수강상태;3:신청중;1:수강중;8:수강취소" }, { "name", "addstringval" }, { "selected", Model.addstringval }, { "onchange", "submit()" } })
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-결제상태;0:결제대기;1:입금대기;2:결제완료;3:결제취소;4:환불신청;5:부분환불;6:전액환불" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "submit()" } })
-
+            <div id="divedudate" style="display:inline-block"></div>
             @Html.Partial("./Partial/Text", Model.addstringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "addstringval5", Value = Model.addstringval5, PH = "ID 또는 이름을 입력하세요.", CssClass = "", Style = "width:250px; display:inline-block;" }))
             <a href="#" class="btn btn-default" onclick="submit()" id="btnsearchtext">검색</a>
             &nbsp;&nbsp;
@@ -81,29 +81,38 @@
                         <th>수강상태</th>
                         <th>결제상태</th>
                         <th>교육일</th>
+                        <th>환급</th>
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
                     @foreach (var d in Model.Lects)
                     {
-                        <tr>
-                            <td><input type="checkbox" class="autocheck" value="@d.lectno" data-userno="@d.userno" /></td>
-                            <td>@d.rnorvt</td>
-                            <td class="link text-center"><a href="#" onclick="viewas(@d.asno);">@d.asname</a></td>
-                            <td>@(d.cnoname)(@d.cnoid)</td>
-                            <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,@d.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}",d.asname??"",d.username, d.userid??"", d.uduty??"", d.depart??"", d.email, d.telno, d.mobile,d.ckfcfyear,d.assignuser,d.edus,d.sdate==null?"":d.sdate.Value.ToString("yyyy-MM-dd"),d.edate==null?"":d.edate.Value.ToString("yyyy-MM-dd"))')">@d.username</a>@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : ("<a href=\"/aCommon/DownFile?fno=" + d.fileno + "&loginfo=\"> <i class=\"fa fa-paperclip\"></i></a>"))</td>
-                            <td>@d.cdtymd</td>
-                            <td>@d.statusname</td>
-                            <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="jabscript: openScd(@d.lectno, @d.cmisno);">@d.estart.ToShortDateString()</a></td>
-                            }
-                            else
-                            {
-                                <td>-</td>
-                            }
-                        </tr>
+                    <tr>
+                        <td><input type="checkbox" class="autocheck" value="@d.lectno" data-userno="@d.userno" /></td>
+                        <td>@d.rnorvt</td>
+                        <td class="link text-center"><a href="#" onclick="viewas(@d.asno);">@d.asname</a></td>
+                        <td>@(d.cnoname)(@d.cnoid)</td>
+                        <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,@d.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}:{16}",d.asname??"",d.username, d.userid??"", d.uduty??"", d.depart??"", d.email, d.telno, d.mobile,d.ckfcfyear,d.assignuser,d.edus,d.sdate==null?"":d.sdate.Value.ToString("yyyy-MM-dd"),d.edate==null?"":d.edate.Value.ToString("yyyy-MM-dd"),d.typeman,d.typejob,d.typeedu,d.typegrade)')">@d.username</a>@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : ("<a href=\"/aCommon/DownFile?fno=" + d.fileno + "&loginfo=\"> <i class=\"fa fa-paperclip\"></i></a>"))</td>
+                        <td>@d.cdtymd</td>
+                        <td>@d.statusname</td>
+                        <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="jabscript: openScd(@d.lectno, @d.cmisno);">@d.estart.ToShortDateString()</a></td>
+                        }
+                        else
+                        {
+                            <td>-</td>
+                        }
+                        @if (d.cshape == 1 && d.isrebate == 1)
+                        {
+                            <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, 0, @d.payuserno)">@d.isrebatename</a></td>
+                        }
+                        else
+                        {
+                            <td>-</td>
+                        }
+                    </tr>
                     }
                 </tbody>
             </table>
@@ -119,20 +128,57 @@
     <table class="regtable">
         <colgroup><col style="width:150px;" /><col /></colgroup>
         <tr><th>고객사</th><td id="asname"></td></tr>
-        @*<tr><th>사업장과의관계</th><td id="assignuser"></td></tr>*@
         <tr><th>이름(ID)</th><td id="usernameid"></td></tr>
         <tr><th>직위</th><td id="positiondepart"></td></tr>
-        @*@if(Model.CM.cgno != 10)
-            {
-            <tr><th>공정거래업무경력</th><td id="ckfcfyear"></td></tr>
-            }*@
         <tr><th>이메일</th><td id="email"></td></tr>
-        @*<tr><th>회사전화번호</th><td id="telno"></td></tr>*@
         <tr><th>휴대전화번호</th><td id="mobile"></td></tr>
-        @*<tr><th>연합회 교육이력</th><td id="edus"></td></tr>*@
         <tr><th>교육기간</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "sdate" } }) ~ @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "edate" } })<a href="#" id="btnchange" class="btn btn-info" onclick="change();">저장</a></td></tr>
         <tr class="trhidebox" style="@(Model.CM.certcc == null ? "display: none;":"")"><th>경력증명서</th><td id="filelist"></td></tr>
         <tr class="trhidebox" style="@(Model.CM.certcc == null ? "display: none;":"")"><th>심사여부</th><td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "3:신청중;4:승인;5:미승인" }, { "checked", 3 }, { "name", "status" } })</td></tr>
+        <tr>
+            <th>기술인분류</th>
+            <td>
+                <select class="form-control dev" id="selTypeman" name="selTypeman">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>직무분야</th>
+            <td>
+                <select class="form-control dev" id="selTypejob" name="selTypejob">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>교육목적</th>
+            <td>
+                <select class="form-control dev" id="selTypeedu" name="selTypeedu">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>등급</th>
+            <td>
+                <select class="form-control dev" id="selTypegrade" name="selTypegrade">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
     </table>
     <div class="findboxbtnbox" id="btnsavelect">
         <a href="#" class="btn btn-primary" onclick="save();">심사여부 저장</a>
@@ -196,6 +242,7 @@
                     submit();
                 }
             });
+            setScd2();
     });
     function leave() {
         if ($("#tbody1 tr input.autocheck:checked").length < 1) {
@@ -259,6 +306,10 @@
                     $("#btnsavelect").attr("style", "display:none;");
                 }
             }
+            $("#selTypeman").val(ds[13]).attr("selected", "selected");
+            $("#selTypejob").val(ds[14]).attr("selected", "selected");
+            $("#selTypeedu").val(ds[15]).attr("selected", "selected");
+            $("#selTypegrade").val(ds[16]).attr("selected", "selected");
         }
     }
     function change() {
@@ -341,7 +392,32 @@
         }
     }
 
-
+    function setScd2() {
+        capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno }, "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 (d.estartday >= @DateTime.Now.DayOfYear)
+            {
+                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");
     }
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 8e7aac5..b61c0c0 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -164,8 +164,9 @@
             ,c.pstatus,c.payno,c.userno payuserno
             ,b.rstatus
             ,a2.rstime,a2.retime,a2.sstime,a2.setime,a2.cshape,a2.studydays
-            ,a.sdate,a.edate
+            ,a.sdate,a.edate,a.isrebate
             ,scd.estart,scd.eend
+            ,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob
             ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.payno,a.pino</isNull>) rno
             ,count(a.cdt) over() pagetotalcount
             from lect a
@@ -183,6 +184,7 @@
             left outer join payrfditem rfdi on rfdi.pino=a.pino
             left outer join payrfd rfd on rfd.rfdno=rfdi.rfdno
             left outer join cminningscd scd on a.cmisno = scd.cmisno
+            left outer join pplog pp on c.pplno = pp.pplno
             where a.ischanged=0
             <isNotNull property="isready" prepend="and">ifnull(a.isready,0)=#isready#</isNotNull>
             <isNotNull property="lectno" prepend="and">a.lectno=#lectno#</isNotNull>
@@ -195,6 +197,9 @@
               or
               d.userid like concat('%', #searchtext#,'%'))
             </isNotNull>
+            <isNotNull property="scdestart" prepend="and">
+              date_format(scd.estart,'%Y%m%d') = date_format(#scdestart#,'%Y%m%d')
+            </isNotNull>
             and (rfdi.rfdno is null or rfd.rfdno is not null)
             order by rno
         </select>
diff --git a/Model/CM.cs b/Model/CM.cs
index 9164419..edf95c4 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -1183,6 +1183,11 @@ namespace NP.Model
         public String pgkey { get; set; }
         public String itemname { get; set; }
         public int? ispass { get; set; }
+
+        public int typeman { get; set; }
+        public int typeedu { get; set; }
+        public int typegrade { get; set; }
+        public int typejob { get; set; }
     }
     /// <summary>
     /// 자격검정시험  
@@ -3399,6 +3404,18 @@ namespace NP.Model
         /// 교육시작
         /// </summary>
         public DateTime estart { get; set; }
+        public string estartShortDateString {
+            get {
+                return estart.ToShortDateString();
+            }
+        }
+        public int estartday
+        {
+            get {
+                return estart.DayOfYear;
+            }
+        }
+
         public string estart2 { get; set; }
         /// <summary>
         /// 교육종료