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

@@ -428,7 +428,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var defalutSortArray = new string[] { nameof(ImageBackViewModel.IsUrgent) + " desc", nameof(ImageBackViewModel.SubjectCode), nameof(ImageBackViewModel.VisitNum) };
 
-            var list = await query.OrderByDescending(t => t.IsUrgent).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitNum).ToListAsync();
+            var list = await query.OrderByDescending(t=>t.IsUrgent).ThenBy(t=>t.SubjectCode).ThenBy(t=>t.VisitNum).ToListAsync();
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
@@ -1292,7 +1292,7 @@ namespace IRaCIS.Core.Application.Service.Common
                         //Uploader = t.Uploader.UserName,
                         //UploadTime = t.CreateTime
 
-                        SubjectStatus = t.Subject.Status
+                        SubjectStatus=t.Subject.Status
 
                     });
 
@@ -2633,7 +2633,19 @@ namespace IRaCIS.Core.Application.Service.Common
             else if (inQuery.ReadingExportType == ExportResult.CDISC)
             {
 
-                if (criterion.CriterionGroup == CriterionGroup.Tumor)
+                if (criterion.CriterionType == CriterionType.SelfDefine)
+                {
+                    taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
+                             new
+                             {
+                                 readingExportType = inQuery.ReadingExportType,
+                                 criterionType = criterion.CriterionType,
+                                 arbitrationRule = criterion.ArbitrationRule,
+                                 trialReadingCriterionId = inQuery.TrialReadingCriterionId,
+                                 isEn_Us = _userInfo.IsEn_Us
+                             }).ToListAsync();
+                }
+                else
                 {
 
                     list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
@@ -2646,18 +2658,8 @@ namespace IRaCIS.Core.Application.Service.Common
                                         isEn_Us = _userInfo.IsEn_Us
                                     }).ToListAsync();
                 }
-                else
-                {
-                    taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
-                            new
-                            {
-                                readingExportType = inQuery.ReadingExportType,
-                                criterionType = criterion.CriterionType,
-                                arbitrationRule = criterion.ArbitrationRule,
-                                trialReadingCriterionId = inQuery.TrialReadingCriterionId,
-                                isEn_Us = _userInfo.IsEn_Us
-                            }).ToListAsync();
-                }
+
+
 
             }
 
@@ -3148,7 +3150,7 @@ namespace IRaCIS.Core.Application.Service.Common
                                     {
 
                                         //遍历病灶的每个问题
-                                        foreach (var lessionItem in lession.LessionAnswerList.OrderBy(t => t.ShowOrder))
+                                        foreach (var lessionItem in lession.LessionAnswerList.OrderBy(t=>t.ShowOrder))
                                         {
 
                                             var cloneItem = item.Clone();

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -83,7 +83,6 @@ namespace IRaCIS.Core.Application.Image.QA
             var svExpression = QCCommon.GetSubjectVisitFilter(inQuery.VisitPlanArray);
 
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
-                       .Where(t => !(t.Subject.Status == SubjectStatus.EndOfVisit && t.SubmitState == SubmitStateEnum.None && !t.Subject.SubjectVisitList.Any(c => c.VisitNum > t.VisitNum && c.SubmitState > SubmitStateEnum.None)))
                        .Where(t => t.Subject.FinalSubjectVisitId != null ? t.VisitNum <= t.Subject.FinalSubjectVisit.VisitNum : true)
                        .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
                        .WhereIf(inQuery.SubjectId != null, t => t.Subject.Id == inQuery.SubjectId)