diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 9efcfc19d..cf78cbc05 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -142,7 +142,9 @@ class ExerciseController < ApplicationController
     option = {
         :question_title => question_title,
         :question_type => params[:question_type] || 1,
-        :question_number => @exercise.exercise_questions.count + 1,
+        :question_number => params[:question_type] == "1"? @exercise.exercise_questions.where("question_type = 1").count + 1 :
+                              (params[:question_type] == "2" ? (@exercise.exercise_questions.where("question_type = 2").count + 1) :
+                              @exercise.exercise_questions.where("question_type = 3").count + 1),
         :question_score => params[:question_score]
     }
     @exercise_questions = @exercise.exercise_questions.new option
@@ -160,7 +162,14 @@ class ExerciseController < ApplicationController
     # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1
     if params[:quest_id]
       @is_insert = true
-      @exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i}").update_all(" question_number = question_number + 1")
+      if @exercise_questions.question_type == 1
+        ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number + 1")
+        #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1")
+      elsif @exercise_questions.question_type == 2
+        ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number + 1")
+      else
+        ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number + 1")
+      end
       # @exercise_question_num = params[:quest_num].to_i
       @exercise_questions.question_number = params[:quest_num].to_i + 1
     end