diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index e897d4ed0..e60a2ceb3 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -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()