diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index b4f1c7eb1..36d745b80 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -91,7 +91,7 @@ class ExerciseController < ApplicationController
     @exercise.time =  params[:exercise][:time]
     @exercise.end_time = params[:exercise][:end_time]
     @exercise.publish_time = params[:exercise][:publish_time]
-    @exercise.publish_time = params[:exercise][:show_result]
+    @exercise.show_result = params[:exercise][:show_result]
     if @exercise.save
       respond_to do |format|
         format.js
diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb
index b9cd9c175..1768b7f19 100644
--- a/app/helpers/exercise_helper.rb
+++ b/app/helpers/exercise_helper.rb
@@ -13,11 +13,19 @@ module ExerciseHelper
 
   def convert_to_char(str)
     result = ""
-    if str.count >= 1
-      for i in 0 .. str.count do i
-        result += (str[i].to_i + 64).chr
+    length = str.length
+    unless str.nil?
+      if length === 1
+        result += (str.to_i + 64).chr
+        return result
+      elsif length > 1
+        for i in 0...length
+          result += (str[i].to_i + 64).chr
+        end
+        return result
       end
     end
+    return result
   end
 
 end
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index c4b7ee421..8567c6641 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -319,7 +319,7 @@
   <div id="polls_head_edit">
     <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%>
   </div>
-
+  <div class="mb5" style="display: none">目前试卷总分：<span class="c_red">20分</span></div>
   <!-- 问题 -->
   <div id="poll_content">
     <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%>
@@ -340,7 +340,7 @@
 
   <div class="ur_buttons"> <a class="ur_button_submit" onclick="poll_submit();"> 提交 </a>
     <div class="polls_cha">
-      <input name="show_result" value="" type="checkbox">
+      <input name="exercise[show_result]" value="" type="checkbox">
       <label for="">允许学生查看测验结果</label>
     </div>
   </div>
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 5748713de..09e9e27f1 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -1,4 +1,3 @@
-<%#= form_for ExerciseQuestion.new,:url =>create_exercise_question_exercise_path(@exercise.id),:remote => true do |f|%>
 <%= form_for(ExerciseQuestion.new,
              :html => { :multipart => true },
              :url => {:controller => 'exercise',
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index 4163e9f13..9b5c4adef 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -1,8 +1,14 @@
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'create_exercise_question',
+                      :course_id => @course.id
+             },:remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
     <label>问题：&nbsp;&nbsp;</label>
     <input name="question_type" value="2" type="hidden">
-    <input class="questionTitle" name="questions_title" id="poll_questions_title" placeholder="请输入多选题题目" type="text">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
   </div>
   <div class="ur_editor_content">
     <ul>
@@ -51,4 +57,5 @@
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index bfaea32aa..09575ab00 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -1,6 +1,8 @@
 <div>
   <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %><span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span></div>
+    <%= exercise_question.question_title %>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+  </div>
 
   <%#= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index e69de29bb..9a7f82f54 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -0,0 +1,41 @@
+<div>
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+    <%= exercise_question.question_title %>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+  </div>
+  <%#= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="chooseQuestionType('mcq',<%=exercise_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table">
+      <tbody>
+      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="checkbox" name="<%= exercise_question  %>" value="<%= exercise_choice.choice_text%>" >
+                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+</div><!--多选题显示 end-->
+<!-- 新增问题 -->
+<div id="insert_new_poll_question_mcq_<%=exercise_question.id%>">
+</div>
+<div id="div_mcq_<%=exercise_question.id%>" style="width: 50px;border: 1px solid #cbcbcb; display:none;position: absolute;padding: 5px;background: white">
+  <ul>
+<!--
+    <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%#=poll_question.id%>);insert_MC('mcq',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单选</a></li>
+-->
+    <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);">多选</a></li>
+<!--
+    <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%#=poll_question.id%>);insert_SINGLE('mcq',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单行主观</a></li>
+-->
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/exercise/create_exercise_question.js.erb b/app/views/exercise/create_exercise_question.js.erb
new file mode 100644
index 000000000..42077931c
--- /dev/null
+++ b/app/views/exercise/create_exercise_question.js.erb
@@ -0,0 +1,26 @@
+<% if @is_insert %>
+$("#poll_content").html('<%=  escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise})%>');
+<% else %>
+$("#new_poll_question").html("");
+
+$("#poll_content").append("<div id='poll_questions_<%= @exercise_questions.id%>'>" +
+        "<div id='show_poll_questions_<%= @exercise_questions.id %>'>" +
+        "<% if @exercise_questions.question_type == 1%>" +
+        "<%= escape_javascript(render :partial => 'show_MC', :locals => {:exercise_question => @exercise_questions}) %>" +
+        "<% elsif @exercise_questions.question_type == 2%>" +
+        "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:exercise_question => @exercise_questions}) %>" +
+        "<% elsif @exercise_questions.question_type == 3%>" +
+        "<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @exercise_questions}) %>" +
+        "<% end%>" +
+        "</div>" +
+        "<div id='edit_poll_questions_<%= @exercise_questions.id %>' style='display: none;'>" +
+        "<% if @exercise_questions.question_type == 1%>" +
+        "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:exercise_question => @exercise_questions}) %>" +
+        "<% elsif @exercise_questions.question_type == 2%>" +
+        "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:exercise_question => @exercise_questions}) %>" +
+        "<% elsif @exercise_questions.question_type == 3%>" +
+        "<%= escape_javascript(render :partial => 'edit_single', :locals => {:exercise_question => @exercise_questions}) %>" +
+        "<% end%>" +
+        "</div>" +
+        "</div>");
+<% end %>
diff --git a/db/schema.rb b/db/schema.rb
index 8d506225f..07dac5706 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -241,6 +241,58 @@ ActiveRecord::Schema.define(:version => 20151118015638) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false