S_014

2023-07-05 17:50:31 +08:00
parent 4c6315f2a5
commit 6dbfda36ee
6 changed files with 84 additions and 12 deletions
@@ -462,17 +462,41 @@ namespace IRaCIS.Core.Application.Service
 			return ResponseOutput.Ok(true);
 		}

-		/// <summary>
-		/// 获取CRC确认列表
-		/// </summary>
-		/// <param name="inDto"></param>
-		/// <returns></returns>
-		[HttpPost]
+        /// <summary>
+        /// 获取PM待确认列表
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<GetCRCConfirmListOutDto>> GetPMConfirmList(GetPMConfirmListInDto inDto)
+        {
+          return  await GetCRCConfirmList(new GetCRCConfirmListInDto()
+            {
+                TrialId = inDto.TrialId,
+                IsCRCConfirm = true,
+                IsPMConfirm = false,
+                PageIndex = inDto.PageIndex,
+                PageSize = inDto.PageSize,
+                Asc = inDto.Asc,
+                SortField = inDto.SortField,
+                TrialReadingCriterionId = inDto.TrialReadingCriterionId
+
+            });
+        }
+
+        /// <summary>
+        /// 获取CRC确认列表
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
        public async Task<PageOutput<GetCRCConfirmListOutDto>> GetCRCConfirmList(GetCRCConfirmListInDto inDto)
        {
            var query = _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
                .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
-				.WhereIf(inDto.TrialReadingCriterionId != null, x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
+                .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)
+                 .WhereIf(inDto.IsPMConfirm != null, x => x.IsCRCConfirm == inDto.IsPMConfirm)
+                .WhereIf(inDto.TrialReadingCriterionId != null, x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
 				.WhereIf(inDto.SubjectId != null, x => x.SubjectId == inDto.SubjectId)
 				.Select(x => new GetCRCConfirmListOutDto()
                {
@@ -119,10 +119,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        public string Answer { get; set; } = string.Empty;
    }

+    public class GetPMConfirmListInDto: PageInput
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid TrialReadingCriterionId { get; set; }
+    }
+
    public class GetCRCConfirmListInDto:PageInput
    {

-		public Guid? TrialReadingCriterionId { get; set; }
+        public bool? IsCRCConfirm { get; set; }
+
+        public bool? IsPMConfirm { get; set; } 
+
+        public Guid? TrialReadingCriterionId { get; set; }

 		public Guid? SubjectId { get; set; }