修改

2024-06-27 16:02:29 +08:00
parent 27d9104607
commit 10380994a4
3 changed files with 20 additions and 27 deletions
@@ -792,40 +792,33 @@ namespace IRaCIS.Core.Application.Service
            var list = await GetIRMedicalFeedbackList(new GetIRMedicalFeedbackListInDto()
            {
                TrialId=inDto.TrialId,
-                AuditState= MedicalReviewAuditState.Auditing,
                TrialReadingCriterionId=inDto.TrialReadingCriterionId,
-                SubjectId=inDto.SubjectId,
                PageIndex=1,
-                PageSize=1,
+                PageSize=99999,
            });

+			var index = list.CurrentPageData.ToList().FindIndex(x => x.Id == inDto.TaskMedicalReviewId);

-			if (list.CurrentPageData.Count() == 0)
+			var result = new GetIRMedicalFeedbackListOutDto() { };
+
+			if (index + 1 == list.CurrentPageData.Count()) // 最后一个
 			{
-				list = await GetIRMedicalFeedbackList(new GetIRMedicalFeedbackListInDto()
-				{
-					TrialId = inDto.TrialId,
-					AuditState = MedicalReviewAuditState.Auditing,
-					TrialReadingCriterionId = inDto.TrialReadingCriterionId,
-					PageIndex = 1,
-					PageSize = 1,
-				});
-			}
-
-
-			if (list.CurrentPageData.Count() > 0)
-            {
-                return list.CurrentPageData[0];
-            }
-            else
-            {
 				throw new BusinessValidationFailedException(_localizer["MedicalReview_IRFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
 			}
+			else if (index == -1 || list.CurrentPageData.Count == 1) // 第一个或者只有一个
+			{
+				if (list.CurrentPageData[0].Id == inDto.TaskMedicalReviewId)
+				{
+					throw new BusinessValidationFailedException(_localizer["MedicalReview_IRFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
+				}
+				result = list.CurrentPageData[0];
+			}
+			else
+			{
+				result = list.CurrentPageData.Skip(index + 1).Take(1).First();

-
-
-
-
+			}
+			return result;
 		}

 		/// <summary>