影像筛选逻辑增加

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -117,7 +117,7 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
 
-            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).Select(t => new { IsHaveDoubleReadCriterion=t.ReadingQuestionCriterionTrialList.Any(t=>t.IsSigned && t.IsConfirm && t.ReadingType==ReadingMethod.Double),  t.VitrualSiteCode }).FirstOrDefault();
+            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).Select(t => new { IsHaveDoubleReadCriterion=t.TrialReadingCriterionList.Any(t=>t.IsSigned && t.IsConfirm && t.ReadingType==ReadingMethod.Double),  t.VitrualSiteCode }).FirstOrDefault();
 
             return ResponseOutput.Ok(pageList, trialTaskConfig);
         }

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -1152,7 +1152,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
             else
             {
 
-                if (subjectId!=null &&  _visitTaskRepository.Any(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom))
+                if (subjectId != null)
                 {
                     //找到 非一致性分析，未签名，状态正常的 并且任务名称是TimePoint的 任务
                     var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id

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

@@ -74,7 +74,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TaskAllocationRule, TaskAllocationRuleDTO>()
             .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.Enroll.DoctorUser))
             .ForMember(o => o.CriterionReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId })))
-            .ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm)))
+            .ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.TrialReadingCriterionList.Where(t => t.IsConfirm)))
             .ForMember(o => o.ReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Where(t=>t.TrialReadingCriterionId== trialReadingCriterionId).OrderBy(t => t.ReadingCategory).Select(t => t.ReadingCategory).ToList()))
             ;
 

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -68,6 +68,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public int ShowOrder { get; set; }
         [JsonIgnore]
         public decimal RowIndex { get; set; }
+        [JsonIgnore]
+        public string WindowCenter { get; set; }
+        [JsonIgnore] 
+        public string WindowWidth { get; set; }
     }
 
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO

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

@@ -942,7 +942,8 @@ namespace IRaCIS.Core.Application.Image.QA
                        .OrderBy(x => x.VisitNum).FirstOrDefault();
                     if (subjectVisit != null)
                     {
-                        return new GetNextIQCQualityOutDto() { 
+                        return new GetNextIQCQualityOutDto()
+                        {
                             SubjectId = subjectVisit.SubjectId,
                             VisitId = subjectVisit.Id
                         };
@@ -1315,38 +1316,13 @@ namespace IRaCIS.Core.Application.Image.QA
                     return ResponseOutput.NotOk(_localizer["QCOperation_MissingBaselineDate"]);
                 }
 
-                //基线  且配置了临床数据  
+                if (_subjectVisitRepository.Where(t => t.Id == dbSubjectVisit.Id).Any(t => (t.StudyList.Count(t => t.ModalityForEdit == "") > 0 ||t.NoneDicomStudyList.Count(t => t.Modality == "")>0) && t.Trial.TrialReadingCriterionList.Count(t => t.IsImageFilter == true) > 0))
-                //if (trialConfig.ClinicalInformationTransmissionEnum != 0 /*&& dbSubjectVisit.IsBaseLine*//*&&dbSubjectVisit.ClinicalDataSignUserId==null*/)
+                {
-                //{
+                    //有标准配置了影像筛选，该受试者有检查未设置检查类型，不允许提交
+                    return ResponseOutput.NotOk(_localizer["QCOperation_MissingModality"]);
+                }
 
 
-                    ////找到需要确认的PDF 临床数据  如果没有CRC 没有上传  那么就添加一条没有文件的记录
-
-                    //var crcNeedConfirmClinicalDataSetList = clinicalDataConfirmList.Where(t => t.UploadRole == UploadRole.CRC && t.ClinicalUploadType == ClinicalUploadType.PDF).ToList();
-
-                    //// 找到CRC 已经自己添加的临床PDF数据文件
-
-                    //var crcAddClinicalDataIdList = _readingClinicalDataRepository.Where(t => t.ReadingId == dbSubjectVisit.Id && t.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && t.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF)
-                    //    .Select(t => new { t.ClinicalDataTrialSetId }).ToList();
-
-                    //foreach (var crcNeedConfirmClinicalDataSet in crcNeedConfirmClinicalDataSetList)
-                    //{
-                    //    if (!crcAddClinicalDataIdList.Any(t => t.ClinicalDataTrialSetId == crcNeedConfirmClinicalDataSet.Id))
-                    //    {
-                    //        await _repository.AddAsync(new ReadingClinicalData()
-                    //        {
-                    //            TrialId = dbSubjectVisit.TrialId,
-                    //            SubjectId = dbSubjectVisit.SubjectId,
-                    //            ReadingId = dbSubjectVisit.Id,
-                    //            ClinicalDataTrialSetId = crcNeedConfirmClinicalDataSet.Id,
-                    //            IsVisit = true,
-                    //            IsSign = true,
-                    //            ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned
-
-                    //        });
-                    //    }
-                    //}
-
                 //已确认临床数据完整性
                 dbSubjectVisit.IsConfirmedClinicalData = true;
 
@@ -1368,27 +1344,6 @@ namespace IRaCIS.Core.Application.Image.QA
                 });
 
 
