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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-05 14:41:30 +08:00
parent 99ef28be99 97a5eda8f8
commit 795caf19e7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -843,6 +843,7 @@ namespace IRaCIS.Application.Services
var resultQuery = _readingClinicalDataRepository.Where(x=>1==1).Select(x=> new GetReadingClinicalDataListOutDto() { }); var resultQuery = _readingClinicalDataRepository.Where(x=>1==1).Select(x=> new GetReadingClinicalDataListOutDto() { });
bool isSelfAnalysis = false; bool isSelfAnalysis = false;
var otherIsSelfAnalysisList=new List<GetReadingClinicalDataListOutDto>();
if (inDto.ReadingId == null) if (inDto.ReadingId == null)
{ {
var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(x => x.Id == inDto.VisitTaskId); var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(x => x.Id == inDto.VisitTaskId);
@ -893,10 +894,10 @@ namespace IRaCIS.Application.Services
}); });
// 是否获取所有一致性分析的数据 // 是否获取所有一致性分析的数据
if(!inDto.IsGetAllConsistencyAnalysis) if(inDto.IsGetAllConsistencyAnalysis)
{ {
// 原来的非PDF // 原来的非PDF
var otherQuesy = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) otherIsSelfAnalysisList =await _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId) .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId) .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true) .WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
@ -929,9 +930,9 @@ namespace IRaCIS.Application.Services
Path = y.Path, Path = y.Path,
CreateTime = y.CreateTime, CreateTime = y.CreateTime,
}).ToList(), }).ToList(),
}); }).ToListAsync();
resultQuery = resultQuery.Union(otherQuesy);
} }
} }
@ -980,6 +981,7 @@ namespace IRaCIS.Application.Services
if (!inDto.IsOnlyGetCRCReadModule) if (!inDto.IsOnlyGetCRCReadModule)
{ {
result = await resultQuery.ToListAsync(); result = await resultQuery.ToListAsync();
result.AddRange(otherIsSelfAnalysisList);
} }
var readingIds = result.Select(x => x.ReadingId).ToList(); var readingIds = result.Select(x => x.ReadingId).ToList();
@ -1134,6 +1136,7 @@ namespace IRaCIS.Application.Services
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
SelectIsSign = false, SelectIsSign = false,
IsGetAllConsistencyAnalysis = false, IsGetAllConsistencyAnalysis = false,
VisitTaskId=inDto.VisitTaskId,
}); });
return (result,true); return (result,true);