S-30

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

@@ -678,7 +678,60 @@ namespace IRaCIS.Application.Services
                  });
 
 
+
             var result = await resultQuery.ToListAsync();
+
+
+
+			// 这里处理CRC上传 阅片期的临床数据
+			var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId).FirstOrDefaultAsync();
+            if (readModule != null && readModule.IsCRCConfirm)
+            {
+                var clinicalDataTrialSetIds = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id).Select(x => x.ClinicalForm.ClinicalDataTrialSetId).ToListAsync();
+
+                var setIds = clinicalDataTrialSetIds.Distinct().ToList();
+                var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && (x.ClinicalDataLevel == ClinicalLevel.OncologyRead || x.ClinicalDataLevel == ClinicalLevel.ImageRead))
+                    .Where(x => setIds.Contains(x.Id))
+                  .Select(x => new GetReadingClinicalDataListOutDto()
+                  {
+
+                      ClinicalDataLevel = x.ClinicalDataLevel,
+                      SubjectId = inDto.SubjectId,
+                      ReadingId = default(Guid),
+                      ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
+                      ClinicalDataSetEnName = x.ClinicalDataSetEnName,
+                      ClinicalDataTrialSetId = x.Id,
+                      IsSign = readModule.IsPMConfirm,
+                      ClinicalUploadType = x.ClinicalUploadType,
+                      Id = default(Guid),
+                      UploadRole = x.UploadRole,
+                      IsCRCUpload = x.UploadRole == UploadRole.CRC,
+                      IsNeedMerge = true,
+                      ReadModuleId = readModule.Id,
+                      //FileCount = x.FileCount,
+
+                      //ReadingClinicalDataState = x.ReadingClinicalDataState,
+
+                      //FileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
+                      //{
+                      //    Id = y.Id,
+                      //    FileName = y.FileName,
+                      //    Path = y.Path,
+                      //    CreateTime = y.CreateTime,
+                      //}).ToList()
+
+                  }).ToListAsync();
+
+                clinicalresult.ForEach(x =>
+                {
+                    x.FileCount = setIds.Where(y => y == x.ClinicalDataTrialSetId).Count();
+                    x.ReadingClinicalDataState = readModule.IsPMConfirm ? ReadingClinicalDataStatus.HaveSigned : ReadingClinicalDataStatus.HaveChecked;
+
+                });
+            }
+
+
+
 				// 根据标准
 				if (inDto.VisitTaskId != null)
             {