diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 45d6ccf70..20b8a3d8c 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -42,7 +42,10 @@
       <div id="start_time" style="display: none"><%=exercise_user.start_at %></div>
       <div class="fontGrey2">
         <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s)%></span>
-        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s)%></span>
+        <% unless exercise.time == -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
 <!--
         <span class="fr">剩余时长：<span class="c_red" id="rest_hours"></span>&nbsp;小时&nbsp;<span class="c_red" id="rest_minutes"></span>&nbsp;分钟&nbsp;<span class="c_red" id="rest_seconds"></span>&nbsp;秒</span>
 -->
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index b9306b0d2..8f6ac0e54 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -11,7 +11,10 @@
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
         <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s) %></span>
-        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s)%></span>
+        <% unless exercise.time == -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
         <%# time = exercise_user.end_at - exercise_user.start_at %>
         </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>