IR 申请Global 影像列表修改
parent
ed527f3fff
commit
9a1ac447f8
|
@ -1552,10 +1552,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
|
|||
);
|
||||
break;
|
||||
|
||||
|
||||
//不影响后续访视: (t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.WaitReading) ||
|
||||
case ReadingCategory.Global:
|
||||
|
||||
filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum &&
|
||||
((t.DoctorUserId == origenalTask.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.WaitReading) || t.ReadingCategory == ReadingCategory.Global)) || (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)) || t.Id == origenalTask.Id);
|
||||
((t.DoctorUserId == origenalTask.DoctorUserId && t.ReadingCategory == ReadingCategory.Global)
|
||||
|| (t.ReadingCategory == ReadingCategory.Oncology) || (t.ReadingCategory == ReadingCategory.Judge)) || t.Id == origenalTask.Id);
|
||||
break;
|
||||
|
||||
case ReadingCategory.Oncology:
|
||||
|
@ -2263,7 +2266,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
|
|||
|
||||
filterExpression = filterExpression.And(t => t.VisitTaskNum > filterObj.VisitTaskNum &&
|
||||
(
|
||||
(t.DoctorUserId == filterObj.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.WaitReading) || t.ReadingCategory == ReadingCategory.Global))
|
||||
(t.DoctorUserId == filterObj.DoctorUserId && t.ReadingCategory == ReadingCategory.Global)
|
||||
|| (t.ReadingCategory == ReadingCategory.Oncology)
|
||||
|| (t.ReadingCategory == ReadingCategory.Judge)
|
||||
) || t.Id == filterObj.Id);
|
||||
|
|
Loading…
Reference in New Issue