修改配置临时提交

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

@@ -1929,6 +1929,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var dynamicColumnConfig = new DynamicColumnConfig()
             {
+                //可读的列表名行索引，不是{{}} 模板行索引
                 AutoColumnTitleRowIndex = 2,
                 AutoColumnStartIndex = 5,
                 TempalteLastColumnIndex = 4,
@@ -2182,7 +2183,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 var dynamicLessionTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct();
                 var dynamicTitleList = dynamicExtraAddTitleList.Union(dynamicLessionTitleList).ToList();
 
-                //最终的病灶列表  要把裁判的也要加进去
+                //最终的病灶列表  要把裁判的也要加进去，需要处理裁判标记
                 list = new List<CommonEvaluationExport>();
 
 

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

@@ -1168,6 +1168,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string QuestionValue { get; set; }
 
         public string TranslateDicName { get; set; }
+
+        public string CDISCCode { get; set; }
     }
     public class CommonEvaluationExport
     {
@@ -1215,6 +1217,16 @@ namespace IRaCIS.Core.Application.Contracts
         public string JudgeNote { get; set; } = string.Empty;
 
         public string VisitNote { get; set; }
+
+        #region CDISC_阅片结果表
+
+        //最晚拍片日期
+        public DateTime? LatestScanDate { get; set; }
+
+        //阅片完成时间
+        public DateTime? SignTime { get; set; }
+
+        #endregion
     }
 
     public class CommonLessionExport : CommonEvaluationExport

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

@@ -242,7 +242,8 @@ namespace IRaCIS.Core.Application.Service
                     QuestionType = c.ReadingQuestionTrial.QuestionType,
                     QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
                     QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
-                    TranslateDicName = c.ReadingQuestionTrial.DictionaryCode
+                    TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
+                    CDISCCode = c.ReadingQuestionTrial.CDISCCode
                 })))
                ;
 
@@ -255,15 +256,16 @@ namespace IRaCIS.Core.Application.Service
                 (arbitrationRule == ArbitrationRule.Reading ?
                 u.Subject.SubjectVisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && u.VisitTaskNum < t.VisitTaskNum) :
                 false)))
-               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory==ReadingCategory.Judge? u.JudgeResultRemark : u.JudgeVisitTask.JudgeResultRemark))
+               .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.SubjectCriterionReadingPeriodVisitNumList, t => t.MapFrom(u =>
-                u.Subject.ReadModuleList.Where(t=>t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading).Select(c=>c.SubjectVisit.VisitNum)))
+                u.Subject.ReadModuleList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading).Select(c => c.SubjectVisit.VisitNum)))
                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
+               .ForMember(o => o.LatestScanDate, t => t.MapFrom(u => u.SourceSubjectVisit.LatestScanDate))
                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
                .ForMember(o => o.QuestionAnswerList, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList
@@ -273,8 +275,9 @@ namespace IRaCIS.Core.Application.Service
                 {
                     QuestionType = c.ReadingQuestionTrial.QuestionType,
                     QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
-                    QuestionValue =  c.IsGlobalChange?c.GlobalChangeAnswer: c.Answer,
+                    QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
-                    TranslateDicName = c.ReadingQuestionTrial.DictionaryCode
+                    TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
+                    CDISCCode=c.ReadingQuestionTrial.CDISCCode
                 })))
                ;
 
@@ -707,7 +710,7 @@ namespace IRaCIS.Core.Application.Service
             Guid? visiTaskId = null;
             CreateMap<NoneDicomStudy, TaskDicomStudyView>()
                 .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ?
-                s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.CreateTime).ThenBy(t=>t.FileName)
+                s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)
                 : s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -1368,7 +1368,7 @@ namespace IRaCIS.Core.Application
 
             extralConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
 
-            extralConfig.CollectImagesEnum = extralConfig.CollectImagesEnum;
+            extralConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
 
             return extralConfig;
         }