diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 2c1a78b86..d701575e7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -114,7 +114,7 @@ class CoursesController < ApplicationController
 
     #sql = "left join videos on videos.id=course_videos.video_id AND (videos.transcoded=1 OR videos.user_id = #{current_user.id})"
     #@videos = paginate videos.joins(sql).includes(video: [user: :user_extension], user: :user_extension)
-    videos = videos.includes(:watch_course_videos, video: [user: :user_extension],user: :user_extension)
+    videos = videos.includes(video: [user: :user_extension],user: :user_extension).select("course_videos.id, course_videos.title, course_videos.link, course_videos.user_id")
     videos = videos.where(videos: {transcoded: true})
                  .or(videos.where(videos: {user_id: current_user.id}))
                  .or(videos.where(course_videos: {is_link: true}))
diff --git a/app/controllers/watch_video_histories_controller.rb b/app/controllers/watch_video_histories_controller.rb
index 15ee62113..fe1fbf31b 100644
--- a/app/controllers/watch_video_histories_controller.rb
+++ b/app/controllers/watch_video_histories_controller.rb
@@ -5,6 +5,6 @@ class WatchVideoHistoriesController < ApplicationController
     watch_log = CreateWatchVideoService.new(current_user, request, params).call
     render_ok(log_id: watch_log&.id)
   rescue CreateWatchVideoService::Error => ex
-    render_error(ex.message)
+    render_ok(log_id: watch_log&.id)
   end
 end
diff --git a/app/controllers/weapps/course_member_attendances_controller.rb b/app/controllers/weapps/course_member_attendances_controller.rb
index 5e92d5928..21a687d60 100644
--- a/app/controllers/weapps/course_member_attendances_controller.rb
+++ b/app/controllers/weapps/course_member_attendances_controller.rb
@@ -14,6 +14,9 @@ class Weapps::CourseMemberAttendancesController < ApplicationController
       @members = @members.where(course_group_id: params[:group_ids])
     end
 
+    @page = params[:page] || 1
+    @limit = params[:limit] || 5
+
     if params[:attendance_status].present?
       @members = @members.joins(:course_member_attendances).where(course_member_attendances: {course_attendance_id: attendance.id, attendance_status: params[:attendance_status]})
     end
diff --git a/app/services/create_watch_video_service.rb b/app/services/create_watch_video_service.rb
index f2d360638..0f1b32814 100644
--- a/app/services/create_watch_video_service.rb
+++ b/app/services/create_watch_video_service.rb
@@ -10,33 +10,35 @@ class CreateWatchVideoService < ApplicationService
   def call
     ActiveRecord::Base.transaction do
       current_time = Time.now
+      params[:watch_duration] = params[:watch_duration].to_f.round(2)
+      params[:total_duration] =  params[:total_duration].to_f.round(2)
+      params[:duration] = params[:duration].to_f.round(2)
+
       if params[:log_id].present?
-        if params[:total_duration].to_f < params[:watch_duration].to_f || params[:watch_duration].to_f < 0
-          raise Error, '观看时长错误'
+        watch_video_history = user.watch_video_histories.find(params[:log_id])
+        if params[:total_duration] < params[:watch_duration]
+          return watch_video_history
         end
         # 更新观看时长
-        watch_video_history = user.watch_video_histories.find(params[:log_id])
-
-        if watch_video_history.present? && watch_video_history.watch_duration <= params[:watch_duration].to_f && params[:total_duration].to_f > watch_video_history.total_duration
+        if watch_video_history.present? && !watch_video_history.is_finished && watch_video_history.watch_duration <= params[:watch_duration] && watch_video_history.total_duration <= params[:total_duration]
          # 如果观看总时长没变，说明视频没有播放，无需再去记录
-
           watch_video_history.end_at = current_time
           watch_video_history.total_duration = params[:total_duration]
