diff --git a/web/src/main/resources/templates/jlw/courseInfo/examInfoList.html b/web/src/main/resources/templates/jlw/courseInfo/examInfoList.html
index df43a716..892e79eb 100644
--- a/web/src/main/resources/templates/jlw/courseInfo/examInfoList.html
+++ b/web/src/main/resources/templates/jlw/courseInfo/examInfoList.html
@@ -7,6 +7,7 @@
     }
     .layui-table a {
         margin-right: 10px;
+        cursor: pointer;
     }
     #addGeneral_demo .layui-form-item{
         margin-bottom: 5px;
@@ -27,56 +28,63 @@
 </div>
 
 <table id="courseInfoTable" lay-filter="courseInfoTable"></table>
+<!--#} -->
 <div id="addGeneral_demo" class="layui-form" style="display: none;padding: 20px 20px 0px 0;overflow: auto;">
+    <div id="addGeneral_view" class="layui-form-item" ></div>
+
     <div class="layui-form-item">
-        <label class="layui-form-label">考试标题</label>
+        <label class="layui-form-label">题目来源</label>
         <div class="layui-input-block">
-            <input type="text" name="generalQuestionSettingName" placeholder="请输入考证名称" autocomplete="off" class="layui-input">
+            <div id="demo1" class="xm-select-demo"></div>
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">考试时间</label>
-        <div class="layui-input-block">
-            <input type="text" id="examTime_" name="examTime_" placeholder="请选择时间" autocomplete="off" class="layui-input">
+
+    <script type="text/html" id="addGeneral_html_demo">
+        <div class="layui-form-item">
+            <label class="layui-form-label">考试标题</label>
+            <div class="layui-input-block">
+                <input type="text" name="generalQuestionSettingName" placeholder="请输入考证名称" value="{{d.generalQuestionSettingName ||''}}" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">作答次数</label>
-        <div class="layui-input-block">
-            <input type="text" name="generalQuestionSettingDoCount" placeholder="请输入作答次数" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">考试时间</label>
+            <div class="layui-input-block">
+                <input type="text" id="examTime_" name="examTime_" placeholder="请选择时间" value="" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label"></label>
-        <div class="layui-input-block">
-            <label style="width: 50%;float:left;">
-                <span style="float: left;width: 155px;line-height: 38px;">题目乱序（同一大题）</span>
-                <input type="radio" name="generalQuestionSettingQuestionNoOrder" value="1" title="是" checked>
-                <input type="radio" name="generalQuestionSettingQuestionNoOrder" value="2" title="否" >
-            </label>
-            <label style="width: 50%;float:left;">
-                <span style="float: left;width: 155px;line-height: 38px;">选项乱序（同一大题内）</span>
-                <input type="radio" name="generalQuestionSettingOptionNoOrder" value="1" title="是" checked>
-                <input type="radio" name="generalQuestionSettingOptionNoOrder" value="2" title="否" >
-            </label>
-            <label style="width: 50%;float:left;">
-                <span style="float: left;width: 155px;line-height: 38px;">答卷后显示答案解析</span>
-                <input type="radio" name="generalQuestionSettingEndShowQa" value="1" title="是" checked>
-                <input type="radio" name="generalQuestionSettingEndShowQa" value="2" title="否" >
-            </label>
-            <label style="width: 50%;float:left;">
-                <span style="float: left;width: 155px;line-height: 38px;">答卷后显示答案对错</span>
-                <input type="radio" name="generalQuestionSettingEndShowTrueFalse" value="1" title="是" checked>
-                <input type="radio" name="generalQuestionSettingEndShowTrueFalse" value="2" title="否" >
-            </label>
+        <div class="layui-form-item">
+            <label class="layui-form-label">作答次数</label>
+            <div class="layui-input-block">
+                <input type="text" name="generalQuestionSettingDoCount" value="{{d.generalQuestionSettingDoCount ||''}}" placeholder="请输入作答次数" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">题目来源</label>
-        <div class="layui-input-block">
-            <div id="demo1" class="xm-select-demo"></div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <label style="width: 50%;float:left;">
+                    <span style="float: left;width: 155px;line-height: 38px;">题目乱序（同一大题）</span>
+                    <input type="radio" name="generalQuestionSettingQuestionNoOrder" value="1" title="是" {{d.generalQuestionSettingQuestionNoOrder==1||d.generalQuestionSettingQuestionNoOrder==null?'checked':''}}>
+                    <input type="radio" name="generalQuestionSettingQuestionNoOrder" value="2" title="否" {{d.generalQuestionSettingQuestionNoOrder==2?'checked':''}}>
+                </label>
+                <label style="width: 50%;float:left;">
+                    <span style="float: left;width: 155px;line-height: 38px;">选项乱序（同一大题内）</span>
+                    <input type="radio" name="generalQuestionSettingOptionNoOrder" value="1" title="是" {{d.generalQuestionSettingOptionNoOrder==1||d.generalQuestionSettingOptionNoOrder==null?'checked':''}}>
+                    <input type="radio" name="generalQuestionSettingOptionNoOrder" value="2" title="否" {{d.generalQuestionSettingOptionNoOrder==2?'checked':''}}>
+                </label>
+                <label style="width: 50%;float:left;">
+                    <span style="float: left;width: 155px;line-height: 38px;">答卷后显示答案解析</span>
+                    <input type="radio" name="generalQuestionSettingEndShowQa" value="1" title="是" {{d.generalQuestionSettingEndShowQa==1||d.generalQuestionSettingEndShowQa==null?'checked':''}}>
+                    <input type="radio" name="generalQuestionSettingEndShowQa" value="2" title="否" {{d.generalQuestionSettingEndShowQa==2?'checked':''}}>
+                </label>
+                <label style="width: 50%;float:left;">
+                    <span style="float: left;width: 155px;line-height: 38px;">答卷后显示答案对错</span>
+                    <input type="radio" name="generalQuestionSettingEndShowTrueFalse" value="1" title="是" {{d.generalQuestionSettingEndShowTrueFalse==1||d.generalQuestionSettingEndShowQa==null?'checked':''}}>
+                    <input type="radio" name="generalQuestionSettingEndShowTrueFalse" value="2" title="否" {{d.generalQuestionSettingEndShowTrueFalse==2?'checked':''}}>
+                </label>
+            </div>
         </div>
