From 79dd787ed97d4febce050d8d9d7000b3b9639cfe Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 14 Oct 2022 16:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingClinicalDataDto.cs | 3 +++ .../Service/Reading/ReadingClinicalDataService.cs | 2 ++ .../Service/Reading/ReadingImageTaskService.cs | 4 +--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 63dfad567..46800cb40 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -466,6 +466,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 上传角色 /// public UploadRole? UploadRole { get; set; } + + + public Guid? TrialReadingCriterionId { get; set; } } public class GetTrialClinicalDataSelectOutDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index 0ec81b793..b83d5843c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -278,9 +278,11 @@ namespace IRaCIS.Application.Services keyValuePairs.Add(ModuleTypeEnum.Oncology, ClinicalLevel.OncologyRead); var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId); + List clinicalList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm) .WhereIf(inDto.UploadRole != null, x => x.UploadRole == inDto.UploadRole) .Where(x => !usedIdsQuery.Contains(x.Id)) + .WhereIf(inDto.TrialReadingCriterionId != null, t => t.TrialClinicalDataCriterionList.Any(t=>t.TrialReadingCriterionId == inDto.TrialReadingCriterionId) ) .WhereIf(inDto.IsVisit && inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataLevel == ClinicalLevel.SubjectVisit) .WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit) .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead||x.ClinicalDataLevel==ClinicalLevel.OncologyRead) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index c73964a93..1755de725 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -1421,12 +1421,10 @@ namespace IRaCIS.Application.Services x.IsReadingShowSubjectInfo, x.CriterionName, x.Id, + x.ReadingTool, }).FirstOrDefaultAsync(); - #region 临床数据 - - #endregion bool isExistsClinicalData = false; if (trialInfo.ClinicalInformationTransmissionEnum == 1)