From f4c0413360d899b9d011154bffa23fb970372600 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 10 Jul 2023 09:14:33 +0800 Subject: [PATCH] S-35 --- .../ClinicalData/ReadingClinicalDataService.cs | 13 ++++++++----- .../Service/Reading/Dto/ReadingClinicalDataDto.cs | 9 +++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index 3a4bc14ae..bcfedcfd5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -658,13 +658,13 @@ namespace IRaCIS.Application.Services ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, SubjectId = x.SubjectId, ReadingId = x.ReadingId, - ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName, + ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us), ClinicalDataTrialSetId = x.ClinicalDataTrialSetId, IsSign = x.IsSign, ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType, CriterionEnumList = x.ClinicalDataTrialSet.CriterionEnumList, - TrialClinicalDataSetCriteriaList=x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList, + TrialClinicalDataSetCriteriaList = x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList, Id = x.Id, UploadRole = x.ClinicalDataTrialSet.UploadRole, IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC, @@ -677,9 +677,12 @@ namespace IRaCIS.Application.Services }).ToList() }); - - - var result = await resultQuery.ToListAsync(); + var result = new List(); + if (!inDto.IsOnlyGetCRCReadModule) + { + result = await resultQuery.ToListAsync(); + } + diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 9cf83bbc3..fa2660ab5 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -187,9 +187,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? ReadingClinicalDataId { get; set; } /// - /// 只查询已经签名的临床数据 + /// 只获取CRC上传的阅片模块结构化录入 /// - public bool SelectIsSign { get; set; } = true; + public bool IsOnlyGetCRCReadModule { get; set; } = false; + + /// + /// 只查询已经签名的临床数据 + /// + public bool SelectIsSign { get; set; } = true; } ///