diff --git a/app/models/subject.rb b/app/models/subject.rb
index f35a8aad4..4b7f4dbcd 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -82,11 +82,9 @@ class Subject < ApplicationRecord
   end
 
   def my_subject_progress
-    my_challenge_count = Challenge.left_joins(:games)
-                              .where(games: {user_id: User.current.id, status: 2}, shixun_id: shixuns.published_closed)
-                              .pluck(:challenge_id).uniq.size
-    subject_challenge_count = shixuns.sum(:challenges_count)
-    subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / subject_challenge_count).round(2) * 100).to_i
+    my_challenge_count = Game.joins(:challenge).where(user_id: User.current.id, status: 2, challenges: {shixun_id: shixuns.published_closed}).
+        pluck(:challenge_id).uniq.size
+    count = self.subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / self.subject_challenge_count).round(2) * 100).to_i
   end
 
   def my_consume_time