修改状态
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
c2ed06061a
commit
948c0d32ab
|
@ -702,7 +702,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
var readingNameOrTaskBlindName = string.Empty;
|
var readingNameOrTaskBlindName = string.Empty;
|
||||||
var subjectCode = string.Empty;
|
var subjectCode = string.Empty;
|
||||||
inDto.IsGetTaskClinicalData = true;
|
|
||||||
if (inDto.ReadingId == null)
|
if (inDto.ReadingId == null)
|
||||||
{
|
{
|
||||||
var visitTask = await _visitTaskRepository.AsQueryable().Include(x => x.Subject)
|
var visitTask = await _visitTaskRepository.AsQueryable().Include(x => x.Subject)
|
||||||
|
@ -817,7 +816,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
//下面改用readingIdList筛选 不然
|
//下面改用readingIdList筛选 不然
|
||||||
List<Guid> readingIdList = new List<Guid>() {};
|
List<Guid> readingIdList = new List<Guid>() {};
|
||||||
if (inDto.IsGetTaskClinicalData)
|
if (inDto.VisitTaskId!=null)
|
||||||
{
|
{
|
||||||
var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync();
|
var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync();
|
||||||
if (subjectVisit != null && !subjectVisit.IsBaseLine)
|
if (subjectVisit != null && !subjectVisit.IsBaseLine)
|
||||||
|
|
|
@ -259,11 +259,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsGetAllConsistencyAnalysis { get; set; } = true;
|
public bool IsGetAllConsistencyAnalysis { get; set; } = true;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否是阅片页面获取临床数据 (阅片其他访视任务需要获取受试者级别的)
|
|
||||||
/// </summary>
|
|
||||||
public bool IsGetTaskClinicalData { get; set; } = false;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetConsistencyAnalysisReadingClinicalDataListInDto
|
public class GetConsistencyAnalysisReadingClinicalDataListInDto
|
||||||
|
|
|
@ -2981,7 +2981,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
SubjectId = task.SubjectId,
|
SubjectId = task.SubjectId,
|
||||||
TrialId = inDto.TrialId,
|
TrialId = inDto.TrialId,
|
||||||
VisitTaskId = task.VisitTaskId,
|
VisitTaskId = task.VisitTaskId,
|
||||||
IsGetTaskClinicalData=true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
task.IsExistsClinicalData = clinicalDataList.Count > 0;
|
task.IsExistsClinicalData = clinicalDataList.Count > 0;
|
||||||
|
|
|
@ -132,7 +132,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
SubjectId = task.SubjectId,
|
SubjectId = task.SubjectId,
|
||||||
TrialId = inDto.TrialId,
|
TrialId = inDto.TrialId,
|
||||||
VisitTaskId = task.VisitTaskId,
|
VisitTaskId = task.VisitTaskId,
|
||||||
IsGetTaskClinicalData=true,
|
|
||||||
})).Count() > 0;
|
})).Count() > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue