质控增加字段

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -885,6 +885,16 @@
             <param name="isAnonymize"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetSubejectOrVisitZipInfo(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Application.Contracts.SubejctZipInfoQuery)">
+            <summary>
+            受试者级别所有的影像
+            访视级别的影响 传递subjectVisitId
+            标准Id是可选的  不同标准有些检查可能有过滤
+            </summary>
+            <param name="_subjectRepository"></param>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.PackageAndAnonymizImage(System.Guid,System.Guid,System.Boolean,System.Boolean)">
             <summary>
             后台任务调用，前端忽略该接口
@@ -5178,6 +5188,16 @@
             是否是正在转化
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SignConsistencyAnalysisReadingClinicalDataInDto.IsBlind">
+            <summary>
+            是否盲化
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SignConsistencyAnalysisReadingClinicalDataInDto.IsComplete">
+            <summary>
+            是否完整
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingClinicalDataDto.TrialId">
             <summary>
             项目ID
@@ -14148,6 +14168,20 @@
             <param name="indto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.SignConsistencyAnalysisReadingClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.SignConsistencyAnalysisReadingClinicalDataInDto)">
+            <summary>
+            一致性分析临床数据签名
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.SetTaskValid(IRaCIS.Core.Application.Service.Reading.Dto.SetTaskValidInDto)">
+            <summary>
+            一致性分析临床数据签名完设置任务为有效
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetReadingClinicalDataPDFList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataPDFListIndto)">
             <summary>
             获取单个阅片临床数据的所有文件

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

@@ -62,6 +62,10 @@ namespace IRaCIS.Core.Application.Contracts
         //public string VisitPlanInfo { get; set; } = String.Empty;
 
         public Guid? HandleUserId { get; set; }
+
+        public DateTime? BeginAuditTime { get; set; }
+
+        public DateTime? EndAuditTime { get; set; }
     }
 
     public class GetNextIQCQualityInDto
@@ -1110,6 +1114,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsHaveUploadFailed { get; set; }
 
+
+
+
     }
 
     public class GetNextCRCChallengeInDto
@@ -1415,8 +1422,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         public string ReviewAuditUserName { get; set; } = String.Empty;
-        public DateTime? ReviewAuditTime { get; set; }
+
-        public DateTime? PreliminaryAuditTime { get; set; }
 
         public bool IsEnrollmentConfirm { get; set; } = false;
         public DateTime? SubjectFirstGiveMedicineTime { get; set; }
@@ -1491,6 +1497,12 @@ namespace IRaCIS.Core.Application.Contracts
         public PackState PackState { get; set; }
 
         //public Guid? ClinicalDataSignUserId { get; set; }
+
+        public DateTime? ReviewAuditTime { get; set; }
+        public DateTime? PreliminaryAuditTime { get; set; }
+
+
+        public DateTime? AuditTime  => QCProcessEnum == TrialQCProcess.SingleAudit ? PreliminaryAuditTime : (QCProcessEnum == TrialQCProcess.DoubleAudit ? ReviewAuditTime : null);
     }
 
 

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

@@ -235,7 +235,7 @@ namespace IRaCIS.Core.Application.Image.QA
 				PageSize = 1,
 			});
 
-			return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null;
+			return result.Data.CurrentPageData.Count > 0 ? result.Data.CurrentPageData[0] : null;
 		}
 
 		/// <summary>
@@ -244,7 +244,7 @@ namespace IRaCIS.Core.Application.Image.QA
 		/// <param name="visitSearchDTO"></param>
 		/// <returns></returns>
 		[HttpPost]
-        public async Task<(PageOutput<QCVisitViewModel>, TrialSubjectAndSVConfig)> GetQCVisitList(QCVisitSearchDTO visitSearchDTO)
+        public async Task<IResponseOutput<PageOutput<QCVisitViewModel>>> GetQCVisitList(QCVisitSearchDTO visitSearchDTO)
         {
 
             var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
@@ -266,6 +266,12 @@ namespace IRaCIS.Core.Application.Image.QA
                         || t.QCChallengeDialogList.Any(t => t.CreateUserId == visitSearchDTO.HandleUserId))
                         .WhereIf(visitSearchDTO.IsUrgent != null, t => t.IsUrgent == visitSearchDTO.IsUrgent)
                         .Where(t => t.SubmitState != SubmitStateEnum.None)
+                        .WhereIf(visitSearchDTO.BeginAuditTime != null, t =>   t.Trial.QCProcessEnum==TrialQCProcess.SingleAudit?  t.PreliminaryAuditTime>= visitSearchDTO.BeginAuditTime: 
+                        (t.Trial.QCProcessEnum == TrialQCProcess.DoubleAudit?t.ReviewAuditTime>= visitSearchDTO.BeginAuditTime:true))
+
+                         .WhereIf(visitSearchDTO.EndAuditTime != null, t => t.Trial.QCProcessEnum == TrialQCProcess.SingleAudit ? t.ReviewAuditTime <= visitSearchDTO.EndAuditTime :
+                        (t.Trial.QCProcessEnum == TrialQCProcess.DoubleAudit ? t.ReviewAuditTime <= visitSearchDTO.EndAuditTime : true))
+
                         //.WhereIf(visitSearchDTO.SubmitState != null, t => t.SubmitState == visitSearchDTO.SubmitState)
                         //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
                         .ProjectTo<QCVisitViewModel>(_mapper.ConfigurationProvider);
@@ -279,7 +285,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             var config = await _repository.Where<Trial>(t => t.Id == visitSearchDTO.TrialId).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
 
-            return (pageList, config);
+            return ResponseOutput.Ok (pageList, config);
 
         }