From 18dce71695f2396fc272d69f8fda55d60150a319 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 25 Jun 2019 14:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E7=AD=94=E6=A1=88=E7=BA=A7=E5=88=AB=E6=89=A3=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/homeworks_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb
index 2affec0ba..2d6f50b5c 100644
--- a/app/services/homeworks_service.rb
+++ b/app/services/homeworks_service.rb
@@ -81,7 +81,7 @@ class HomeworksService
           pass_consume_time += (game.cost_time / 60.0).to_f
           user_total_score += game.final_score.to_i < 0 ? 0 : game.challenge.score.to_i
           adjust_score = student_work.challenge_work_scores.where(challenge_id: setting.challenge_id).last
-          final_score += adjust_score.present? ? adjust_score.score : (answer_open_evaluation ? setting.score : (game.final_score >= 0 ? setting.score : 0))
+          final_score += adjust_score.present? ? adjust_score.score : (answer_open_evaluation ? setting.score : (game.final_score > 0 ? game.real_score(setting.score) : 0))
           max_endtime = max_endtime == "" ? game.end_time : (game.end_time > max_endtime ? game.end_time : max_endtime)
         else
           compelete = false
@@ -177,7 +177,7 @@ class HomeworksService
                 pass_consume_time += (game.cost_time / 60.0).to_f
                 user_total_score += game.final_score.to_i < 0 ? 0 : game.challenge.score.to_i
                 adjust_score = work.challenge_work_scores.where(:challenge_id => setting.challenge_id).last
-                final_score += adjust_score.present? ? adjust_score.score : (homework.homework_detail_manual.answer_open_evaluation ? setting.score : (game.final_score >= 0 ? setting.score : 0))
+                final_score += adjust_score.present? ? adjust_score.score : (homework.homework_detail_manual.answer_open_evaluation ? setting.score : (game.final_score > 0 ? game.real_score(setting.score) : 0))
               end
             end
             if work.work_status == 0