diff --git a/app/controllers/exercise_questions_controller.rb b/app/controllers/exercise_questions_controller.rb
index e8889847d..8cefa5071 100644
--- a/app/controllers/exercise_questions_controller.rb
+++ b/app/controllers/exercise_questions_controller.rb
@@ -526,9 +526,16 @@ class ExerciseQuestionsController < ApplicationController
             ExerciseAnswer.create(answer_option)
             ex_answer_old = 0
           end
+          if ex_obj_score <= 0.0
+            new_obj_score = @c_score
+          else
+            new_obj_score = ex_obj_score - ex_answer_old + @c_score
+          end
 
-          new_obj_score = ex_obj_score - ex_answer_old + @c_score
           total_scores = new_obj_score + ex_subj_score
+          if total_scores < 0.0
+            total_scores = 0.0
+          end
           ex_scores = {
             :objective_score => new_obj_score,
             :score => total_scores
@@ -554,6 +561,9 @@ class ExerciseQuestionsController < ApplicationController
           end
 
           total_scores = new_obj_score + ex_subj_score
+          if total_scores < 0.0
+            total_scores = 0.0
+          end
           ex_scores = {
               :objective_score => new_obj_score,
               :score => total_scores
@@ -575,6 +585,9 @@ class ExerciseQuestionsController < ApplicationController
             new_sub_score = ex_subj_score + @c_score
           end
           total_scores = ex_obj_score + new_sub_score
+          if total_scores < 0.0
+            total_scores = 0.0
+          end
           ex_scores = {
               :subjective_score => new_sub_score,
               :score => total_scores
@@ -600,6 +613,9 @@ class ExerciseQuestionsController < ApplicationController
             new_obj_score = @c_score
           end
           total_scores = new_obj_score + ex_subj_score
+          if total_scores < 0.0
+            total_scores = 0.0
+          end
           ex_scores = {
               :objective_score => new_obj_score,
               :score => total_scores
diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 2c417ea74..1f421557e 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -775,22 +775,24 @@ module ExercisesHelper
         user_score = user_score_pre.present? ? user_score_pre.pluck(:score).sum : nil
       elsif ques_type == 5 || ques_type == 3
         user_score = user_score_pre.present? ? user_score_pre.pluck(:score).sum : 0.0
-      else
-        if exercise_answers.present?   #判断题和选择题时，
-          answer_choice_array = []
-          exercise_answers.each do |a|
-            answer_choice_array.push(a.exercise_choice.choice_position)  #学生答案的位置
-          end
-          user_answer_content = answer_choice_array.sort
-          standard_answer = q.exercise_standard_answers.pluck(:exercise_choice_id).sort  #该问题的标准答案，可能有多个
-          if user_answer_content == standard_answer  #答案一致,多选或单选才给分，答案不对不给分
-            user_score = q.question_score
-          else
-            user_score = 0.0
-          end
-        else
-          user_score = 0.0
-        end
+      else  #选择题，判断题根据第一个记录查分
+        user_score = user_score_pre.present? ? user_score_pre.first.score : 0.0
+
+        # if exercise_answers.present?   #判断题和选择题时，
+        #   answer_choice_array = []
+        #   exercise_answers.each do |a|
+        #     answer_choice_array.push(a.exercise_choice.choice_position)  #学生答案的位置
+        #   end
+        #   user_answer_content = answer_choice_array.sort
+        #   standard_answer = q.exercise_standard_answers.pluck(:exercise_choice_id).sort  #该问题的标准答案，可能有多个
+        #   if user_answer_content == standard_answer  #答案一致,多选或单选才给分，答案不对不给分
+        #     user_score = q.question_score
+        #   else
+        #     user_score = 0.0
+        #   end
+        # else
+        #   user_score = 0.0
+        # end
       end
     end