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

@@ -1757,8 +1757,8 @@ namespace IRaCIS.Core.Application.Service.Common
             var query = _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
 
                 //自身一致性分析
-                .WhereIf(inQuery.ReadingExportType == ExportResult.DetailedTableOfIntraReaderAnalysisResults, t => t.IsSelfAnalysis == true || t.IsSelfAnalysis == null)
+                .WhereIf(inQuery.ReadingExportType == ExportResult.SelfAnalysis, t => t.IsSelfAnalysis == true || t.IsSelfAnalysis == null)
-                .WhereIf(inQuery.ReadingExportType == ExportResult.DetailedTableOfInterReaderAnalysisResults, t => t.IsSelfAnalysis == false || t.IsSelfAnalysis == null)
+                .WhereIf(inQuery.ReadingExportType == ExportResult.GroupAnalysis, t => t.IsSelfAnalysis == false || t.IsSelfAnalysis == null)
 
                //访视和全局查询已签名完成的，裁判可以是未签名，未完成的
                .Where(t => (t.ReadingTaskState == ReadingTaskState.HaveSigned && (t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global)) || t.ReadingCategory == ReadingCategory.Judge)
@@ -1859,7 +1859,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var export_Template = StaticData.Export.TrialSelfAnalysisList_Export;
 
-            if (inQuery.ReadingExportType == ExportResult.DetailedTableOfIntraReaderAnalysisResults)
+            if (inQuery.ReadingExportType == ExportResult.SelfAnalysis)
             {
                 //找到非一致性分析的任务
                 var selfExportList = list.Where(t => t.IsSelfAnalysis == null).ToList();
@@ -1956,7 +1956,7 @@ namespace IRaCIS.Core.Application.Service.Common
             };
 
 
-            var (memoryStream, fileName) = await ExcelExportHelper.DataExport_NpoiTestAsync(export_Template, exportInfo, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(AnalysisDynamicCommonExport), criterion.CriterionType, dynamicColumnConfig);
+            var (memoryStream, fileName) = await ExcelExportHelper.DataExport_NpoiTestAsync(export_Template, exportInfo, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CommonEvaluationExport), criterion.CriterionType, dynamicColumnConfig);
 
             return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
             {

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

@@ -472,6 +472,11 @@ namespace IRaCIS.Core.Domain.Share
         //阅片期一致率
         ReadingPeriodJudgeRatio_Export = 8,
 
+        SelfAnalysis = 9,
+
+        GroupAnalysis = 10
+
+
 
     }
 

IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs

@@ -99,8 +99,6 @@ public static class DBContext_Ext
                     var delaySeconds = dbContext.TrialEmailNoticeConfig.Where(t => t.BusinessScenarioEnum == businessEnum)
                          .Select(t => t.EmailDelaySeconds).FirstOrDefault();
 
-                    Console.WriteLine("qc领取任务：" + DateTime.Now.ToShortTimeString() + $"延时{delaySeconds}");
-
                     subjectVisit.AddDomainEvent(new QCClaimTaskEvent() { IsPd = subjectVisit.PDState == PDStateEnum.PDProgress, SubjectVisitId = subjectVisit.Id, DelaySeconds = delaySeconds, CurrentActionUserId = (Guid)subjectVisit.CurrentActionUserId });
 
                 }

IRaCIS.Core.Infra.EFCore/Interceptor/DispatchDomainEventsInterceptor.cs

@@ -60,7 +60,6 @@ namespace IRaCIS.Core.Infra.EFCore.Interceptor
 
                 if (domainEvent.IsDelayScheduleEvent)
                 {
-                    Console.WriteLine("qc领取任务消息发布：" + DateTime.Now.ToShortTimeString() + $"延时{domainEvent.DelaySeconds}");
                     //延迟调度的消息，比如1h后再消费
                     await _scheduler.SchedulePublish(DateTime.Now.AddSeconds((int)domainEvent.DelaySeconds!), (object)domainEvent);
                 }