-    </div>
+    </script>
+
     <div id="question_view" class="layui-form-item" ></div>
     <script type="text/html" id="question_demo">
         <label class="layui-form-label">题目设置</label>
@@ -94,20 +102,20 @@
                     <td class="typeName" inName="{{item.questionType}}">{{item.questionTypeText}}</td>
                     <td class="totalCount">{{item.totalCount}}</td>
                     <td>
-                        <input name="tnum" type="text" class="layui-input">
+                        <input name="tnum" type="text" value="{{item.selectCount || ''}}" class="layui-input">
                     </td>
                     <td>
-                        <input name="tfnum" type="text" class="layui-input">
+                        <input name="tfnum" type="text" value="{{item.singleScore || ''}}" class="layui-input">
                     </td>
-                    <td class="hjfz">0</td>
+                    <td class="hjfz">{{item.singleTypeTotalScore || 0}}</td>
                 </tr>
                 {{#if(d.list.length == i){}}
                 <tr>
                     <td>合计</td>
-                    <td><span name="ctNum"></span></td>
-                    <td>{{hjQNum}}</td>
+                    <td>{{hjQNum || ''}}</td>
+                    <td><span name="ctNum">{{d.ctNum || ''}}</span></td>
                     <td><span name="fzNum"></span></td>
-                    <td><span name="hjNum"></span></td>
+                    <td><span name="hjNum">{{d.hjNum || ''}}</span></td>
                 </tr>
                 {{#}}}
                 {{#  }); }}
@@ -118,7 +126,6 @@
         </div>
     </script>
 </div>
-<!--#} -->
 <script type="text/javascript" src="${ctxPath}/plugins/xm-select.js?v=${jsVer}"></script>
 <script>
 
@@ -132,17 +139,10 @@
         var questionSettingOptions = []; //出题内容
         var xmSeInitValue = $("#searchForm input[name='businessId']").val();
 
-        laydate.render({
-            elem: '#examTime_'
-            ,range: "至" //或 range: '~' 来自定义分割字符
-            ,type: 'datetime'
-            ,format: 'yyyy-MM-dd HH:mm:ss'
-        });
-
         var demo1 = xmSelect.render({
             el: '#demo1',
             language: 'zn',
-            name: 'courseInfoIds',
+            name: 'sourceCourseInfoIds',
             data: [],
             initValue:[xmSeInitValue],
             on: function(data){
@@ -173,31 +173,29 @@
                     ,limit : 10,
                     cols : [ [ // 表头
                         {
-                            field : 'courseInfoName',
-                            title : '课程名称',align:"center"
-                        },
-                        {
-                            field : 'courseLabelType',
-                            title : '课程类别',align:"center" //类型(1课程 2章 3节)
+                            field : 'generalQuestionSettingName',
+                            title : '考证名称',align:"center"
                         },
                         {
-                            field : 'courseLabelName',
-                            title : '课程标签',align:"center"
+                            field : 'generalQuestionEndTime',
+                            title : '考试时间',align:"center", templet: function (d) {
+                                return d.generalQuestionStartTime + " 至 " + d.generalQuestionEndTime;
+                            }
                         },
                         {
-                            field : 'userName',
-                            title : '创建人',align:"center"
+                            field : 'generalQuestionSettingDoCount',
+                            title : '作答次数',align:"center"
                         },
                         {
-                            field : 'addTime',
-                            title : '创建时间',align:"center"
+                            field : 'generalQuestionSettingAddTime',
+                            title : '创建时间',align:"center",width: 160
                         },
                         {
-                            field : 'courseInfoStatus',title : '状态',align:"center", templet: function (d) {
-                                if(d.courseInfoStatus == 1){
-                                    return "<span style='color:#73a2f8; '>启用</span>";
-                                }else if(d.courseInfoStatus == 2){
-                                    return "<span style='color: red;'>禁用</span>";
+                            field : 'generalQuestionSettingPushStatus',width: 100,title : '状态',align:"center", templet: function (d) {
+                                if(d.generalQuestionSettingPushStatus == 'PUSH'){
+                                    return "<span style='color:#73a2f8; '>发布</span>";
+                                }else if(d.generalQuestionSettingPushStatus == "UN_PUSH"){
+                                    return "<span style='color: red;'>未发布</span>";
                                 }else {
                                     return "-";
                                 }
@@ -205,10 +203,13 @@
                         },
                         {
                             field : 'userId',width:300,title : '操作',align:"center", templet: function (d) {
-                                /*var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';*/
-                                var htm = '<a class="layui-table-link" lay-event="examInfo">考证信息</a>';
+                                var htm = "";
+                                if (d.generalQuestionSettingPushStatus != 'PUSH'){
+                                     htm += '<a class="layui-table-link" lay-event="edit">编辑</a>';
+                                }
+                                // htm += '<a class="layui-table-link" lay-event="examInfo">考证信息</a>';
                                 // var htm = '<a class="layui-table-link" lay-event="courseConfigure">课程配置</a>';
-                                // htm += '<a class="layui-table-link" lay-event="editStatus">'+(d.courseInfoStatus == 1?"禁用":"启用")+'</a>';
+                                htm += '<a class="layui-table-link" lay-event="editStatus">'+(d.generalQuestionSettingPushStatus == 'PUSH'?"取消发布":"发布")+'</a>';
                                 htm += '<a class="layui-table-link" lay-event="del">删除</a>';
                                 return htm;
                             }
@@ -233,7 +234,7 @@
             initToolBar:function(){
                 toolbar = {
                     add : function() { // 获取选中数据
-                        addGeneral();
+                        addGeneral({});
                     },
                     refresh: function () {//刷新
                         searchForm.reset();
@@ -250,8 +251,7 @@
             }, initTableTool: table.on('tool(courseInfoTable)', function (obj) {
                 var data = obj.data;
                 if (obj.event === 'edit') {
-                    var url = "/jlw/courseInfo/add.do?generalQuestionSettingId="+data.generalQuestionSettingId;
-                    Common.openDlg(url,"");
+                    addGeneral(data);
                 }else if(obj.event === "del"){
                     layer.confirm('是否确定删除该课程？', function (index) { //courseInfoStatus:状态(1启用 2禁用 3删除)
                         var ret = Common.postAjax("/api/generalQuestionSetting/logicDelete.do", {ids: data.generalQuestionSettingId});
@@ -274,8 +274,8 @@
                     Common.openDlg(url,"");
                 }else if(obj.event === "editStatus"){ //启用
                     var param = {
-                        courseInfoId:data.courseInfoId,
-                        courseInfoStatus:data.courseInfoStatus == 1?2:1 //状态(1启用 2禁用 3删除)
+                        ids:data.generalQuestionSettingId,
+                        pushStatus:data.generalQuestionSettingPushStatus == 'PUSH'?'UN_PUSH':'PUSH' //状态(1启用 2禁用 3删除)
                     }
                     editCourseInfoStatus(param);
                 }else if(obj.event === "examInfo"){ //考证信息List
@@ -287,9 +287,9 @@
 
         //修改状态
         function editCourseInfoStatus(param){
-            layer.confirm('是否确定<span style=\'color: red;\'> '+(param.courseInfoStatus == 1?"启用":"禁用")+' </span>该课程？', function (index) {
+            layer.confirm('是否确定<span style=\'color: red;\'> '+(param.pushStatus == 'PUSH'?"发布":"取消发布")+' </span>该考试？', function (index) {
                 layer.close(index);
-                var ret = Common.postAjax("/jlw/courseInfo/edit.json",param);
+                var ret = Common.postAjax("/api/generalQuestionSetting/editPushStatus.do",param);
                 layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                     offset: ['50%'],
                     icon: ret.code == 0?1:2,
@@ -305,17 +305,28 @@
         }
 
         //添加考试信息
-        function addGeneral(){
-            getQuestionTypeGroupInfo(xmSeInitValue);
+        function addGeneral(data){
+            getQuestionTypeGroupInfo($.isEmpty(data.generalQuestionSettingId)?xmSeInitValue:data.sourceCourseInfoIds);
             if (courseInfoList.length <= 0){
                 var ret = Common.getAjax("/jlw/courseInfo/getValues.json",{"courseLabelType":"考证课程类","courseInfoStatus":1,courseInfoType:1});
                 if (ret.code == 0){
                     courseInfoList = ret.data;
                     demo1.update({
                         data: ret.data
-                    })
+                    });
                 }
             }
+            if ($.isEmpty(data.generalQuestionSettingId)){
+                demo1.update({
+                    data: courseInfoList,
+                    initValue: [xmSeInitValue]
+                });
+            }else{
+                demo1.update({
+                    data: courseInfoList,
+                    initValue: [data.sourceCourseInfoIds]
+                });
+            }
             layer.open({
                 type: 1
                 , title: '配置考证信息'
@@ -326,7 +337,21 @@
                 , scrollbar: true//滚动条
                 , content: $("#addGeneral_demo")
                 , btn: ['保存','关闭']
-                ,success:function () {}
+                ,success:function () {
+                    var getTpl = addGeneral_html_demo.innerHTML
+                        ,view = document.getElementById('addGeneral_view');
+                    laytpl(getTpl).render(data, function(html){
+                        view.innerHTML = html;
+                        laydate.render({
+                            elem: '#examTime_'
+                            ,range: "至" //或 range: '~' 来自定义分割字符
+                            ,type: 'datetime'
+                            ,value: $.isEmpty(data.generalQuestionStartTime)?'':(data.generalQuestionStartTime+' 至 '+data.generalQuestionEndTime)
+                            ,format: 'yyyy-MM-dd HH:mm:ss'
+                        });
+                        form.render();
+                    });
+                }
                 , yes: function (index, layero) {
                     var param = {generalQuestionSettingType:"EXAM",businessId:xmSeInitValue,businessType:"FROM_SYSTEM"};
                     var generalQuestionSettingName = $("#addGeneral_demo input[name='generalQuestionSettingName']").val();
@@ -369,6 +394,8 @@
                         Common.info("请输入抽取题目数量！");
                         return;
                     }
+                    var sourceCourseInfoIds = $("#addGeneral_demo input[name='sourceCourseInfoIds']").val(); //题目来源课程
+                    param.sourceCourseInfoIds = sourceCourseInfoIds;
                     param.questionSettingOptions = questionSettingOptions;
                     var generalQuestionSettingQuestionNoOrder = $("#addGeneral_demo input[name='generalQuestionSettingQuestionNoOrder']:checked").val();
                     var generalQuestionSettingOptionNoOrder = $("#addGeneral_demo input[name='generalQuestionSettingOptionNoOrder']:checked").val();
diff --git a/web/src/main/resources/templates/jlw/courseInfo/indexList.html b/web/src/main/resources/templates/jlw/courseInfo/indexList.html
index eb476aff..39173c09 100644
--- a/web/src/main/resources/templates/jlw/courseInfo/indexList.html
+++ b/web/src/main/resources/templates/jlw/courseInfo/indexList.html
@@ -2,6 +2,7 @@
 <style>
     .layui-table a {
         margin-right: 10px;
+        cursor: pointer;
     }
 </style>
 <layui:searchForm formId="searchForm" searchList="" condition="${search}">
diff --git a/web/src/main/resources/templates/jlw/courseInfo/setCoach.html b/web/src/main/resources/templates/jlw/courseInfo/setCoach.html
index 770b16d0..076d2269 100644
--- a/web/src/main/resources/templates/jlw/courseInfo/setCoach.html
+++ b/web/src/main/resources/templates/jlw/courseInfo/setCoach.html
@@ -6,6 +6,7 @@
     }
     .layui-table a {
         margin-right: 10px;
+        cursor: pointer;
     }
 </style>
 <layui:searchForm formId="searchForm" searchList="" condition="${search}">