diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml
index 05af0fb64..ab5c047a8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml	
@@ -26,6 +26,10 @@
                                     <div class="lr-form-item-title">课程</div>
                                     <div id="LessonNo"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">是否评教</div>
+                                    <div id="IsEval"></div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -36,10 +40,11 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="">
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-building-o"></i>&nbsp;查看答卷</a>
+                        
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
+            <div class="lr-layout-body" id="gridtable_stu"></div>
         </div>
     </div>
 </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js
index 8b43eb791..866dbf297 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js	
@@ -19,6 +19,12 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $('#IsEval').lrselect({
+                placeholder: "请选择是否评教",
+                data: [{ text: "是", value: "1" }, { text: "否", value: "2" }],
+                text: "text",
+                value: "value"
+            });
             $('#EmpNo').lrselect({
                 placeholder: "请选择教师",
                 allowSearch: true,
@@ -39,13 +45,13 @@ var bootstrap = function ($, learun) {
             });
             // 答题情况
             $('#lr_view').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('VID');
+                var keyValue = $('#gridtable_stu').jfGridValue('VID');
                 if (learun.checkrow(keyValue)) {
-                    var Status = $('#gridtable').jfGridValue('UID');
+                    var Status = $('#gridtable_stu').jfGridValue('UID');
                     if (Status != undefined && Status !== '') {
-                        var StuNo = $('#gridtable').jfGridValue('StuNo');
-                        var EmpNo = $('#gridtable').jfGridValue('EmpNo');
-                        var LessonNo = $('#gridtable').jfGridValue('LessonNo');
+                        var StuNo = $('#gridtable_stu').jfGridValue('StuNo');
+                        var EmpNo = $('#gridtable_stu').jfGridValue('EmpNo');
+                        var LessonNo = $('#gridtable_stu').jfGridValue('LessonNo');
                         learun.layerForm({
                             id: 'EvaluationTeachpaper' + keyValue,
                             title: '评教答卷',
@@ -60,10 +66,11 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGridLei({
+            $('#gridtable_stu').lrAuthorizeJfGridLei({
                 url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/GetAnswerPageList',
                 headData: [
                     { label: "姓名", name: "StuName", width: 80, align: "left" },
@@ -134,7 +141,7 @@ var bootstrap = function ($, learun) {
             if (!!pLessonNo) {
                 param.LessonNo = pLessonNo;
             }
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            $('#gridtable_stu').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs
index 80f8c6c82..90d3a1151 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs	
@@ -399,6 +399,19 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
                         strSql.Append(" AND aa.LessonNo in (" + queryParam["LessonNo"].ToString() + ") ");
                     }
                 }
+
+                if (!queryParam["IsEval"].IsEmpty())
+                {
+                    if (queryParam["IsEval"].ToString() == "1")
+                    {
+                        strSql.Append(" and bb.UID is not null and len(bb.UID)>0");
+                    }
+                    else if (queryParam["IsEval"].ToString() == "2")
+                    {
+                        strSql.Append(" and (bb.UID is null or len(bb.UID)=0)");
+                    }
+                }
+
                 return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString(), dp, paginationobj);
             }
             catch (Exception ex)