自动下一个任务去掉优先当前subject
parent
73a1236a5f
commit
f3613febb8
|
@ -1383,18 +1383,18 @@ namespace IRaCIS.Core.Application.Image.QA
|
|||
.Select(t => new { t.IsUrgent, SubjectCode = t.Subject.Code, t.SubjectId, t.Id, t.VisitNum, IshaveQCChallenge = t.QCChallengeList.Any(), t.SecondReviewState })
|
||||
.OrderBy(t => t.IshaveQCChallenge).ThenBy(t => t.SecondReviewState).ThenBy(x => x.IsUrgent).ThenBy(x => x.SubjectCode).ThenBy(x => x.VisitNum).ToListAsync();
|
||||
|
||||
var subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
|
||||
//var subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
|
||||
|
||||
if (subjectVisit != null)
|
||||
{
|
||||
return new GetNextIQCQualityOutDto()
|
||||
{
|
||||
SubjectId = subjectVisit.SubjectId,
|
||||
VisitId = subjectVisit.Id
|
||||
};
|
||||
}
|
||||
//if (subjectVisit != null)
|
||||
//{
|
||||
// return new GetNextIQCQualityOutDto()
|
||||
// {
|
||||
// SubjectId = subjectVisit.SubjectId,
|
||||
// VisitId = subjectVisit.Id
|
||||
// };
|
||||
//}
|
||||
|
||||
subjectVisit = visitList.OrderBy(x => x.SubjectCode).ThenBy(x => x.VisitNum).FirstOrDefault();
|
||||
var subjectVisit = visitList.FirstOrDefault();
|
||||
if (subjectVisit != null)
|
||||
{
|
||||
return new GetNextIQCQualityOutDto()
|
||||
|
@ -1430,18 +1430,18 @@ namespace IRaCIS.Core.Application.Image.QA
|
|||
.Select(t => new { t.IsUrgent, SubjectCode = t.Subject.Code, t.SubjectId, t.Id, t.VisitNum, IshaveQCChallenge = t.QCChallengeList.Any(), t.SecondReviewState })
|
||||
.OrderBy(t => t.IshaveQCChallenge).ThenBy(t => t.SecondReviewState).ThenBy(x => x.IsUrgent).ThenBy(x => x.SubjectCode).ThenBy(x => x.VisitNum).ToListAsync();
|
||||
|
||||
subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
|
||||
//subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
|
||||
|
||||
if (subjectVisit != null)
|
||||
{
|
||||
return new GetNextIQCQualityOutDto()
|
||||
{
|
||||
SubjectId = subjectVisit.SubjectId,
|
||||
VisitId = subjectVisit.Id
|
||||
};
|
||||
}
|
||||
//if (subjectVisit != null)
|
||||
//{
|
||||
// return new GetNextIQCQualityOutDto()
|
||||
// {
|
||||
// SubjectId = subjectVisit.SubjectId,
|
||||
// VisitId = subjectVisit.Id
|
||||
// };
|
||||
//}
|
||||
|
||||
subjectVisit = visitList.OrderBy(x => x.SubjectCode).ThenBy(x => x.VisitNum).FirstOrDefault();
|
||||
subjectVisit = visitList.FirstOrDefault();
|
||||
if (subjectVisit != null)
|
||||
{
|
||||
return new GetNextIQCQualityOutDto()
|
||||
|
|
Loading…
Reference in New Issue