修改

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -19,6 +19,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<PreviousPDF> _previousPDFRepository;
+       
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<PreviousHistory> _previousHistoryRepository;
         private readonly IRepository<PreviousOther> _previousOtherRepository;
@@ -34,6 +35,7 @@ namespace IRaCIS.Application.Services
              IRepository<PreviousPDF> previousPDFRepository,
              IRepository<SubjectVisit> subjectVisitRepository,
              IRepository<PreviousHistory> previousHistoryRepository,
+               
              IRepository<PreviousOther> previousOtherRepository,
              IRepository<PreviousSurgery> previousSurgeryRepository,
                 IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
@@ -311,6 +313,10 @@ namespace IRaCIS.Application.Services
             keyValuePairs.Add(ModuleTypeEnum.Global, ClinicalLevel.ImageRead);
             keyValuePairs.Add(ModuleTypeEnum.Oncology, ClinicalLevel.OncologyRead);
 
+
+            var criterion = _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefault();
+
+
             var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
 
             List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm)
@@ -323,6 +329,7 @@ namespace IRaCIS.Application.Services
                 .WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
                 .WhereIf(readModule != null, x => x.ClinicalDataLevel == keyValuePairs[readModule.ModuleType])
+                .WhereIf(criterion!=null,x=>x.CriterionEnumList.Contains((int)criterion.CriterionType))
                 .Select(x => new GetTrialClinicalDataSelectOutDto()
                 {
                     ClinicalDataLevel = x.ClinicalDataLevel,

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -240,7 +240,7 @@ namespace IRaCIS.Application.Services
                     SubjectVisitId = x.Id,
                     VisitName = x.VisitName,
                     VisitNum = x.VisitNum,
-                }).ToListAsync();
+                }).OrderBy(x=>x.VisitNum).ToListAsync();
 
             return resultlist;
         }