diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 762ac0d2b..3fabaf38a 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -270,13 +270,13 @@ class HomeworkCommonController < ApplicationController
         absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
         student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
         student_work.save
-        if student_work.absence_penalty != 0
-          pros = student_work.student_work_projects.where("is_leader = 0")
-          user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
-          student_works = @homework.student_works.where("user_id in #{user_ids}")
-          student_works.each do |st_work|
-            st_work.update_attribute("absence_penalty", student_work.absence_penalty)
-          end
+        pros = student_work.student_work_projects.where("is_leader = 0")
+        user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+        student_works = @homework.student_works.where("user_id in #{user_ids}")
+        student_works.each do |st_work|
+          absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+          st_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
+          st_work.save
         end
       end
     end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index fbbca9712..8a5441647 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -985,11 +985,27 @@ class StudentWorkController < ApplicationController
     if params[:absence_penalty] && homework_detail_manual.absence_penalty.to_s != params[:absence_penalty].to_s
       homework_detail_manual.absence_penalty = params[:absence_penalty]
       if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
-        work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-        @homework.student_works.each do |student_work|
-          absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count
-          student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
-          student_work.save
+        work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")"
+        if @homework.homework_type != 3
+          @homework.student_works.has_committed.each do |student_work|
+            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+            student_work.save
+          end
+        else
+          @homework.student_works.has_committed.each do |student_work|
+            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+            student_work.save
+            pros = student_work.student_work_projects.where("is_leader = 0")
+            user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+            student_works = @homework.student_works.where("user_id in #{user_ids}")
+            student_works.each do |st_work|
+              absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+              st_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+              st_work.save
+            end
+          end
         end
       end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 29b4bb0b2..cf90e58a6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2906,7 +2906,16 @@ module ApplicationHelper
           end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 && StudentWorksEvaluationDistribution.where("student_work_id = #{work.id}").count > 0 #匿评作业，且作业状态不是在开启匿评之前
-            link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+            if homework.homework_type != 3
+              link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+            else
+              work_ids = "(" + homework.student_works.has_committed.map(&:id).join(",") + ")"
+              if User.current.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count > 0
+                link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+              else
+                link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "匿评开启后提交的作品不参与匿评"
+              end
+            end
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb
index 3229ddbda..40779c9f3 100644
--- a/app/views/student_work/_add_score.html.erb
+++ b/app/views/student_work/_add_score.html.erb
@@ -12,7 +12,7 @@
       <span id="score_notice_span_<%= work.id%>" class="ml5 c_red" style="display: none;">未评分</span>
       <div class="cl"></div></li>
       <% if @is_teacher && work.homework_common.homework_type == 3 && !is_member_work %>
-        <label class="ml30"><input type="checkbox" class="mb10" name="same_score" id="same_score_<%= work.id%>" value="1"/>&nbsp;&nbsp;组员同评（同时给每个组员相同的得分）</label>
+        <label class="ml30"><input type="checkbox" class="mb10" name="same_score" checked id="same_score_<%= work.id%>" value="1"/>&nbsp;&nbsp;组员同评（同时给每个组员相同的得分）</label>
       <% end %>
     <li >
       <% if @is_teacher%> <!-- 老师才可以上传批阅结果 -->
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 087c6183c..2252bdaf5 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -98,7 +98,9 @@ namespace :homework_evaluation do
               user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
               student_works = homework_common.student_works.where("user_id in #{user_ids}")
               student_works.each do |st_work|
-                st_work.update_attribute("absence_penalty", student_work.absence_penalty)
+                absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+                st_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
+                st_work.save
               end
             end
           end