-
-                    //var signSuccess = await _repository.UpdateFromQueryAsync<TrialSign>(t => t.Id == cRCRequestToQCCommand.SignId, u => new TrialSign() { IsCompleted = true });
-
-
-                    ////现在修改为  提交时 设置签名信息
-                    //dbSubjectVisit.ClinicalDataSignUserId = _userInfo.Id;
-                    //dbSubjectVisit.ClinicalDataSignTime = DateTime.Now;
-
-                    //那么没有录入 不允许提交
-                    //if (!await _repository.AnyAsync<SubjectVisit>(t => t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousSurgeryList.Any()))
-                    //{
-                    //    return ResponseOutput.NotOk("没有临床数据，不允许提交");
-                    //}
-
-                    //return ResponseOutput.NotOk("没有签名临床数据，不允许提交");
-                //}
-
-
-
-
-
                 var maxVisit = await _subjectVisitRepository.Where(t => t.SubjectId == dbSubjectVisit.SubjectId && t.SubmitState == SubmitStateEnum.Submitted)
                     .OrderByDescending(t => t.VisitNum).Select(t => new { t.Id, t.VisitNum }).FirstOrDefaultAsync();
 
@@ -1464,14 +1419,7 @@ namespace IRaCIS.Core.Application.Image.QA
                     dbSubjectVisit.IsUrgent = true;
 
 
-                    ////PD确认的紧急会把前面所有未QC完成的访视均标记为紧急
 
-                    //var previosSVlist = await _subjectVisitRepository.Where(t => t.SubjectId == dbSubjectVisit.SubjectId && t.VisitNum < dbSubjectVisit.VisitNum && t.IsUrgent == false && t.SubmitState == SubmitStateEnum.Submitted, true).ToListAsync();
-
-                    //previosSVlist.ForEach(t =>
-                    //{
-                    //    t.IsUrgent = true;
-                    //});
                 }
 
 

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

@@ -1465,7 +1465,7 @@ namespace IRaCIS.Core.Application
              .WhereIf(!string.IsNullOrEmpty(inQuery.ResearchProgramNo), o => o.ResearchProgramNo.Contains(inQuery.ResearchProgramNo))
              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.ExperimentName.Contains(inQuery.ExperimentName))
              .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
-             .WhereIf(inQuery.CriterionType != null, o => o.ReadingQuestionCriterionTrialList.Any(t=>t.CriterionType==inQuery.CriterionType && t.IsSigned && t.IsConfirm))
+             .WhereIf(inQuery.CriterionType != null, o => o.TrialReadingCriterionList.Any(t=>t.CriterionType==inQuery.CriterionType && t.IsSigned && t.IsConfirm))
              .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialUserList.Any(t => t.User.EMail.Contains(inQuery.PM_EMail) && (t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)))
              .Select(t => new TrialToBeDoneDto()
              {
@@ -1525,7 +1525,7 @@ namespace IRaCIS.Core.Application
                     .Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count() : 0,
 
 
-                 IR_ReadingCriterionList =isIR ? t.ReadingQuestionCriterionTrialList.Where(t=>t.IsConfirm && t.IsSigned).OrderBy(t => t.CriterionName).Select(t=>t.CriterionName).ToList():null,
+                 IR_ReadingCriterionList =isIR ? t.TrialReadingCriterionList.Where(t=>t.IsConfirm && t.IsSigned).OrderBy(t => t.CriterionName).Select(t=>t.CriterionName).ToList():null,
 
                  IR_PMEmailList= isIR ? t.TrialUserList.Where(t=>t.User.UserTypeEnum==UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM).OrderBy(t => t.User.EMail).Select(t => t.User.EMail).ToList() : null,
 

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

@@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
             var userTypeEnumInt = 0;
             var isEn_Us = false;
             CreateMap<Trial, TrialDetailDTO>()
-                .ForMember(x=>x.CriterionList,y=>y.MapFrom(z=>z.ReadingQuestionCriterionTrialList.Where(n=>n.IsConfirm).Select(m=>m.CriterionName)))
+                .ForMember(x=>x.CriterionList,y=>y.MapFrom(z=>z.TrialReadingCriterionList.Where(n=>n.IsConfirm).Select(m=>m.CriterionName)))
                 .ForMember(d => d.DictionaryList, u => u.MapFrom(s => s.TrialDicList.Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
                 //.ForMember(d => d.Code, u => u.MapFrom(s => s.TrialCode))
                 .ForMember(d => d.Sponsor, u => u.MapFrom(s => s.Sponsor.SponsorName))
@@ -170,8 +170,8 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
-                    .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v =>v.IsConfirm).OrderBy(x=>x.ShowOrder).Select(r => r.Id)))
+                    .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v =>v.IsConfirm).OrderBy(x=>x.ShowOrder).Select(r => r.Id)))
-                    .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName)))
+                    .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName)))
                     .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
                     .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => isEn_Us ? r.ClinicalDataSetEnName:r.ClinicalDataSetName)))
                     //.ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)))

IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs

@@ -264,7 +264,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsCriticalSequence { get; set; } = false;
 
-        public int SeriesCount { get; set; }
+        public int SeriesCount =>SeriesList.Count;
         public int InstanceCount { get; set; }
 
         public bool IsDicom { get; set; } = true;

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -15,6 +15,7 @@ using IRaCIS.Application.Services;
 using Microsoft.Extensions.DependencyInjection;
 using DocumentFormat.OpenXml.Drawing.Charts;
 using IRaCIS.Core.Domain.Models;
+using NPOI.SS.Formula.Functions;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -263,7 +264,7 @@ namespace IRaCIS.Core.Application.Services
             {
                 InstanceCount = k.InstanceCount,
                 Modalities = k.Modalities,
-                SeriesCount = k.SeriesCount,
+                //SeriesCount = k.SeriesCount,
                 StudyCode = k.StudyCode,
                 StudyId = k.Id
             }).ToListAsync();
@@ -297,7 +298,7 @@ namespace IRaCIS.Core.Application.Services
                 );
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
-                t.SeriesCount = t.SeriesList.Count;
+                //t.SeriesCount = t.SeriesList.Count;
                 t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
             }
 
@@ -483,9 +484,33 @@ namespace IRaCIS.Core.Application.Services
 
             var studyList = new List<VisitStudyDTO>();
 
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(t => new {t.TrialReadingCriterionId,t.TrialReadingCriterion.IsImageFilter,t.TrialReadingCriterion.CriterionModalitys,  t.ReadingTaskState ,TaskStudyCount=t.TaskStudyList.Count }).FirstNotNullAsync();
 
+            //影响后处理  上传了新的影像
+            if (taskInfo.TaskStudyCount > 0)
+            {
 
+               var taskStudyList=  await _repository.Where<TaskStudy>(t => t.TrialId == indto.TrialId && t.VisitTaskId == indto.VisitTaskId).ProjectTo<VisitStudyDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+                foreach (var study in taskStudyList)
+                {
+                    study.SeriesList = study.SeriesList.OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
+
+                    foreach (var series in study.SeriesList)
+                    {
+                        series.WindowCenter = series.InstanceInfoList.FirstOrDefault()!.WindowCenter;
+                        series.WindowWidth = series.InstanceInfoList.FirstOrDefault()!.WindowWidth;
+                    }
+                    //study.SeriesCount = study.SeriesList.Count;
+
+                    study.InstanceCount = study.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
+                }
+
+                studyList.AddRange(taskStudyList);
+
+            }
+            else
+            {
                 #region dicom 检查查询
 
                 //如果是手动生成的标准，需要过滤检查和序列数据
@@ -493,12 +518,13 @@ namespace IRaCIS.Core.Application.Services
                 var isManualGenerate = await _trialReadingCriterionRepository.AnyAsync(t => t.Id == taskInfo.TrialReadingCriterionId && t.IsAutoCreate == false);
 
                 var dicomStudyList = await _repository.Where<DicomStudy>(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId)
+                    .WhereIf(taskInfo.IsImageFilter==true, t=> taskInfo.CriterionModalitys.Contains(t.ModalityForEdit))
                     .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
                     .Select(k => new VisitStudyDTO()
                     {
                         InstanceCount = k.InstanceCount,
                         Modalities = k.Modalities,
-                    SeriesCount = k.SeriesCount,
+                        //SeriesCount = k.SeriesCount,
                         StudyCode = k.StudyCode,
                         StudyId = k.Id,
 
@@ -535,7 +561,7 @@ namespace IRaCIS.Core.Application.Services
                     });
 
                     //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
-                t.SeriesCount = t.SeriesList.Count;
+                    //t.SeriesCount = t.SeriesList.Count;
                     t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
                 }
 
