+1
-1
@@ -691,7 +691,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
&& t.TrialReadingCriterionId == command.TrialReadingCriterionId;
|
||||
|
||||
//有序
|
||||
if (criterionConfig.IsReadingTaskViewInOrder)
|
||||
if (criterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
|
||||
{
|
||||
filterExpression = filterExpression.And(t => t.VisitTaskNum >= subjectVisit.VisitNum);
|
||||
}
|
||||
|
||||
@@ -481,7 +481,7 @@ namespace IRaCIS.Application.Services
|
||||
}
|
||||
|
||||
//有序阅片才维护 IsFrontTaskNeedSignButNotSign 这个状态
|
||||
if (_readingQuestionCriterionTrialRepository.Any(t=>t.Id==trialReadingCritrialId && t.IsReadingTaskViewInOrder == true))
|
||||
if (_readingQuestionCriterionTrialRepository.Any(t=>t.Id==trialReadingCritrialId && t.IsReadingTaskViewInOrder == ReadingOrder.InOrder))
|
||||
{
|
||||
|
||||
|
||||
|
||||
@@ -1755,7 +1755,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||
/// <summary>
|
||||
/// 任务展示访视 读片任务显示是否顺序
|
||||
/// </summary>
|
||||
public bool IsReadingTaskViewInOrder { get; set; } = true;
|
||||
public ReadingOrder IsReadingTaskViewInOrder { get; set; }
|
||||
|
||||
public Guid TrialReadingCriterionId { get; set; }
|
||||
|
||||
|
||||
@@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||
/// <summary>
|
||||
/// 任务展示访视 读片任务显示是否顺序
|
||||
/// </summary>
|
||||
public bool IsReadingTaskViewInOrder { get; set; } = true;
|
||||
public ReadingOrder IsReadingTaskViewInOrder { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -385,7 +385,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||
public string ReadingUser { get; set; }
|
||||
|
||||
public Guid SubjectId { get; set; }
|
||||
public bool IsReadingTaskViewInOrder { get; set; }
|
||||
public ReadingOrder IsReadingTaskViewInOrder { get; set; }
|
||||
|
||||
public Guid VisitTaskId { get; set; }
|
||||
|
||||
|
||||
@@ -586,7 +586,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||
{
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
public bool IsReadingTaskViewInOrder { get; set; }
|
||||
public ReadingOrder IsReadingTaskViewInOrder { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 仲裁阅片
|
||||
|
||||
@@ -165,7 +165,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
break;
|
||||
case ReadingCategory.Visit:
|
||||
// 有序
|
||||
if (medicalReviewInfo.IsReadingTaskViewInOrder)
|
||||
if (medicalReviewInfo.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
|
||||
{
|
||||
medicalReviewInfo.TaskList = await _visitTaskRepository
|
||||
|
||||
|
||||
@@ -608,7 +608,7 @@ namespace IRaCIS.Application.Services
|
||||
}).ToListAsync();
|
||||
|
||||
|
||||
if (!taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
|
||||
if (taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder != ReadingOrder.InOrder)
|
||||
{
|
||||
result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
|
||||
}
|
||||
@@ -1248,7 +1248,7 @@ namespace IRaCIS.Application.Services
|
||||
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
|
||||
&& x.ReadingCategory == ReadingCategory.Visit)||x.Id==taskInfo.BeforeConvertedTaskId
|
||||
).OrderByDescending(x=>x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
|
||||
if (!criterionInfo.IsReadingTaskViewInOrder)
|
||||
if (criterionInfo.IsReadingTaskViewInOrder != ReadingOrder.InOrder)
|
||||
{
|
||||
// 无序的话 不要查
|
||||
laskTaskId = Guid.NewGuid();
|
||||
@@ -2739,7 +2739,7 @@ namespace IRaCIS.Application.Services
|
||||
trialReadingCriterionId = task.TrialReadingCriterionId;
|
||||
|
||||
}
|
||||
else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder)
|
||||
else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
|
||||
{
|
||||
var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
|
||||
{
|
||||
@@ -3089,7 +3089,7 @@ namespace IRaCIS.Application.Services
|
||||
List<Guid> reportRelatedTaskIdList = new List<Guid>();
|
||||
|
||||
|
||||
if (isReadingTaskViewInOrder)
|
||||
if (isReadingTaskViewInOrder == ReadingOrder.InOrder)
|
||||
{
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user