XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加查询参数

Uat_Study
hang 2022-10-14 16:42:40 +08:00
parent 358cde05a3
commit 79dd787ed9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
View File

@ -466,6 +466,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 上传角色 /// 上传角色
/// </summary> /// </summary>
public UploadRole? UploadRole { get; set; } public UploadRole? UploadRole { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
} }
public class GetTrialClinicalDataSelectOutDto public class GetTrialClinicalDataSelectOutDto

2
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -278,9 +278,11 @@ namespace IRaCIS.Application.Services
keyValuePairs.Add(ModuleTypeEnum.Oncology, ClinicalLevel.OncologyRead); keyValuePairs.Add(ModuleTypeEnum.Oncology, ClinicalLevel.OncologyRead);
var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId); 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) List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm)
.WhereIf(inDto.UploadRole != null, x => x.UploadRole == inDto.UploadRole) .WhereIf(inDto.UploadRole != null, x => x.UploadRole == inDto.UploadRole)
.Where(x => !usedIdsQuery.Contains(x.Id)) .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.Subject || x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
.WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => 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) .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead||x.ClinicalDataLevel==ClinicalLevel.OncologyRead)

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -1421,12 +1421,10 @@ namespace IRaCIS.Application.Services
x.IsReadingShowSubjectInfo, x.IsReadingShowSubjectInfo,
x.CriterionName, x.CriterionName,
x.Id, x.Id,
x.ReadingTool,
}).FirstOrDefaultAsync(); }).FirstOrDefaultAsync();
#region 临床数据
#endregion
bool isExistsClinicalData = false; bool isExistsClinicalData = false;
if (trialInfo.ClinicalInformationTransmissionEnum == 1) if (trialInfo.ClinicalInformationTransmissionEnum == 1)