修改

2023-01-16 17:14:14 +08:00
parent 0f3834414c
commit 35aed3a31c
7 changed files with 44 additions and 38 deletions
@@ -92,6 +92,11 @@ namespace IRaCIS.Core.Application.ViewModel
        public Guid TrialId { get; set; }
        public Guid? SiteId { get; set; }

+        /// <summary>
+        /// 传了Id 就不查询这条数据
+        /// </summary>
+        public Guid? Id { get; set; }
+
        public Guid? SubjectId { get; set; }


@@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service

                TrialId = medicalReview.TrialId,
                IsGetBeRead = true,
+                Id=inDto.MedicalReviewId,
                SubjectId= medicalReview.VisitTask.SubjectId,
                TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId,
                PageIndex=1,
@@ -159,7 +160,7 @@ namespace IRaCIS.Core.Application.Service

                TrialId = medicalReview.TrialId,
                IsGetBeRead = true,
-            
+                Id = inDto.MedicalReviewId,
                TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId,
                PageIndex = 1,
                PageSize = 1,
@@ -192,6 +193,7 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.SubjectId != null, t => t.VisitTask.SubjectId == inQuery.SubjectId)
                             .WhereIf(inQuery.SiteId != null, t => t.VisitTask.Subject.SiteId == inQuery.SiteId)
                             .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.VisitTask.Subject.Code.Contains(inQuery.SubjectCode))
+                                  .WhereIf(inQuery.Id != null, t => t.Id != inQuery.Id)
                             .WhereIf(inQuery.IsUrgent != null, t => t.VisitTask.IsUrgent == inQuery.IsUrgent)
                              .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
                               .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)