-          watch_video_history.watch_duration = params[:watch_duration].to_f > watch_video_history.duration ? watch_video_history.duration : params[:watch_duration]
+          watch_video_history.watch_duration = params[:watch_duration] > watch_video_history.duration ? watch_video_history.duration : params[:watch_duration]
           watch_video_history.is_finished = params[:ed].present?
           watch_video_history.save!
 
           watch_course_video = watch_video_history.watch_course_video
 
-          watch_course_video.total_duration = watch_course_video.watch_video_histories.sum(:total_duration)
-          watch_course_video.end_at = current_time
-          watch_course_video.save!
-
-          if watch_course_video.present? && !watch_course_video.is_finished && watch_course_video.watch_duration < params[:watch_duration].to_f
-            # 更新课程视频的时长及是否看完状态
-            watch_course_video.watch_duration = params[:watch_duration]
-            if params[:ed].present?
-              watch_course_video.is_finished = watch_course_video.watch_video_histories.sum(:total_duration) >= watch_course_video.duration
+          if watch_course_video.present?
+            watch_course_video.total_duration = watch_course_video.watch_video_histories.sum(:total_duration)
+            watch_course_video.end_at = current_time
+            if !watch_course_video.is_finished && watch_course_video.watch_duration < params[:watch_duration]
+              # 更新课程视频的时长及是否看完状态
+              watch_course_video.watch_duration = params[:watch_duration]
+              if params[:ed].present?
+                watch_course_video.is_finished = watch_course_video.total_duration >= watch_course_video.duration
+              end
             end
             watch_course_video.save!
           end
@@ -50,11 +52,10 @@ class CreateWatchVideoService < ApplicationService
             d.start_at = current_time
             d.duration = params[:duration]
           end
-          
-          watch_video_history = build_video_log(current_time, course_video.video_id, watch_course_video.id)
-          watch_video_history.save!
 
           watch_course_video.save! unless watch_course_video.persisted?
+          watch_video_history = build_video_log(current_time, course_video.video_id, watch_course_video.id)
+          watch_video_history.save!
         else
           # 非课堂视频
           video = Video.find(params[:video_id])
diff --git a/app/views/attendances/index.json.jbuilder b/app/views/attendances/index.json.jbuilder
index 8a4dd2bb1..b44f9a4fe 100644
--- a/app/views/attendances/index.json.jbuilder
+++ b/app/views/attendances/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.attendances @attendances do |attendance|
-  json.(attendance, :id, :name, :normal_count, :all_count, :mode)
+  json.(attendance, :id, :name, :normal_count, :all_count, :mode, :attendance_code)
   json.author do
     user = attendance.user
     json.user_name user.real_name
diff --git a/app/views/courses/course_videos.json.jbuilder b/app/views/courses/course_videos.json.jbuilder
index 2e557828b..c2a4c1282 100644
--- a/app/views/courses/course_videos.json.jbuilder
+++ b/app/views/courses/course_videos.json.jbuilder
@@ -10,7 +10,7 @@ json.videos @videos do |video|
     json.user_login user&.login
   else
     json.partial! 'users/videos/video', locals: { video: video.video }
-    json.total_time video.watch_course_videos.sum(:total_duration)
+    json.total_time video.watch_course_videos.sum(:total_duration).round(0)
     json.people_num video.watch_course_videos.count(:user_id)
   end
 end
diff --git a/app/views/weapps/course_member_attendances/index.json.jbuilder b/app/views/weapps/course_member_attendances/index.json.jbuilder
index cec70b3fe..765de5833 100644
--- a/app/views/weapps/course_member_attendances/index.json.jbuilder
+++ b/app/views/weapps/course_member_attendances/index.json.jbuilder
@@ -4,8 +4,9 @@
 #   json.student_id member.user&.student_id
 # end
 
-json.member_attendances @members.each do |member|
+json.member_attendances @members.each_with_index.to_a do |member, index|
   json.(member, :user_id)
+  json.index (@page.to_i - 1) * @limit.to_i + index + 1
   json.user_name member.user&.real_name
   json.student_id member.user&.student_id
   json.attendance_status @member_attendances.select{|attendance| attendance.course_member_id == member.id}.first&.attendance_status || "ABSENCE"