全量一致性核查初次提交

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -146,44 +146,25 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     }
 
 
-    public class GetUserUploadFileDto/*: ConsistencyCheckFile*/
+    public class GetUserUploadFileDto
     {
-        /// <summary>
-		/// 文件名称
-		/// </summary>
+
 		public string FileName { get; set; }
 
-        /// <summary>
-        /// 文件路径
-        /// </summary>
-        public string FilePath { get; set; }
-
-        /// <summary>
-        /// 相对路径
-        /// </summary>
         public string RelativePath { get; set; }
 
-
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public Guid CreateUserId { get; set; }
-
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
         public DateTime CreateTime { get; set; }
 
-        /// <summary>
-        /// 项目ID
-        /// </summary>
         public Guid TrialId { get; set; }
 
-        /// <summary>
-        /// 创建者名称
-        /// </summary>
-        public string CreateUserName { get; set; }
+
+        #region 一致性核查额外增加字段
+
+        public EDCCheckState? CheckState { get; set; }
+
+        public string ResultPath { get; set; }
+
+        #endregion
     }
 
 

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -767,9 +767,9 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<GetUserUploadFileDto>> GetConsistencyCheckFile(GetConsistencyCheckFileInDto inQuery, [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
+        public async Task<PageOutput<GetUserUploadFileDto>> GetConsistencyCheckFileList(GetConsistencyCheckFileInDto inQuery, [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
-            var query = _inspectionFileRepository.Where(t => t.TrialId == inQuery.TrialId)
+            var query = _inspectionFileRepository.Where(t => t.TrialId == inQuery.TrialId && (t.CheckState == EDCCheckState.Success || t.CheckState == EDCCheckState.Failed))
              .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(inQuery);

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -679,8 +679,7 @@ namespace IRaCIS.Core.Application.Service
                  ;
 
             // 一致性核查文件
-            CreateMap<InspectionFile, GetUserUploadFileDto>()
-             .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUserRole.FullName));
+            CreateMap<InspectionFile, GetUserUploadFileDto>();
 
 
             //CRC 质疑列表