Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

自动下一个任务去掉优先当前subject
2025-08-01 17:20:55 +08:00 · 2025-08-01 17:20:53 +08:00
1 changed files with 20 additions and 20 deletions
--- 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()
Author	SHA1	Message	Date
hang	ce3c4a893f	Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8 continuous-integration/drone/push Build is passing Details	2025-08-01 17:20:55 +08:00
hang	f3613febb8	自动下一个任务去掉优先当前subject	2025-08-01 17:20:53 +08:00