IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -2224,6 +2224,12 @@ namespace IRaCIS.Core.Application.Service.Common
 
             if (inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults)
             {
+                //R1 R2 两个人的访视都阅片完成了才可以，去除只有一个人阅片完成的访视
+
+                //找到只有一个人阅片的受试者 和访视
+                var exceptVisit = list.GroupBy(t => new { t.SubjectCode, t.TaskName }).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList();
+                list = list.Where(t => !exceptVisit.Any(ev => ev.SubjectCode == t.SubjectCode && ev.TaskName == t.TaskName)).ToList();
+
                 //裁判明表
                 export_Template = StaticData.Export.CommonJudgeReadingDetail_Export;
             }
@@ -2698,23 +2704,12 @@ namespace IRaCIS.Core.Application.Service.Common
 
             #region 最终导出参数处理
 
-            if (inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults)
-            {
-                //R1 R2 两个人的访视都阅片完成了才可以，去除只有一个人阅片完成的访视
-                //找到只有一个人阅片的受试者 和访视
-                var exceptVisit = list.Where(t => t.ReadingCategory == ReadingCategory.Visit)
-                    .GroupBy(t => new { t.SubjectCode, t.TaskName}).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList();
-
-                list = list.Where(t => !exceptVisit.Any(ev => ev.SubjectCode == t.SubjectCode && ev.TaskName == t.TaskName)).ToList();
-
-            }
-
             list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList();
 
             //处理裁判标记
             list = DealJudgeMark(criterion.ArbitrationRule, criterion.IsGlobalReading, list);
 
-            //裁判阅片明细表
+
             if (export_Template == StaticData.Export.CommonJudgeReadingDetail_Export)
             {
                 //裁判产生标记为空的数据过滤掉

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -4,7 +4,6 @@ using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.Service.ImageAndDoc;
-using IRaCIS.Core.Application.Service.OAuth;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.Service.ReadingCalculate.Interface;
 using IRaCIS.Core.Application.ViewModel;
@@ -3274,9 +3273,12 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<bool> ResetReadingRestTime([FromServices] IRepository<UserLog> _userLogRepository)
+        public async Task<bool> ResetReadingRestTime(Guid? userID)
         {
-
+            if (userID == null)
+            {
+                userID = _userInfo.UserRoleId;
+            }
 
             //int readingMinute = 120; // 为60整数
             int restMinute = 10; //
@@ -3296,9 +3298,6 @@ namespace IRaCIS.Core.Application.Service
             {
                 await _fusionCache.SetAsync<string>(CacheKeys.StartReadingTimeKey(_userInfo.UserRoleId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromHours(48));
             }
-
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, OptType = UserOptType.WebUnlock }, true);
-
             return true;
         }
 

IRaCIS.Core.Domain.Share/Reading/ImageFilterState.cs

@@ -50,9 +50,7 @@ public enum UserOptType
 
     TempLockLogin = 13,
 
-    AddUser = 14,
-
-    WebUnlock=17
+    AddUser = 14
 }
 
 [Description("影像下载打包状态")]