@@ -565,7 +591,7 @@ namespace IRaCIS.Core.Application.Services
                         {
                             InstanceCount = k.InstanceCount,
 
-                        SeriesCount = k.SeriesCount,
+                            //SeriesCount = k.SeriesCount,
 
                             StudyId = k.Id,
                             IsCriticalSequence = true,
@@ -618,7 +644,7 @@ namespace IRaCIS.Core.Application.Services
                                 var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
                                 item.Modality = string.Join(",", modalityList);
                                 thisVisitTaskStudy.SeriesList.Add(item);
-                            thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;
+                                //thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;
                             }
 
 
@@ -643,12 +669,13 @@ namespace IRaCIS.Core.Application.Services
 
 
                 #endregion
-
+            }
 
 
             #region 非Dicom 检查查询
 
-            var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId).ToListAsync();
+            var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId)
+                  .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality)).ToListAsync();
 
 
             List<VisitStudyDTO> noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()
@@ -656,7 +683,7 @@ namespace IRaCIS.Core.Application.Services
                 InstanceCount = x.FileCount,
                 StudyId = x.Id,
                 Modalities = x.Modality,
-                SeriesCount = 1,
+                //SeriesCount = 1,
                 StudyCode = x.StudyCode,
                 IsDicom = false,
 
@@ -671,7 +698,7 @@ namespace IRaCIS.Core.Application.Services
                 if (instanceCount == 0)
                 {
                     item.SeriesList = new List<DicomSeriesDTO>();
-                    item.SeriesCount = 0;
+                    //item.SeriesCount = 0;
                 }
                 else
                 {
@@ -696,6 +723,7 @@ namespace IRaCIS.Core.Application.Services
             }
 
             studyList.AddRange(noDicomStudyList);
+
             #endregion
 
 

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

@@ -1,6 +1,7 @@
 using AutoMapper;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.MediatR.CommandAndQueries;
 using IRaCIS.Core.Domain.Share;
 
@@ -101,6 +102,16 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.SubjectVisit.Subject.Code))
                   .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
                   .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.SubjectVisit.TrialSite.TrialSiteCode));
+
+
+            CreateMap<TaskStudy, VisitStudyDTO>()
+                 .ForMember(d => d.StudyId, u => u.MapFrom(s => s.Id))
+                  .ForMember(d => d.SeriesList, u => u.MapFrom(s => s.SeriesList));
+
+            CreateMap<TaskSeries, DicomSeriesDTO>()
+                 .ForMember(d => d.InstanceInfoList, u => u.MapFrom(s => s.InstanceList));
+
+            CreateMap<TaskInstance, InstanceBasicInfo>();
         }
     }
    

IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs

@@ -252,7 +252,7 @@ namespace IRaCIS.Application.Services
                     EnrollId = intoGroup.Id,
                     IsEnable = allocateRule.IsEnable,
 
-                    TrialReadingCriterionList = intoGroup.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, IsOncologyReading = t.IsOncologyReading, IsArbitrationReading = t.IsArbitrationReading, IsGlobalReading = t.IsGlobalReading, ReadingInfoSignTime = t.ReadingInfoSignTime, ReadingType = t.ReadingType }).ToList(),
+                    TrialReadingCriterionList = intoGroup.Trial.TrialReadingCriterionList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, IsOncologyReading = t.IsOncologyReading, IsArbitrationReading = t.IsArbitrationReading, IsGlobalReading = t.IsGlobalReading, ReadingInfoSignTime = t.ReadingInfoSignTime, ReadingType = t.ReadingType }).ToList(),
 
                     DoctorCriterionStatusList= intoGroup.EnrollReadingCriteriaList.Select(t=>new DoctorCriterionStatus()
                     {

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public List<TrialUser> TrialUserList { get; set; } = new List<TrialUser>();
         [JsonIgnore]
-        public List<ReadingQuestionCriterionTrial> ReadingQuestionCriterionTrialList { get; set; } = new List<ReadingQuestionCriterionTrial>();
+        public List<ReadingQuestionCriterionTrial> TrialReadingCriterionList { get; set; } = new List<ReadingQuestionCriterionTrial>();
         [JsonIgnore]
         public List<Subject> SubjectList { get; set; } = new List<Subject>();
         [JsonIgnore]