修改导表排序+ 受试者无阅片期 字段设置问题

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -7095,11 +7095,6 @@
             是否查询所有的一致性分析临床数据 (为否只查询PDF)
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingOrTaskClinicalDataListInDto.IsGetTaskClinicalData">
-            <summary>
-            是否是阅片页面获取临床数据  (阅片其他访视任务需要获取受试者级别的)
-            </summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto">
             <summary>
             获取访视列表

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

@@ -1503,6 +1503,9 @@ namespace IRaCIS.Core.Application.Service.Common
                         }
                     }
                     else
+                    {
+                        //产生了阅片期
+                        if (resultExceptJudgeList.Any(t => t.IsSubjectHaveReadingPeriod))
                         {
                             //两个人都做了
                             if (resultExceptJudgeList.Count(t => t.VisitTaskNum == item.VisitTaskNum && t.SubjectCode == item.SubjectCode) == 2)
@@ -1522,12 +1525,19 @@ namespace IRaCIS.Core.Application.Service.Common
                                 item.IsJudgeSelect = null;
                                 item.IsTrigerJudge = null;
                             }
+                        }
+                        else
+                        {
+                            item.IsJudgeSelect = null;
+                            item.IsTrigerJudge = null;
+                        }
+
 
                     }
                 }
 
             }
-            if (arbitrationRule == ArbitrationRule.Reading)
+            else if (arbitrationRule == ArbitrationRule.Reading)
             {
                 //处理访视裁判标记
                 foreach (var visitItem in resultExceptJudgeList.Where(t => t.ReadingCategory == ReadingCategory.Visit))
@@ -1633,6 +1643,15 @@ namespace IRaCIS.Core.Application.Service.Common
                     }
                 }
             }
+            else
+            {
+                foreach (var visitItem in resultExceptJudgeList.Where(t => t.ReadingCategory == ReadingCategory.Visit))
+                {
+                    visitItem.IsJudgeSelect = null;
+                    visitItem.IsTrigerJudge = null;
+                }
+
+            }
             return resultExceptJudgeList;
         }
 
@@ -2094,11 +2113,11 @@ namespace IRaCIS.Core.Application.Service.Common
                 list = new List<CommonEvaluationExport>();
 
 
-                foreach (var item in taskList)
+                foreach (var item in taskList.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum))
                 {
                     if (item.LesionList.Count > 0)
                     {
-                        foreach (var lession in item.LesionList)
+                        foreach (var lession in item.LesionList.OrderBy(t => t.LessionType).ThenBy(t => t.LessionCode))
                         {
                             var firstLessionAnser = lession.LessionAnswerList.FirstOrDefault() ?? new CommonLessionQuestionAnswerInfo();
 

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -1159,6 +1159,8 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public List<CommonQuesionInfo> QuestionAnswerList { get; set; }
 
+        public bool IsSubjectHaveReadingPeriod { get; set; }
+
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
 

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

@@ -257,6 +257,9 @@ namespace IRaCIS.Core.Application.Service
                 false)))
                .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory==ReadingCategory.Judge? u.JudgeResultRemark : u.JudgeVisitTask.JudgeResultRemark))
                .ForMember(o => o.VisitNote, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.AdjustReason).FirstOrDefault()!.Answer))
+                .ForMember(o => o.IsSubjectHaveReadingPeriod, t => t.MapFrom(u => arbitrationRule == ArbitrationRule.Reading ?
+                u.Subject.ReadModuleList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading) : false))
+
                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))