复核指派bug修改

This reverts commit 7d65cf5051.

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -429,11 +429,21 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt)
         {
             var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            if (opt.Data.IsSecondPass != null)
+            {
+                var result = await _qCOperationService.QCSecondReviewPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, (bool)opt.Data.IsSecondPass);
+                await _inspectionService.CompletedSign(singid, result);
+                return result;
+            }
+            else
+            {
                 var result = await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
                 await _inspectionService.CompletedSign(singid, result);
                 return result;
             }
 
+        }
+
         /// <summary>
         /// 一致性核查 回退  对话记录不清除  只允许PM回退
         /// </summary>

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -53,7 +53,7 @@
 		<PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
 		<PackageReference Include="MimeKit" Version="4.11.0" />
-		<PackageReference Include="MiniExcel" Version="1.40.0" />
+		<PackageReference Include="MiniExcel" Version="1.41.3" />
 		<PackageReference Include="Minio" Version="6.0.4" />
 		<PackageReference Include="MiniWord" Version="0.9.2" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">

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

@@ -10525,6 +10525,11 @@
             阅片版本
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.ReadingToolList">
+            <summary>
+            阅片工具
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionGroup">
             <summary>
             标准分组
@@ -13307,7 +13312,7 @@
             阅片期配置
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingPeriodSetService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingPeriodSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitStage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingPeriodPlan},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Site},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingPeriodSetService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingPeriodSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitStage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Contracts.IReadingImageTaskService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingPeriodPlan},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Site},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             阅片期配置
             </summary>
@@ -13379,7 +13384,7 @@
             生成的阅片模块(在大列表上展示的) 阅片期
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadModuleService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataTrialSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModuleView},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalData},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingPeriodSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadModuleService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataTrialSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModuleView},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalData},IRaCIS.Core.Application.Contracts.IReadingImageTaskService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingPeriodSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             生成的阅片模块(在大列表上展示的) 阅片期
             </summary>

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -216,6 +216,8 @@ namespace IRaCIS.Core.Application.ViewModel
         //public bool IsAfterConvertedTask { get; set; }
 
         public string PMBackReason { get; set; }
+
+        public int? RandomOrder { get; set; }
     }
 
 
@@ -482,6 +484,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public string? RequestReReadingReason { get; set; }
 
         public ExportResult? ReadingExportType { get; set; }
+
+        public int? RandomOrder { get; set; }
+        public bool? IsRandomOrderList { get; set; }
     }
 
 
@@ -908,6 +913,30 @@ namespace IRaCIS.Core.Application.ViewModel
         CancelAssign = 4,
     }
 
+
+    public class SetRandomTaskOrderCommand
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
+
+        [NotDefault]
+        public Guid DoctorUserId { get; set; }
+
+        public bool IsAutoSet { get; set; }
+
+        public List<VisitTaskOrderCommand> SetList { get; set; }
+    }
+
+    public class VisitTaskOrderCommand
+    {
+        public Guid Id { get; set; }
+
+        public int? RandomOrder { get; set; }
+    }
+
 }
 
 

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -757,24 +757,14 @@ namespace IRaCIS.Core.Application.Service
 
                                             if (trialReadingCriterionConfig.TaskAllocateObjEnum == TaskAllocateObj.Subject)
                                             {
-                                                var allocateSubjectArmList = _visitTaskRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
-                                                       .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
-
-                                                //当前任务没有分配医生，初次分配  不处理 只生成任务，后续根据生成的任务 再进行分配
-                                                if (allocateSubjectArmList.Count == 0)
-                                                {
-
-                                                }
-                                                else
-                                                {
-                                                    //并且配置了医生 
-                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
-                                                    {
-
-                                                        #region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务  (PM 有序退回  或者PM  有序 申请重阅)
 
 
                                                 if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
+                                                {
+                                                    #region 当前访视处理
+
+                                                    //配置了医生
+                                                    if (assignConfigList.Count > 0)
                                                     {
                                                         //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
 
@@ -813,6 +803,13 @@ namespace IRaCIS.Core.Application.Service
 
                                                             #endregion
                                                         }
+                                                    }
+                                                    #endregion
+
+                                                    #region 后续访视处理
+
+
+
 
                                                     //后续最近的未一致性核查通过的访视任务
                                                     var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
@@ -867,13 +864,13 @@ namespace IRaCIS.Core.Application.Service
 
                                                             if (arm1 != null)
                                                             {
+                                                                arm1.IsUrgent = visit.IsUrgent;
+                                                                arm1.TaskUrgentType = urgentType;
+                                                                arm1.IsCanEditUrgentState = isCanEdit;
 
                                                                 //有可能仅仅只分配了一个Subject   未分配  那么
                                                                 if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
                                                                 {                                                                
-                                                                            arm1.IsUrgent = visit.IsUrgent;
-                                                                            arm1.TaskUrgentType = urgentType;
-                                                                            arm1.IsCanEditUrgentState = isCanEdit;
                                                                     arm1.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm1.AllocateTime = DateTime.Now;
                                                                     arm1.DoctorUserId = task1.DoctorUserId;
@@ -885,9 +882,6 @@ namespace IRaCIS.Core.Application.Service
                                                             {
                                                                 var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm1).OrderByDescending(t => t.CreateTime).First();
 
-
-
-
                                                                 var taskOne = await _visitTaskRepository.AddAsync(new VisitTask()
                                                                 {
                                                                     TrialId = trialId,
@@ -909,15 +903,21 @@ namespace IRaCIS.Core.Application.Service
                                                                     BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
                                                                     IsAnalysisCreate = latestTask.IsAnalysisCreate,
                                                                     IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                            TaskAllocationState = TaskAllocationState.Allocated,
-                                                                            AllocateTime = DateTime.Now,
-                                                                            DoctorUserId = task1!.DoctorUserId,
-                                                                            SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
+                                                                   
                                                                     TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
                                                                     IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
                                                                     IsClinicalDataSign = latestTask.IsClinicalDataSign
                                                                 });
 
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
+                                                                {
+                                                                    taskOne.TaskAllocationState = TaskAllocationState.Allocated;
+                                                                    taskOne.AllocateTime = DateTime.Now;
+                                                                    taskOne. DoctorUserId = task1!.DoctorUserId;
+                                                                    taskOne. SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                }
+                                                                
+
                                                                 currentMaxCodeInt = currentMaxCodeInt + 1;
 
                                                                 _fusionCache.Set<int>(CacheKeys.TrialStudyMaxCode(trialId), currentMaxCodeInt, TimeSpan.FromMinutes(30));
@@ -934,13 +934,14 @@ namespace IRaCIS.Core.Application.Service
                                                         {
                                                             var arm2 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm2);
                                                             if (arm2 != null)
-                                                                    {
-                                                                        //有可能仅仅只分配了一个Subject
-                                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
                                                             {
                                                                 arm2.IsUrgent = visit.IsUrgent;
                                                                 arm2.TaskUrgentType = urgentType;
                                                                 arm2.IsCanEditUrgentState = isCanEdit;
+
+                                                                //有可能仅仅只分配了一个Subject
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
+                                                                {
                                                                     arm2.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm2.AllocateTime = DateTime.Now;
                                                                     arm2.DoctorUserId = task2.DoctorUserId;
@@ -975,17 +976,20 @@ namespace IRaCIS.Core.Application.Service
                                                                     BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
                                                                     IsAnalysisCreate = latestTask.IsAnalysisCreate,
                                                                     IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                            TaskAllocationState = TaskAllocationState.Allocated,
-
-                                                                            AllocateTime = DateTime.Now,
-                                                                            DoctorUserId = task2!.DoctorUserId,
-                                                                            SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
                                                                    
                                                                     TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
                                                                     IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
                                                                     IsClinicalDataSign = latestTask.IsClinicalDataSign
                                                                 });
 
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
+                                                                {
+                                                                    taskTwo.TaskAllocationState = TaskAllocationState.Allocated;
+                                                                    taskTwo.AllocateTime = DateTime.Now;
+                                                                    taskTwo.DoctorUserId = task2!.DoctorUserId;
+                                                                    taskTwo.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                }
+
                                                                 currentMaxCodeInt = currentMaxCodeInt + 1;
 
                                                                 _fusionCache.Set<int>(CacheKeys.TrialStudyMaxCode(trialId), currentMaxCodeInt, TimeSpan.FromMinutes(30));
@@ -994,10 +998,15 @@ namespace IRaCIS.Core.Application.Service
 
                                                     }
 
+                                                    #endregion
+
+
 
                                                 }
-                                                        //无序的时候    生成任务并分配出去
                                                 else
+                                                {
+                                                    //无序的时候    生成任务并分配出去
+                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
                                                     {
                                                         var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
@@ -1018,21 +1027,10 @@ namespace IRaCIS.Core.Application.Service
                                                             task2.AllocateTime = DateTime.Now;
                                                             task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                         }
-
                                                     }
 
 
-                                                        #endregion
-
                                                 }
-                                                    else
-                                                    //后续访视不自动分配，或者配置的医生数量不足，就不进行分配
-                                                    {
-
-                                                    }
-
-                                                }
-
 
                                             }
 

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -16,6 +16,7 @@ using IRaCIS.Core.Infrastructure;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System.Linq.Dynamic.Core;
 using Subject = IRaCIS.Core.Domain.Models.Subject;
 
@@ -74,7 +75,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         return await _visitTaskRepository.SaveChangesAsync();
     }
 
-    public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true, bool? isAutoCreate = null)
+    public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true, bool? isAutoCreate = null, bool? isRandom = null)
     {
         var list = await _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsConfirm)
 
@@ -107,7 +108,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
         return list.AsQueryable().WhereIf(isHaveSigned == true, t => t.ReadingInfoSignTime != null)
-             .WhereIf(isAutoCreate == false, t => t.IsAutoCreate == isAutoCreate).ToList();
+             .WhereIf(isAutoCreate == false, t => t.IsAutoCreate == isAutoCreate)
+              .WhereIf(isRandom == true, t => t.IsReadingTaskViewInOrder == ReadingOrder.Random).ToList();
     }
 
 
@@ -761,6 +763,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
            .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime < inQuery.EndAllocateDate)
            .WhereIf(inQuery.BeginSignTime != null, t => t.SignTime > inQuery.BeginSignTime)
            .WhereIf(inQuery.EndSignTime != null, t => t.SignTime < inQuery.EndSignTime)
+            .WhereIf(inQuery.RandomOrder != null, t => t.RandomOrder == inQuery.RandomOrder)
+             .WhereIf(inQuery.IsRandomOrderList == true, t => (t.ReadingTaskState == ReadingTaskState.WaitReading || t.ReadingTaskState==ReadingTaskState.Reading) && t.TaskAllocationState==TaskAllocationState.Allocated)
            .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
 
         var defalutSortArray = new string[] { nameof(ReadingTaskView.IsUrgent) + " desc", nameof(ReadingTaskView.SubjectCode), nameof(ReadingTaskView.VisitTaskNum) };
@@ -1005,6 +1009,10 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         if (critrion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
         {
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr }).FirstOrDefault();
+
+            var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
+
             var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect)
 
            .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
@@ -1012,7 +1020,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
 
            // 前序 不存在 未一致性核查未通过的
-           .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
+           .Where(t => !t.Subject.SubjectVisitList.Where(t => extralConfig.IsOpenLostVistRead ? t.IsLostVisit == false : true).Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
            //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
            //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
            //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
@@ -1035,14 +1043,15 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 UnReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
 
                 //未读 里可读任务量   
-                UnReadCanReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
+                UnReadCanReadTaskCount = x.Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false).Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
                 //不能对包含聚合或子查询的表达式执行聚合函数
                 //&& !x.Any(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false && t.VisitTaskNum<y.VisitTaskNum )
                 ).Count(),
 
 
                 UnReadCanReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
-                .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
+                .Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false)
+                .Where(y => /*y.IsFrontTaskNeedSignButNotSign == false &&*/ (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
                 .OrderBy(x => x.VisitTaskNum)
                 .Select(u => new IRUnreadTaskView()
                 {
@@ -2577,7 +2586,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         sv.CurrentActionUserId = null;
         sv.PreliminaryAuditUserId = null;
         sv.ReviewAuditUserId = null;
-
+        sv.SecondReviewState = SecondReviewState.None;
 
         if (sv.IsBaseLine)
         {
@@ -2942,6 +2951,88 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     }
 
 
+    #region 完全随机设置序号
+    [HttpPost]
+    [UnitOfWork]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
+    public async Task<IResponseOutput> SetRandomTaskOrder(SetRandomTaskOrderCommand inCommand)
+    {
+
+        if (inCommand.IsAutoSet)
+        {
+            //找到所有的已分配的，未阅片的，生效的 非一致性分析
+
+            var needRandomOrderList = _visitTaskRepository.Where(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId)
+                  .Where(t => t.TaskAllocationState == TaskAllocationState.Allocated && t.ReadingTaskState == ReadingTaskState.WaitReading && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
+                  .Select(t => t.Id).ToList();
+
+
+            //var haveSignOrderList = _visitTaskRepository.Where(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId)
+            //    .Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.SignTime != null && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
+            //    .Select(t => t.RandomOrder).ToList();
+
+            //已阅，阅片中任务的序号
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId
+            && t.DoctorUserId == inCommand.DoctorUserId && t.ReadingTaskState != ReadingTaskState.WaitReading, u => new VisitTask() { RandomOrder = null });
+
+            //随机赋值编号  比如要处理5个任务，实例化一个包含1-5的数组，每次随机取出一个
+            List<int> availableNumbers = Enumerable.Range(1, needRandomOrderList.Count).ToList();
+            Random rng = new Random();
+            foreach (var id in needRandomOrderList)
+            {
+                int randomIndex = rng.Next(availableNumbers.Count);
+
+                var num = availableNumbers[randomIndex];
+
+                var order = 11 + 5 * (num - 1);
+
+                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, t => new VisitTask() { RandomOrder = order });
+
+                availableNumbers.RemoveAt(randomIndex);
+            }
+
+        }
+        else
+        {
+            foreach (var item in inCommand.SetList)
+            {
+                var task = await _visitTaskRepository.Where(t => t.Id == item.Id).Select(t => new { t.RandomOrder, t.ReadingTaskState, t.TaskAllocationState, t.DoctorUserId }).FirstNotNullAsync();
+
+                if (task.ReadingTaskState != ReadingTaskState.WaitReading || task.DoctorUserId != inCommand.DoctorUserId
+                    || task.TaskAllocationState != TaskAllocationState.Allocated)
+                {
+                    //"任务不符合设置阅片序号条件"
+                    return ResponseOutput.NotOk(_localizer["VisitTask_NotRandomOrderTask"]);
+                }
+
+                //设置交换序号的任务，可能不符合条件
+
+                //没有序号，直接设置
+                if (task.RandomOrder == null)
+                {
+                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, t => new VisitTask() { RandomOrder = item.RandomOrder });
+                }
+                else
+                {
+                    if(!_visitTaskRepository.Any(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId
+                       && t.TaskAllocationState == TaskAllocationState.Allocated && t.ReadingTaskState == ReadingTaskState.WaitReading && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)
+                       && t.RandomOrder == item.RandomOrder))
+                    {
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, t => new VisitTask() { RandomOrder = item.RandomOrder });
+                    }
+                    else
+                    {
+                        //"序号已被占用！"
+                        return ResponseOutput.NotOk(_localizer["VisitTask_RandomOrderUserd"]);
+                    }
+                }
+            }
+        }
+
+        return ResponseOutput.Ok();
+    }
+
+    #endregion
     #region 暂时废弃
 
 

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -361,7 +361,7 @@ namespace IRaCIS.Core.Application.Service.Common
             var systemDocQuery =
                from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                               .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.Status == UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
                   .Where(t => inQuery.UserId != null ? t.Id == inQuery.UserId : true)
                   .Where(t => inQuery.UserTypeId != null ? t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserTypeId && t.IsUserRoleDisabled == false) : true)
                join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
@@ -1304,8 +1304,10 @@ namespace IRaCIS.Core.Application.Service.Common
             var list = await _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsAnalysisCreate == false)
                            //.Where(t => t.IsAnalysisCreate == false && t.DoctorUserId != null)
 
+                           .WhereIf(inQuery.IsEffect == true, t => t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)
+             .WhereIf(inQuery.IsEffect == false, t => t.TaskState == TaskState.Adbandon || t.TaskState == TaskState.HaveReturned)
+
            .WhereIf(inQuery.TaskState != null, t => t.TaskState == inQuery.TaskState)
-               .WhereIf(inQuery.ArmEnum != null, t => t.ArmEnum == inQuery.ArmEnum)
            .WhereIf(inQuery.TrialSiteId != null, t => t.Subject.TrialSiteId == inQuery.TrialSiteId)
            .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
            .WhereIf(inQuery.IsUrgent != null, t => t.IsUrgent == inQuery.IsUrgent)
@@ -1314,27 +1316,51 @@ namespace IRaCIS.Core.Application.Service.Common
            .WhereIf(inQuery.ReadingTaskState != null, t => t.ReadingTaskState == inQuery.ReadingTaskState)
            .WhereIf(inQuery.TaskAllocationState != null, t => t.TaskAllocationState == inQuery.TaskAllocationState)
            .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+           .WhereIf(inQuery.ReReadingApplyState != null, t => t.ReReadingApplyState == inQuery.ReReadingApplyState)
 
-
+            .WhereIf(inQuery.CompleteClinicalDataEnum == CompleteClinicalDataEnum.Complete, t => t.IsClinicalDataSign && t.IsNeedClinicalDataSign == true)
+            .WhereIf(inQuery.CompleteClinicalDataEnum == CompleteClinicalDataEnum.NotComplete, t => t.IsClinicalDataSign == false && t.IsNeedClinicalDataSign == true)
+            .WhereIf(inQuery.CompleteClinicalDataEnum == CompleteClinicalDataEnum.NA, t => t.IsNeedClinicalDataSign == false)
            .WhereIf(!string.IsNullOrEmpty(inQuery.TrialSiteCode), t => (t.BlindTrialSiteCode.Contains(inQuery.TrialSiteCode!) && t.IsAnalysisCreate) || (t.Subject.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode!) && t.IsAnalysisCreate == false))
            .WhereIf(!string.IsNullOrEmpty(inQuery.TaskName), t => t.TaskName.Contains(inQuery.TaskName) || t.TaskBlindName.Contains(inQuery.TaskName))
-               .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.Subject.Code.Contains(inQuery.SubjectCode) || t.BlindSubjectCode.Contains(inQuery.SubjectCode))
+           .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode) && t.IsAnalysisCreate))
            .WhereIf(inQuery.BeginAllocateDate != null, t => t.AllocateTime > inQuery.BeginAllocateDate)
-               .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime < inQuery.EndAllocateDate!.Value.AddDays(1))
+           .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime < inQuery.EndAllocateDate)
+           .WhereIf(inQuery.BeginSignTime != null, t => t.SignTime > inQuery.BeginSignTime)
+           .WhereIf(inQuery.EndSignTime != null, t => t.SignTime < inQuery.EndSignTime)
+           .WhereIf(inQuery.RandomOrder != null, t => t.RandomOrder == inQuery.RandomOrder)
+           .WhereIf(inQuery.IsRandomOrderList == true, t => (t.ReadingTaskState == ReadingTaskState.WaitReading || t.ReadingTaskState == ReadingTaskState.Reading) && t.TaskAllocationState == TaskAllocationState.Allocated)
+
                .ProjectTo<ReadingTaskExportDto>(_mapper.ConfigurationProvider).ToListAsync();
 
             //var defalutSortArray = new string[] { nameof(VisitTask.IsUrgent) + " desc", nameof(VisitTask.SubjectId), nameof(VisitTask.VisitTaskNum) };
 
-            list = list.OrderBy(t => t.TrialSiteCode).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
 
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
 
 
+            if (inQuery.IsRandomOrderList == true)
+            {
+                list = list.OrderBy(t => t.RandomOrder).ToList();
+
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
+
+                return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialTaskRandomOrderList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
+
+            }
+            else
+            {
+                list = list.OrderBy(t => t.TrialSiteCode).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
+
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
+
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
+
+            }
+
         }
 
 

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -799,7 +799,7 @@ namespace IRaCIS.Core.Application.Services
             var systemDocQuery =
                from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                               .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+               from identityUser in _identityUserRepository.AsQueryable(false).Where(t =>t.Status== UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
                   .Where(t => inQuery.UserId != null ? t.Id == inQuery.UserId : true)
                   .Where(t => inQuery.UserTypeId != null ? t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserTypeId && t.IsUserRoleDisabled == false) : true)
                join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -81,7 +81,7 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public bool IsReading { get; set; }
         public bool IsDeleted { get; set; }
-
+        public long? FileSize { get; set; }
 
 
         public Guid? StudyId { get; set; }

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs

@@ -107,8 +107,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
         public string Modalities { get; set; }
 
         public string Description { get; set; }
+
         public int SeriesCount { get; set; }
         public int InstanceCount { get; set; }
+
+        public int ReadingSeriesCount { get; set; }
+
+        public int ReadingInstanceCount { get; set; }
     }
 
     public class NoneDicomStudyBasicInfo
@@ -128,6 +133,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
         public string Description { get; set; } = string.Empty;
 
 
+        public int ReadingFileCount { get; set; }
 
     }
 }

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -13,6 +13,7 @@ using MassTransit.Initializers;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using System.Data;
 using System.IO.Compression;
 using System.Text;
@@ -62,7 +63,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             //subject 随机阅片  或者无序 有上传 才处理任务编号
             if (_visitTaskRepository.Any(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId &&
            (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom ||
-           (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.Random && t.TrialReadingCriterion.ImageUploadEnum != ReadingImageUpload.None))))
+           (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.Random && t.TrialReadingCriterion.ImageDownloadEnum != ReadingImageDownload.None))))
             {
                 //找到 非一致性分析，未签名，状态正常的 并且任务名称是TimePoint的 任务
                 var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
@@ -881,6 +882,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 subjectCode = inQuery.SubjectCode;
             }
 
+            TaskState? taskState = null;
             if (inQuery.VisitTaskId != null)
             {
                 //考虑到一致性分析，必须要这个编号进行过滤
@@ -891,19 +893,25 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     SubjectCode = t.IsAnalysisCreate ? t.BlindSubjectCode : t.Subject.Code,
                     SubjectId = t.SubjectId,
                     t.DoctorUserId,
-                    t.IsAnalysisCreate
+                    t.IsAnalysisCreate,
+                    t.TaskState
                 }).FirstNotNullAsync();
 
                 subjectId = taskInfo.SubjectId;
                 subjectCode = taskInfo.SubjectCode;
                 doctorUserId = (Guid)taskInfo.DoctorUserId!;
                 isAnalysisCreate = taskInfo.IsAnalysisCreate;
+
+                taskState = taskInfo.TaskState;
             }
 
             var query = _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
-                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == doctorUserId && t.TaskState == TaskState.Effect)
+                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == doctorUserId)
                 //满足 有序，或者随机只看到当前任务的dicom 非dicom检查
+                .WhereIf(inQuery.VisitTaskId == null, t => t.TaskState == TaskState.Effect)//从待阅列表进入，要筛选出有效的，任务可能重阅了，也要看到该任务的
                 .WhereIf(criterionInfo.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom && inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)
+                .WhereIf(taskState == TaskState.Effect || taskState == TaskState.Freeze, t => t.TaskState == TaskState.Effect)//subject 随机可能当前阅片人有退回任务，此时传递了任务Id，但是要看整个subject得，要只留生效的
+                .WhereIf(taskState != null && taskState != TaskState.Effect && taskState != TaskState.Freeze, t => t.Id == inQuery.VisitTaskId) //非生效只查当前任务
                 .ProjectTo<SubjectCRCImageUploadedDto>(_mapper.ConfigurationProvider);
 
             //这里过滤是否是一致性分析的
@@ -1004,11 +1012,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 u.StudyTime,
                                 u.StudyCode,
 
-                                SeriesList = u.SeriesList.Select(z => new
+                                SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new
                                 {
                                     z.Modality,
 
-                                    InstancePathList = z.DicomInstanceList.Select(k => new
+                                    InstancePathList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new
                                     {
                                         k.Path,
                                         k.FileSize
@@ -1019,13 +1027,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                             NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
                              .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
+                             .Where(t => t.IsReading)
                             .Select(nd => new
                             {
                                 nd.Modality,
                                 nd.StudyCode,
                                 nd.ImageDate,
 
-                                FileList = nd.NoneDicomFileList.Select(file => new
+                                FileList = nd.NoneDicomFileList.Where(t => t.IsReading).Select(file => new
                                 {
                                     file.FileName,
                                     file.Path,
@@ -1107,7 +1116,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             HtmlPath = k.HtmlPath,
                             Path = k.Path,
                             InstanceNumber = k.InstanceNumber,
-
+                            FileSize=k.FileSize,
                         }).ToList()
                     })
                 });

IRaCIS.Core.Application/Service/ImageAndDoc/Interface/IStudyService.cs

@@ -4,7 +4,7 @@ namespace IRaCIS.Core.Application.Contracts
 {
     public interface IStudyService
     {
-        IResponseOutput<List<RelationStudyDTO>> GetAllRelationStudyList(Guid subjectVisitId);
+        IResponseOutput<List<RelationStudyDTO>> GetAllRelationStudyList(Guid subjectVisitId,bool? isReading);
         Task<PageOutput<UnionStudyViewModel>> GetDicomAndNoneDicomStudyList(StudyQuery studyQuery);
         Task<PageOutput<UnionStudyMonitorModel>> GetDicomAndNoneDicomStudyMonitorList(StudyQuery studyQuery);
         (List<string> SeriesInstanceUid, List<string> SopInstanceUid) GetHasUploadSeriesAndInstance(Guid studyId);

IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs

@@ -1,5 +1,6 @@
 using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
@@ -19,8 +20,9 @@ namespace IRaCIS.Core.Application.Services
         //医生读片那一块有耦合，关键序列   这里暂时留存
         /// <summary> 指定资源Id，获取Dicom检查所属序列信息列表 </summary>
         /// <param name="studyId"> Dicom检查的Id </param>
+        /// <param name="isReading"></param>
         [HttpGet, Route("{studyId:guid}")]
-        public async Task<IResponseOutput<List<DicomSeriesDTO>>> List(Guid studyId)
+        public async Task<IResponseOutput<List<DicomSeriesDTO>>> List(Guid studyId, bool? isReading)
         {
             //质控的时候，要标记序列，和instance 删除  ，所以要返回全部，但是 质控通过后，pm 进去看的时候要看过滤后的
 
@@ -32,14 +34,16 @@ namespace IRaCIS.Core.Application.Services
             //断点
             var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
                 .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                .WhereIf(isReading == true, t => t.IsReading == true)
                 .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
               .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             var instanceList = await _instanceRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
                  .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                 .WhereIf(isReading == true, t => t.IsReading == true)
                  .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
                  .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();//.GroupBy(u => u.SeriesId);
+                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize }).ToListAsync();//.GroupBy(u => u.SeriesId);
 
 
             foreach (var series in seriesList)
@@ -54,7 +58,8 @@ namespace IRaCIS.Core.Application.Services
                        Path = k.Path,
                        InstanceNumber = k.InstanceNumber,
                        IsReading = k.IsReading,
-                       IsDeleted = k.IsDeleted
+                       IsDeleted = k.IsDeleted,
+                       FileSize = k.FileSize
 
                    }).ToList();
 

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -579,7 +579,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         /// <returns></returns>
         [HttpGet("{subjectVisitId:guid}")]
         [AllowAnonymous]
-        public IResponseOutput<List<RelationStudyDTO>> GetAllRelationStudyList(Guid subjectVisitId)
+        public IResponseOutput<List<RelationStudyDTO>> GetAllRelationStudyList(Guid subjectVisitId,bool? isReading)
         {
             #region 废弃
             //var studylist = _studyRepository.Where(u => u.SubjectVisitId == subjectVisitId && u.IsDeleted == false).Select(t => new { StudyId = t.Id, t.SubjectId, t.TrialId }).ToList();
@@ -607,10 +607,18 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var studyInfo = _dicomStudyRepository.Where(u => u.SubjectVisitId == subjectVisitId).Select(t => new { t.SubjectId, t.TrialId }).FirstOrDefault().IfNullThrowException();
 
-            var query = _dicomStudyRepository.Where(t => t.SubjectVisitId != subjectVisitId && t.TrialId == studyInfo.TrialId && t.SubjectId == studyInfo.SubjectId)
-                .ProjectTo<RelationStudyDTO>(_mapper.ConfigurationProvider).ToList();
+            var list = _dicomStudyRepository.Where(t => t.SubjectVisitId != subjectVisitId && t.TrialId == studyInfo.TrialId && t.SubjectId == studyInfo.SubjectId)
+                .Select(t=> new RelationStudyDTO()
+                {
+                    StudyId = t.Id,
+                    StudyCode = t.StudyCode,
+                    VisitName = t.SubjectVisit.VisitName,
+                    Modalities = t.Modalities,
+                    Description = t.Description,
+                    SeriesCount = t.SeriesList.Where(t=> isReading==true? t.IsReading==true:true).Count()
+                }) .ToList();
 
-            var list = query.OrderBy(u => u.VisitName).ThenBy(s => s.StudyCode).ToList();
+             list = list.Where(t=>t.SeriesCount>0).OrderBy(u => u.VisitName).ThenBy(s => s.StudyCode).ToList();
 
             return ResponseOutput.Ok(list);
         }

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

@@ -130,16 +130,20 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.CriterionModalitys, u => u.MapFrom(s => s.TrialReadingCriterion.CriterionModalitys))
                 .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code));
 
-            CreateMap<DicomStudy, DicomStudyBasicInfo>();
-            CreateMap<NoneDicomStudy, NoneDicomStudyBasicInfo>();
+            CreateMap<DicomStudy, DicomStudyBasicInfo>()
+                  .ForMember(d => d.ReadingSeriesCount, u => u.MapFrom(s => s.SeriesList.Where(t => t.IsReading).Count()))
+                  .ForMember(d => d.ReadingInstanceCount, u => u.MapFrom(s => s.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading).Count()));
+
+            CreateMap<NoneDicomStudy, NoneDicomStudyBasicInfo>()
+                 .ForMember(d => d.ReadingFileCount, u => u.MapFrom(s => s.NoneDicomFileList.Where(t => t.IsReading).Count()));
+
             CreateMap<VisitTask, SubjectCRCImageUploadedDto>()
                 .ForMember(d => d.VisitTaskId, u => u.MapFrom(s => s.Id))
                 .ForMember(d => d.IsImageFilter, u => u.MapFrom(s => s.TrialReadingCriterion.IsImageFilter))
                  .ForMember(d => d.CriterionModalitys, u => u.MapFrom(s => s.TrialReadingCriterion.CriterionModalitys))
                 .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code))
                 .ForMember(d => d.DicomStudyList, u => u.MapFrom(s => s.SourceSubjectVisit.StudyList))
-                .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.SourceSubjectVisit.NoneDicomStudyList))
-                ;
+                .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.SourceSubjectVisit.NoneDicomStudyList.Where(t => t.IsReading)));
 
             CreateMap<TrialImageDownload, TrialImageDownloadView>()
                 .ForMember(d => d.UserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName))

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -199,6 +199,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public Guid subjectVisitId { get; set; }
 
         public AuditStateEnum auditState { get; set; }
+
+        public bool? IsSecondPass { get; set; }
     }
 
     public class SetSeriesStateDto

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

@@ -251,7 +251,13 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     }
 
 
-
+    public class SecondReviewDto
+    {
+        public DateTime? SecondReviewTime { get; set; }
+        public string FullName { get; set; }
+        public string UserName { get; set; }
+        public DateTime? SignTime { get; set; }
+    }
 
 
     public class TrialVisitQADTO
@@ -270,6 +276,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public QARelationInfo RelationInfo { get; set; } = new QARelationInfo();
 
+        public List<SecondReviewDto> SecondReviewList { get; set; }
     }
 
 

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

@@ -203,6 +203,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsShowStudyName { get; set; } = false;
 
+        public bool IsQCQuestionConfirmed { get; set; }
+
     }
 
 
@@ -897,6 +899,8 @@ namespace IRaCIS.Core.Application.Contracts
                          /*string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes)*/;
             }
         }
+
+        public int? RandomOrder { get; set; }
     }
 
 
@@ -1947,6 +1951,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class QCQuestionAnswer
     {
+        public Guid? AnswerId { get; set; }
         public Guid Id { get; set; }
         public string QuestionName { get; set; } = String.Empty;
         public bool IsRequired { get; set; }
@@ -1975,6 +1980,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         // 1代表第一个人QC数据  2 代表第二个人QC数据
         public CurrentQC CurrentQCEnum { get; set; }
+
+        public DateTime? SecondReviewTime { get; set; }
     }
 
     public class ForwardQuery : PageInput
@@ -2128,6 +2135,8 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class QCVisitBasicListViewModel
     {
+        public SecondReviewState SecondReviewState { get; set; }
+        public bool IsSubjectQuit { get; set; }
         public ChallengeStateEnum ChallengeState { get; set; }
         public bool? IsConfirmedClinicalData { get; set; }
         public bool IsQCConfirmedReupload { get; set; }

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

@@ -35,6 +35,8 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime UpdateTime { get; set; }
         public Guid UpdateUserId { get; set; }
 
+        public bool IsQuestionQCAuditPassed { get; set; }
+
     }
 
     public class QCQuestionFilterSelect

IRaCIS.Core.Application/Service/QC/Interface/IQCOperationService.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Image.QA
         Task<IResponseOutput> QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState);
         Task<IResponseOutput> SetCheckPass(SetCheckPassDt data);
 
-
+        Task<IResponseOutput> QCSecondReviewPassedOrFailed(Guid trialId, Guid subjectVisitId, bool isSecondPass);
 
 
         Task<IResponseOutput> AddCheckChallengeReply(CheckChallengeDialogCommand checkDialogCommand);

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

@@ -7,6 +7,8 @@ using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
 using MassTransit.Initializers;
 using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula.Functions;
+using System.Linq;
 
 namespace IRaCIS.Core.Application.Image.QA
 {
@@ -24,6 +26,7 @@ namespace IRaCIS.Core.Application.Image.QA
         IRepository<NoneDicomStudy> _noneDicomStudyRepository,
         IRepository<QCChallenge> _qcChallengeRepository,
         IRepository<SubjectVisitImageBackRecord> _subjectVisitImageBackRecordReposiotry,
+         IRepository<UserRole> _userRoleReposiotry,
         IReadingImageTaskService _IReadingImageTaskService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IQCListService
     {
 
@@ -409,10 +412,50 @@ namespace IRaCIS.Core.Application.Image.QA
 
             var qacheckList = await GetQCQuestionAnswerList(subjectVisitId, sv.TrialId, trialQCProcess, currentQCType);
 
+            List<SecondReviewDto> secondReviewList = new List<SecondReviewDto>();
+
+
+            if (sv.SecondReviewState != SecondReviewState.None)
+            {
+                var trialConfirmTime = _trialRepository.Where(t => t.Id == sv.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
+
+                secondReviewList = (from answer in _trialQCQuestionAnswerRepository.Where(t => t.SubjectVisitId == subjectVisitId && t.CurrentQCEnum == CurrentQC.SecondReview).Where(t => t.SecondReviewTime != null)
+                                    join userRole in _userRoleReposiotry.Where() on answer.UpdateUserId equals userRole.Id
+                                    select new SecondReviewDto { SecondReviewTime = answer.SecondReviewTime, SignTime = answer.UpdateTime, FullName = userRole.FullName, UserName = userRole.UserName })
+                .Distinct().ToList();
+
+                var secondReviewTimeList = secondReviewList.Select(t => t.SecondReviewTime).Distinct().ToList();
+
+                //首次加入
+                if (!secondReviewTimeList.Contains(trialConfirmTime))
+                {
+                    secondReviewList.Add(new SecondReviewDto() { SecondReviewTime = trialConfirmTime });
+                }
+                else
+                {
+                    if (sv.SecondReviewState == SecondReviewState.WaitAudit)
+                    {
+                        foreach (var item in secondReviewList)
+                        {
+                            if (item.SecondReviewTime == trialConfirmTime)
+                            {
+                                item.SignTime = null;
+                                item.FullName = "";
+                                item.UserName = "";
+                            }
+                        }
+                    }
+                }
+                secondReviewList = secondReviewList.OrderByDescending(t => t.SecondReviewTime).ToList();
+            }
+
+
             return new TrialVisitQADTO
             {
                 QCQuestionAnswerList = qacheckList,
 
+                SecondReviewList = secondReviewList,
+
                 IsHaveStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialId == sv.TrialId && x.ClinicalDataLevel == ClinicalLevel.Study),
                 StudyList = temp.StudyList,
                 ExistsManual = (await _IReadingImageTaskService.GetManualList(new GetManualListInDto() { TrialId = sv.TrialId })).Count() > 0,
@@ -432,11 +475,53 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpPost]
         public async Task<List<QCQuestionAnswer>> GetQCQuestionAnswer(GetQCQuestionAnswerInDto inDto)
         {
-            var questionAnswerlist = await (from data in _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.IsEnable)
-                                            join answer in _trialQCQuestionAnswerRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId && x.QCProcessEnum == inDto.QCProcessEnum && x.CurrentQCEnum == inDto.CurrentQCEnum).AsQueryable() on data.Id equals answer.TrialQCQuestionConfigureId into answertemp
+            var subjectVisitId = inDto.SubjectVisitId;
+
+            List<QCQuestionAnswer> questionAnswerlist = new List<QCQuestionAnswer>();
+
+            //判断当前访视质控是否完成，再判断复审是完成查看，还是添加编辑
+
+            var sv = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).FirstNotNullAsync();
+
+            var trialConfirmTime = _trialRepository.Where(t => t.Id == sv.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
+
+            var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : trialConfirmTime == null ? DateTime.Now : (DateTime)trialConfirmTime;
+
+            if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview) || (inDto.CurrentQCEnum == CurrentQC.SecondReview && secondReviewTime.AddSeconds(1) < trialConfirmTime))
+            {
+
+                //之前质控完的，+二次复核完的，都要从答案表中取  二次复核完的还需要加时间
+
+                questionAnswerlist = await _trialQCQuestionAnswerRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId && x.QCProcessEnum == inDto.QCProcessEnum && x.CurrentQCEnum == inDto.CurrentQCEnum)
+                     .Where(t => inDto.CurrentQCEnum == CurrentQC.SecondReview ? t.SecondReviewTime >= secondReviewTime && t.SecondReviewTime <= secondReviewTime.AddSeconds(1) : true)
+                    .Select(data => new QCQuestionAnswer()
+                    {
+                        AnswerId = data.Id,
+                        Answer = data.Answer,
+                        ShowOrder = data.TrialQCQuestionConfigure.ShowOrder,
+                        QuestionName = data.TrialQCQuestionConfigure.QuestionName,
+                        Id = data.TrialQCQuestionConfigure.Id,
+                        IsRequired = data.TrialQCQuestionConfigure.IsRequired,
+                        ParentId = data.TrialQCQuestionConfigure.ParentId,
+                        ParentTriggerValue = data.TrialQCQuestionConfigure.ParentTriggerValue,
+                        Type = data.TrialQCQuestionConfigure.Type,
+                        TypeValue = data.TrialQCQuestionConfigure.TypeValue
+                    }).OrderBy(t => t.ShowOrder).ToListAsync();
+
+            }
+            else
+            {
+
+                #region 之前编辑和审核通过后展示都是通过这个接口
+
+                questionAnswerlist = await (from data in _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.IsEnable)
+                                            join answer in _trialQCQuestionAnswerRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId && x.QCProcessEnum == inDto.QCProcessEnum && x.CurrentQCEnum == inDto.CurrentQCEnum)
+                                            .Where(t => inDto.CurrentQCEnum == CurrentQC.SecondReview ? t.SecondReviewTime >= secondReviewTime && t.SecondReviewTime <= secondReviewTime.AddSeconds(1) : true)
+                                            on data.Id equals answer.TrialQCQuestionConfigureId into answertemp
                                             from leftanswer in answertemp.DefaultIfEmpty()
                                             select new QCQuestionAnswer()
                                             {
+                                                AnswerId = leftanswer.Id,
                                                 Answer = leftanswer.Answer,
                                                 ShowOrder = data.ShowOrder,
                                                 QuestionName = data.QuestionName,
@@ -447,6 +532,17 @@ namespace IRaCIS.Core.Application.Image.QA
                                                 Type = data.Type,
                                                 TypeValue = data.TypeValue
                                             }).OrderBy(t => t.ShowOrder).ToListAsync();
+                #endregion
+            }
+
+
+
+
+
+
+
+
+
 
             var result = questionAnswerlist.Where(x => x.ParentId == null).OrderBy(t => t.ShowOrder).ToList();
             result.ForEach(x =>

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

@@ -384,6 +384,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 sv.CurrentActionUserId = null;
                 sv.PreliminaryAuditUserId = null;
                 sv.ReviewAuditUserId = null;
+                sv.SecondReviewState = SecondReviewState.None;
 
 
                 if (sv.IsBaseLine)
@@ -691,6 +692,7 @@ namespace IRaCIS.Core.Application.Image.QA
             sv.CurrentActionUserId = null;
             sv.PreliminaryAuditUserId = null;
             sv.ReviewAuditUserId = null;
+            sv.SecondReviewState = SecondReviewState.None;
 
             //var success1 = _studyRepository.Delete(t => t.SubjectVisitId == subjectVisitId);
             //var succeess2 = _instanceRepository.Delete(t => t.SubjectVisitId == subjectVisitId);
@@ -727,9 +729,17 @@ namespace IRaCIS.Core.Application.Image.QA
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> AddOrUpdateQCQuestionAnswerList(QCQuestionAnswerCommand[] qcQuestionAnswerCommands, Guid trialId, Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType)
         {
+            if (currentQCType == CurrentQC.SecondReview)
+            {
+                //二次复核自动领取，如果有人先领取了，那么后续不能操作
+                await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.CurrentActionUserId == null, u => new SubjectVisit() { CurrentActionUserId = _userInfo.UserRoleId, IsTake = true }, true);
+            }
             //验证是否能操作
             await VerifyIsCanQCAsync(null, subjectVisitId);
 
+
+            var trialConfirmTime = _trialRepository.Where(t => t.Id == trialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
+
             //更新
             if (qcQuestionAnswerCommands.Any(t => t.Id != null))
             {
@@ -774,11 +784,13 @@ namespace IRaCIS.Core.Application.Image.QA
             {
                 var addlist = _mapper.Map<List<TrialQCQuestionAnswer>>(qcQuestionAnswerCommands);
 
-                addlist.ForEach(t => { t.TrialId = trialId; t.SubjectVisitId = subjectVisitId; t.CurrentQCEnum = currentQCType; t.QCProcessEnum = trialQCProcess; });
+
+
+                addlist.ForEach(t => { t.TrialId = trialId; t.SubjectVisitId = subjectVisitId; t.CurrentQCEnum = currentQCType; t.QCProcessEnum = trialQCProcess; t.SecondReviewTime = currentQCType == CurrentQC.SecondReview ? trialConfirmTime : null; });
 
                 await _trialQCQuestionAnswerRepository.AddRangeAsync(addlist);
 
-                return ResponseOutput.Result(await _trialQCQuestionAnswerRepository.SaveChangesAsync());
+                return ResponseOutput.Ok(await _trialQCQuestionAnswerRepository.SaveChangesAsync());
             }
 
 
@@ -961,6 +973,9 @@ namespace IRaCIS.Core.Application.Image.QA
                 var noneDicomStudyFile = (await _noneDicomStudyFileRepository.Where(t => t.Id == noneDicomStudyFileId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
 
 
+                var noneDicomStudy = (await _noneDicomStudyRepository.Where(t => t.Id == noneDicomStudyFile.NoneDicomStudyId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
+
+
                 if (state == 1)
                 {
                     noneDicomStudyFile.IsReading = false;
@@ -972,10 +987,15 @@ namespace IRaCIS.Core.Application.Image.QA
                 else if (state == 4)
                 {
                     noneDicomStudyFile.IsDeleted = true;
+
+                    noneDicomStudy.FileCount = noneDicomStudy.FileCount - 1;
+
                 }
                 else if (state == 5)
                 {
                     noneDicomStudyFile.IsDeleted = false;
+
+                    noneDicomStudy.FileCount = noneDicomStudy.FileCount + 1;
                 }
             }
 
@@ -1165,10 +1185,12 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         [TrialGlobalLimit("AfterStopCannNotOpt")]
-        public async Task<IResponseOutput> ReplaceQCTaskActionUser(Guid trialId, Guid subjectVisitId)
+        public async Task<IResponseOutput> ReplaceQCTaskActionUser(Guid trialId, Guid subjectVisitId, Guid? replaceUserRoleId)
         {
             var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
 
+            //await VerifyIsCanQCAsync(dbSubjectVisit);
+
             if (dbSubjectVisit.CurrentActionUserId == null && dbSubjectVisit.IsTake == false)
             {
 
@@ -1179,7 +1201,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             dbSubjectVisit.IsTake = true;
 
-            dbSubjectVisit.CurrentActionUserId = _userInfo.UserRoleId;
+            dbSubjectVisit.CurrentActionUserId = replaceUserRoleId == null || replaceUserRoleId == Guid.Empty ? _userInfo.UserRoleId : replaceUserRoleId;
 
             dbSubjectVisit.CurrentActionUserExpireTime = DateTime.Now.AddHours(1);
 
@@ -1347,6 +1369,12 @@ namespace IRaCIS.Core.Application.Image.QA
 
             if (obtaionOrCancel)
             {
+                //复核的时候，指派后，另外一个人进来的时候如果是自己，那么不进行后续流程
+                if (dbSubjectVisit.CurrentActionUserId == _userInfo.UserRoleId)
+                {
+                    return ResponseOutput.Ok();
+                }
+
                 if (dbSubjectVisit.CurrentActionUserId != null && dbSubjectVisit.IsTake)
                 {
                     //throw new BusinessValidationFailedException("当前访视已被领取，不允许领取");
@@ -1378,6 +1406,8 @@ namespace IRaCIS.Core.Application.Image.QA
                 //    return ResponseOutput.NotOk("您已经领取了其他受试者，完成后才允许领取新的受试者");
                 //}
 
+                if (dbSubjectVisit.SecondReviewState == SecondReviewState.None)
+                {
                     #region 处理验证
 
                     if (trialConfig.QCProcessEnum == TrialQCProcess.NotAudit)
@@ -1437,6 +1467,8 @@ namespace IRaCIS.Core.Application.Image.QA
                     }
 
                     #endregion
+                }
+
 
                 dbSubjectVisit.IsTake = true;
 
@@ -2069,8 +2101,46 @@ namespace IRaCIS.Core.Application.Image.QA
 
         }
 
+        public async Task<IResponseOutput> QCSecondReviewPassedOrFailed(Guid trialId, Guid subjectVisitId, bool isSecondPass)
+        {
+            if (!await _trialUserRoleRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == _userInfo.UserRoleId))
+            {
+                //---您已经被移出项目，没有操作权限。
+                return ResponseOutput.NotOk(_localizer["QCOperation_RemoveItem"]);
+            }
 
 
+            var sv = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);
+
+            await VerifyIsCanQCAsync(sv);
+
+            var trialConfirmTime = _trialRepository.Where(t => t.Id == sv.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
+
+            if (sv.SecondReviewState == SecondReviewState.WaitAudit)
+            {
+                if (isSecondPass)
+                {
+                    sv.SecondReviewState = SecondReviewState.AuditPassed;
+                    sv.IsTake = false;
+                    sv.CurrentActionUserId = null;
+                    sv.CurrentActionUserExpireTime = null;
+
+                }
+                else
+                {
+                    sv.SecondReviewState = SecondReviewState.AuditFailed;
+                }
+
+                await _trialQCQuestionAnswerRepository.BatchUpdateNoTrackingAsync(t => t.SubjectVisitId == sv.Id && t.CurrentQCEnum == CurrentQC.SecondReview && t.SecondReviewTime == trialConfirmTime, u => new TrialQCQuestionAnswer()
+                {
+                    UpdateUserId = _userInfo.UserRoleId,
+                    UpdateTime = DateTime.Now
+                });
+            }
+            await _subjectVisitRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
 
         /// <summary>
         /// 设置、取消 访视紧急

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

@@ -472,6 +472,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialQCQuestion, TrialQCQuestionAddOrEdit>();
 
             CreateMap<TrialQCQuestion, TrialQCQuestionConfigureView>()
+                .ForMember(d => d.IsQuestionQCAuditPassed, u => u.MapFrom(s => s.TrialQCQuestionAnswerList.Any(c => c.TrialQCQuestionConfigureId == s.Id && c.SubjectVisit.AuditState == AuditStateEnum.QCPassed)))
                .ForMember(d => d.ParentShowOrder, u => u.MapFrom(s => s.ParentQCQuestion.ShowOrder));
 
             CreateMap<TrialQCQuestionSelect, TrialQCQuestionConfigureView>();

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -798,6 +798,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public ReadingVersion? ReadingVersionEnum { get; set; }
 
 
+        public ReadingTool? ReadingTool { get; set; }
+
+        /// <summary>
+        /// 阅片工具
+        /// </summary>
+        public List<string> ReadingToolList { get; set; } = new List<string>();
+
+
     }
 
 

IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs

@@ -12,6 +12,7 @@ namespace IRaCIS.Core.Application.Contracts
 {
     public interface IReadingImageTaskService
     {
+        Task TriggerJudgeQuestion(Guid visitTaskId);
         Task<IResponseOutput> SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto);
 
         Task<IResponseOutput> SubmitJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto);

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -393,6 +393,12 @@ namespace IRaCIS.Core.Application.Service.RC
 
                 indto.ReadingVersionEnum=(ReadingVersion)maxDic;
             }
+
+            indto.ReadingTool = ReadingTool.Dicom;
+            indto.ReadingToolList = new List<string>()
+            {
+                "Length", "Bidirectional", "RectangleROI", "ArrowAnnotate", "CircleROI"
+            };
             var entity = await _readingQuestionCriterionTrialRepository.InsertOrUpdateAsync(indto, true);
             return ResponseOutput.Ok(entity.Id.ToString());
         }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -94,7 +94,7 @@ namespace IRaCIS.Core.Application.Service
             })).ToList();
 
             await _readingGlobalTaskInfoRepository.AddRangeAsync(answers);
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == inDto.GlobalTaskId, u => new VisitTask() { ReadingTaskState = ReadingTaskState.Reading });
+            await _visitTaskRepository.UpdatePartialFromEFAutoAsync(inDto.GlobalTaskId, u => new VisitTask() { ReadingTaskState = ReadingTaskState.Reading });
             var result = await _readingGlobalTaskInfoRepository.SaveChangesAsync();
             return ResponseOutput.Ok(result);
         }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -3034,7 +3034,9 @@ namespace IRaCIS.Core.Application.Service
                 var subjectTaskList = (await _visitTaskService.GetSubjectReadingIQueryable(new GetReadingIQueryableInDto()
                 {
                     TrialId = inDto.TrialId,
+                    SubjectId = inDto.SubjectId,
                     TrialReadingCriterionId = trialReadingCriterionId!.Value,
+                    SubjectCode = inDto.SubjectCode,
                     PageIndex = 1,
                     PageSize = 99999,
 
@@ -3117,24 +3119,45 @@ namespace IRaCIS.Core.Application.Service
                 && x.TrialReadingCriterionId == trialReadingCriterionId
                 && x.TaskState == TaskState.Effect)
                  .Where(x => !cacheSkipIds.Contains(x.Id));
-                var count = await query.CountAsync();
-                if (count == 0)
-                {
-                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
-                }
+
+                //如果是随机阅片
+
                 Random random = new Random();
                 var skipcount = 0;
-                if (count >= 2)
-                {
-                    skipcount = random.Next(0, count - 1);
-                }
 
+                var minRandomOrder = query.Where(t => t.RandomOrder != null).Select(t => t.RandomOrder).MinOrDefault();
+
+                //以随机序号优先，阅片中优先先给IR
+                if (minRandomOrder != null)
+                {
+                    query = query.Where(x => x.RandomOrder == minRandomOrder);
+                    skipcount = 0;
+                }
+                else
+                {
+                    //没有随机序号的，那么就按照阅片中最新的时间给
                     var maxReadingTime = query.MaxOrDefault(x => x.FirstReadingTime);
                     if (maxReadingTime != null)
                     {
                         query = query.Where(x => x.FirstReadingTime == maxReadingTime);
                         skipcount = 0;
                     }
+                }
+
+
+
+                var count = await query.CountAsync();
+                if (count >= 2)
+                {
+                    skipcount = random.Next(0, count - 1);
+                }
+                if (count == 0)
+                {
+                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
+                }
+
+
+
                 task = await query
                     .Select(x => new GetReadingTaskDto()
                     {
@@ -3155,6 +3178,14 @@ namespace IRaCIS.Core.Application.Service
             {
                 throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
             }
+            else
+            {
+                //触发任务随机编号
+
+                await _downloadAndUploadService.SubejctRandomReadingTaskNameDeal(task.SubjectId, task.TrialReadingCriterionId);
+
+                task.TaskBlindName = await _visitTaskRepository.Where(t => t.Id == task.VisitTaskId).Select(t => t.TaskBlindName).FirstOrDefaultAsync() ?? "";
+            }
 
             if (task.SubjectCode.IsNullOrEmpty())
             {
@@ -3271,7 +3302,7 @@ namespace IRaCIS.Core.Application.Service
             await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingCustomTagRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
             {
                 ReadingTaskState = ReadingTaskState.WaitReading
             });

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -346,7 +346,7 @@ namespace IRaCIS.Core.Application.Service
             var relatedVisitTaskIds = JsonConvert.SerializeObject(relatedVisitTaskIdList);
 
             // 这里先保存  签名的时候 会统一创建关系
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == inDto.OncologyTaskId, u => new VisitTask()
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == inDto.OncologyTaskId, u => new VisitTask()
             {
                 RelatedVisitTaskIds = relatedVisitTaskIds
             });

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -1,6 +1,8 @@
-using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
@@ -25,6 +27,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<DicomInstance> _dicomInstanceRepository,
         IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
         IRepository<ReadingClinicalData> _readingClinicalDataRepository,
+        IReadingImageTaskService _readingImageTaskService,
         IRepository<ReadingPeriodSet> _readingPeriodSetRepository,
         IRepository<ReadModule> _readModuleRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService
     {
@@ -64,7 +67,7 @@ namespace IRaCIS.Core.Application.Service
 
             var resultlist = await visitQuery.WhereIf(finalVisitNum != null && finalVisitNum != 0, x => x.VisitNum <= finalVisitNum)
                  .Where(x => x.VisitNum > mixReadVisitNum|| x.VisitNum==thisVisitNum)
-                 .Where(x => !x.IsBaseLine) // 排除基线
+                 //.Where(x => !x.IsBaseLine) // 排除基线
                  .WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() > 0)
                  .WhereIf(inDto.ReadingSetType == ReadingSetType.ImageReading, x => readModulequery.Where(y => y.Id != inDto.Id && y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() == 0)
                  .Select(x => new GetSubjectReadVisitsOutDto()
@@ -94,6 +97,29 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadModule_CRCConfirmCanNtoEdit"]);
             }
 
+            var readModule = await _readModuleRepository.Where(x => x.Id == inDto.Id).FirstNotNullAsync();
+
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == readModule.TrialReadingCriterionId).Select(x => new
+            {
+                x.ReadingType,
+                x.IsArbitrationReading,
+                x.IsReadingPeriod,
+                x.ArbitrationRule,
+                x.IsGlobalReading,
+                x.IsOncologyReading,
+            }).FirstNotNullAsync();
+
+            // 如果生成了 访视级别的阅片期裁判 不让修改
+            if (criterionInfo.IsArbitrationReading && criterionInfo.IsReadingPeriod && !criterionInfo.IsGlobalReading && criterionInfo.ArbitrationRule == ArbitrationRule.Reading)
+            {
+                if (await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == readModule.SubjectVisitId && x.ReadingCategory == ReadingCategory.Judge))
+                {
+                    //---当前阅片已生成裁判任务,操作失败。
+                    throw new BusinessValidationFailedException(_localizer["ReadModule_JudgeTaskGenerated"]);
+                }
+            }
+
+
             await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new ReadModule()
             {
                 SubjectVisitId = inDto.SubjectVisitIdId,
@@ -499,8 +525,8 @@ namespace IRaCIS.Core.Application.Service
 
             #region 方式二
 
-            var subjectVisitQuery = _subjectVisitRepository.Where(t => t.TrialId == inQuery.TrialId).Where(t => t.IsLostVisit == false)
-            .Where(sv => sv.Subject.FinalSubjectVisitId == null ? true : sv.VisitNum < sv.Subject.LatestSubjectVisit.VisitNum).Select(sv => new ReadModuleView()
+            var subjectVisitQuery = _subjectVisitRepository.Where(t => t.TrialId == inQuery.TrialId)/*.Where(t => t.IsLostVisit == false)*/
+            .Where(sv => sv.Subject.FinalSubjectVisitId == null ? true : sv.VisitNum <= sv.Subject.LatestSubjectVisit.VisitNum).Select(sv => new ReadModuleView()
             {
                 Id = sv.Id,
                 CreateTime = sv.CreateTime,
@@ -885,7 +911,7 @@ namespace IRaCIS.Core.Application.Service
             var resultlist = await visitQuery.WhereIf(finalVisitNum != 0, x => x.VisitNum <= finalVisitNum)
                  .WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() > 0)
                  .Where(x => x.VisitNum > maxReadVisitNum)
-                 .Where(x => !x.IsBaseLine) // 排除基线
+                 //.Where(x => !x.IsBaseLine) // 排除基线
                  .Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum)
                  .Select(x => new GetSubjectReadVisitsOutDto()
                  {
@@ -954,6 +980,8 @@ namespace IRaCIS.Core.Application.Service
                         && !x.IsAnalysisCreate && x.TrialReadingCriterionId == dto.TrialReadingCriterionId
 
                         ).ToListAsync();
+
+                        // 生成全局阅片任务 具体是否需要生成在_visitTaskHelpeService里面有逻辑判断
                         foreach (var taskInfo in taskListInfo)
                         {
                             await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()
@@ -974,6 +1002,13 @@ namespace IRaCIS.Core.Application.Service
                                 }
                             });
                         }
+
+                        // 生成裁判任务 是否需要生成函数里面有逻辑判断
+                        if (taskListInfo.Count() > 0)
+                        {
+                            await _readingImageTaskService.TriggerJudgeQuestion(taskListInfo[0].Id);
+                        }
+
                         break;
 
                     case ModuleTypeEnum.Oncology:
@@ -1066,6 +1101,15 @@ namespace IRaCIS.Core.Application.Service
 
             var readModule = await _readModuleRepository.Where(x => x.Id == readModuleId).FirstNotNullAsync();
 
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == readModule.TrialReadingCriterionId).Select(x => new
+            {
+                x.ReadingType,
+                x.IsArbitrationReading,
+                x.IsReadingPeriod,
+                x.ArbitrationRule,
+                x.IsGlobalReading,
+                x.IsOncologyReading,
+            }).FirstNotNullAsync();
 
             if (await _readingClinicalDataRepository.Where(t => t.ReadingId == readModuleId).AnyAsync(t => t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned))
             {
@@ -1094,6 +1138,17 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadModule_TaskGenerated"]);
             }
 
+            // 如果生成了 访视级别的阅片期裁判 不让删除
+            if (criterionInfo.IsArbitrationReading && criterionInfo.IsReadingPeriod && !criterionInfo.IsGlobalReading && criterionInfo.ArbitrationRule == ArbitrationRule.Reading)
+            {
+                if (await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == readModule.SubjectVisitId && x.ReadingCategory == ReadingCategory.Judge))
+                {
+                    //---当前阅片已生成裁判任务,操作失败。
+                    throw new BusinessValidationFailedException(_localizer["ReadModule_JudgeTaskGenerated"]);
+                }
+            }
+
+
 
             await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => readModuleId == x.SouceReadModuleId, x => new VisitTask()
             {

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
@@ -17,6 +18,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<ReadModule> _readModuleRepository,
         IRepository<VisitStage> _visitStageRepository,
         IRepository<Trial> _trialRepository,
+             IReadingImageTaskService _readingImageTaskService,
         IRepository<VisitTask> _visitTaskRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IVisitTaskHelpeService _visitTaskHelpeService,
@@ -165,6 +167,9 @@ namespace IRaCIS.Core.Application.Service
                     });
                 };
 
+                await _readModuleRepository.AddRangeAsync(readModules);
+
+                await _readModuleRepository.SaveChangesAsync();
 
                 // 判断是否要添加肿瘤学或者全局阅片任务
                 var subjectVisitIds = readModules.Select(x => x.SubjectVisitId).ToList();
@@ -201,6 +206,14 @@ namespace IRaCIS.Core.Application.Service
                                 });
                             }
                         }
+
+                        // 根据SourceSubjectVisitId 分组
+                        var visitTaskid = taskInfoList.GroupBy(x => x.SourceSubjectVisitId).Select(x => x.Max(y => y.Id)).ToList();
+                        // 生成裁判任务 是否需要生成函数里面有逻辑判断
+                        foreach (var item in visitTaskid)
+                        {
+                            await _readingImageTaskService.TriggerJudgeQuestion(item);
+                        }
                         break;
 
                     case ReadingSetType.TumorReading:
@@ -269,7 +282,7 @@ namespace IRaCIS.Core.Application.Service
                         break;
                 }
 
-                await _readModuleRepository.AddRangeAsync(readModules);
+            
 
 
 
@@ -443,13 +456,13 @@ namespace IRaCIS.Core.Application.Service
 
             List<GetReadingVisitListOutDto> result = await _visitStageRepository.Where(x => x.TrialId == inDto.TrialId)
                 .WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => globalVisitNum.Contains(x.VisitNum))
-                .Where(x => x.VisitNum > 0)// 不能是基线
+                //.Where(x => x.VisitNum > 0)// 不能是基线
                 .Where(x => x.VisitNum == thisVisitNum || x.VisitNum >= maxVisitNum).Select(x => new GetReadingVisitListOutDto()
                 {
                     VisitName = x.VisitName,
                     VisitNum = x.VisitNum,
                     VisitStageId = x.Id,
-                }).ToListAsync();
+                }).OrderBy(x=>x.VisitNum).ToListAsync();
             return result;
         }
 

IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs

@@ -729,6 +729,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 throw new BusinessValidationFailedException(_localizer["MRIPDFF_AllNeedToBeMark"]);
             }
 
+            try
+            {
+                List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement };
+                var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
+                if (measuredValueList.Any(x => x > 100))
+                {
+                    throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+                }
+            }
+            catch (Exception)
+            {
+
+                throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            }
+
             var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
 
 

IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs

@@ -828,7 +828,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             #region 计算  这里顺序非常重要 后面计算的值要依赖前面计算的结果
             var needAddList = new List<ReadingTaskQuestionAnswer>();
 
-            if (inDto.ComputationTrigger != ComputationTrigger.PatchDataStatistics)
+            List< ComputationTrigger > computationTriggers = new List<ComputationTrigger>()
+            {
+                ComputationTrigger.PatchDataStatistics,
+                ComputationTrigger.SaveEICRFQuestions,
+              
+            };
+            if (!computationTriggers.Contains(inDto.ComputationTrigger)) 
             {
                 // 计算斑块统计数据
                 await this.CalculatePatchDataStatistics(inDto);

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs

@@ -139,5 +139,16 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     }
 
 
+    public class TrialSelectUserBasicInfo
+    {
+        public Guid UserRoleId { get; set; }
 
+        public string FullName { get; set; }
+
+        public string UserName { get; set; }
+
+        public string Email { get; set; }
+
+        public string Phone { get; set; }
+    }
 }

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs

@@ -261,11 +261,18 @@ namespace IRaCIS.Application.Contracts
         #endregion
 
 
-        #region 项目术语配置
+        /// <summary>
+        /// 打开失访可读
+        /// </summary>
+        public bool IsOpenLostVistRead { get; set; } = false;
+
+
+        #region  视图模型返回 项目术语配置 ，实际数据库没有配置
         public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
+        public CollectImagesType CollectImagesEnum { get; set; }
+
         #endregion
 
-        public CollectImagesType CollectImagesEnum { get; set; }
     }
 
     public class TrialPacsInfo

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -6,6 +6,7 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
@@ -41,6 +42,7 @@ namespace IRaCIS.Core.Application
         IRepository<SystemBasicData> _systemBasicDataRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
         IRepository<Enroll> _enrollRepository,
+         IRepository<TrialQCQuestionAnswer> _qcQuestionAnswerRepository,
         IRepository<TrialStateChange> _trialStateChangeRepository,
         IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialConfigService
@@ -837,9 +839,46 @@ namespace IRaCIS.Core.Application
             {
                 await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialUrgentConfirmed = true });
             }
-            else
+            else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirmUpdate).ToString())
+            {
+                var trialConfirmTime = _trialRepository.Where(t => t.Id == signConfirmDTO.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
 
-            if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString())
+                if (trialConfirmTime != null)
+                {
+                    //删除复审中间临时数据
+                    await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.SecondReviewState == SecondReviewState.WaitAudit
+                        && t.CurrentQCEnum == CurrentQC.SecondReview && t.UpdateTime > trialConfirmTime);
+
+                }
+
+                await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = null, QCQuestionConfirmedUserId = null, IsQCQuestionConfirmed = false });
+            }
+            else if (signConfirmDTO.SignCode == ((int)SignEnum.SecondReviewConfirm).ToString())
+            {
+                var trialConfirmTime = _trialRepository.Where(t => t.Id == signConfirmDTO.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
+
+                if (trialConfirmTime != null)
+                {
+                    //删除复审中间临时数据--没重置，一直点生成复核任务
+                    await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.SecondReviewState == SecondReviewState.WaitAudit
+                    && t.CurrentQCEnum == CurrentQC.SecondReview && t.UpdateTime > trialConfirmTime);
+
+                    //删除质控中 临时保存的问题答案 （因为添加那里只会新增  和全部更新，如果不处理，那么有新增，也有更新，稽查那里也会有问题）
+                    await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.AuditState == AuditStateEnum.InPrimaryQC
+                        && t.CurrentQCEnum == CurrentQC.First);
+
+                    await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.AuditState == AuditStateEnum.InSecondaryQC
+                       && t.CurrentQCEnum == CurrentQC.Second);
+
+                    //重复二次复核签名
+                    await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.TrialId == signConfirmDTO.TrialId && t.AuditState == AuditStateEnum.QCPassed
+                    && !t.TrialQCQuestionAnswerList.Any(t => t.SecondReviewTime == trialConfirmTime), u => new SubjectVisit() { SecondReviewState = SecondReviewState.WaitAudit });
+
+
+                }
+
+            }
+            else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString())
             {
 
                 var trialConfig = (await _trialRepository
@@ -879,14 +918,14 @@ namespace IRaCIS.Core.Application
                     throw new BusinessValidationFailedException(_localizer["TrialConfig_AuditQuestionConfirmed"]);
                 }
 
-                await _trialQCQuestionRepository.UpdatePartialFromQueryAsync(t => t.TrialId == signConfirmDTO.TrialId, x => new TrialQCQuestion
+                await _trialQCQuestionRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == signConfirmDTO.TrialId, x => new TrialQCQuestion
                 {
                     IsConfirm = true
                 });
                 await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.UserRoleId, IsQCQuestionConfirmed = true });
-                await _trialRepository.SaveChangesAsync();
             }
 
+            await _trialRepository.SaveChangesAsync();
 
 
             return ResponseOutput.Ok();

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -6,9 +6,11 @@ using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
 using MassTransit.Serialization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore.Storage.Json;
+using NPOI.SS.Formula.Functions;
 using System;
 
 namespace IRaCIS.Core.Application.Service
@@ -315,7 +317,29 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+        public async Task<List<TrialSelectUserBasicInfo>> GetTrialUserRoleList(Guid trialId, Guid? subjectVisitId, UserTypeEnum? userTypeEnum)
+        {
+            var isSeconReview = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).AnyAsync(t => t.SecondReviewState == SecondReviewState.WaitAudit);
+            //复审指派需要过滤初审的人
+            var firstUserId = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => t.PreliminaryAuditUserId).FirstOrDefaultAsync();
 
+            var list = await _trialIdentityUserRepository.Where(t => t.TrialId == trialId)
+                    .SelectMany(t => t.TrialUserRoleList)
+                   .WhereIf(userTypeEnum != null, t => t.UserRole.UserTypeEnum == userTypeEnum)
+                   .Where(t => t.UserRole.Id != _userInfo.UserRoleId)//iQC 指派过滤自己
+                   .WhereIf(firstUserId != null && isSeconReview == false, t => t.UserRole.Id != firstUserId)//iQC 过滤初审的人，复核不过滤
+                   .Select(t => new TrialSelectUserBasicInfo()
+                   {
+                       FullName = t.TrialUser.IdentityUser.FullName,
+                       UserRoleId = t.UserRole.Id,
+                       UserName = t.TrialUser.IdentityUser.UserName,
+                       Phone = t.TrialUser.IdentityUser.Phone,
+                       Email = t.TrialUser.IdentityUser.EMail
+                   })
+                   .ToListAsync();
+
+            return list;
+        }
 
     }
 }

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -42,7 +42,7 @@ namespace IRaCIS.Core.Application.Service
 
             var instanceList = await _instanceRepository.Where(s => s.StudyId == scpStudyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
                         .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber }).ToListAsync();//.GroupBy(u => u.SeriesId);
+                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber,t.FileSize }).ToListAsync();//.GroupBy(u => u.SeriesId);
 
             foreach (var series in seriesList)
             {
@@ -55,6 +55,7 @@ namespace IRaCIS.Core.Application.Service
                        //HtmlPath = string.Empty,
                        Path = k.Path,
                        InstanceNumber = k.InstanceNumber,
+                       FileSize=k.FileSize,
 
                    }).ToList();
             }

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -248,7 +248,7 @@ namespace IRaCIS.Core.Application.Services
             var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()
                    .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
                    .WhereIf(isQCFinished, t => t.IsDeleted == false)
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize }).ToListAsync();
 
             foreach (var t in studyList)
             {
@@ -272,6 +272,7 @@ namespace IRaCIS.Core.Application.Services
                         InstanceNumber = k.InstanceNumber,
                         IsReading = k.IsReading,
                         IsDeleted = k.IsDeleted,
+                        FileSize = k.FileSize,
                     }).ToList();
 
                     series.InstanceCount = series.InstanceInfoList.Count();
@@ -303,7 +304,7 @@ namespace IRaCIS.Core.Application.Services
             DicomSeriesDTO series = await _dicomSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
             var instanceList = await _dicomInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
-               .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation }).ToListAsync();
+               .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
 
 
 
@@ -315,6 +316,7 @@ namespace IRaCIS.Core.Application.Services
                       HtmlPath = k.HtmlPath,
                       Path = k.Path,
                       InstanceNumber = k.InstanceNumber,
+                      FileSize = k.FileSize
 
                   }).ToList();
 
@@ -391,7 +393,7 @@ namespace IRaCIS.Core.Application.Services
             var seriesIds = ctseriesIds.Union(ptseriesIds).ToList();  //并集
 
             var instanceList = await _dicomInstanceRepository.Where(t => seriesIds.Contains(t.SeriesId))
-              .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath }).ToListAsync();
+              .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.FileSize }).ToListAsync();
 
             var studyIds = instanceList.Select(x => x.StudyId).Distinct().ToList();
 
@@ -422,7 +424,7 @@ namespace IRaCIS.Core.Application.Services
                               HtmlPath = k.HtmlPath,
                               Path = k.Path,
                               InstanceNumber = k.InstanceNumber,
-
+                              FileSize = k.FileSize
                           }).ToList();
 
 
@@ -516,7 +518,7 @@ namespace IRaCIS.Core.Application.Services
                 var studyIds = dicomStudyList.Select(t => t.StudyId).ToList();
 
                 var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId) && t.IsReading)
-                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.IsReading }).ToListAsync();
+                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.IsReading, t.FileSize }).ToListAsync();
 
                 List<DicomSeriesDTO> seriesLists = await _dicomSeriesRepository.Where(s => studyIds.Contains(s.StudyId))
                      .WhereIf(isManualGenerate == false, t => t.IsReading)
@@ -537,6 +539,7 @@ namespace IRaCIS.Core.Application.Services
                            HtmlPath = k.HtmlPath,
                            Path = k.Path,
                            InstanceNumber = k.InstanceNumber,
+                           FileSize = k.FileSize
 
                        }).ToList();
 
@@ -623,6 +626,7 @@ namespace IRaCIS.Core.Application.Services
                                       InstanceNumber = k.InstanceNumber,
                                       StudyId = k.StudyId,
                                       SeriesId = k.SeriesId,
+                                      FileSize = k.FileSize
                                   }).ToListAsync();
 
                                 item.InstanceInfoList.ForEach(x =>

IRaCIS.Core.Domain.Share/Common/SignEnum.cs

@@ -29,6 +29,13 @@ namespace IRaCIS.Core.Domain.Share
 
         TrialQCQuestionConfirm=107,
 
+
+        //重置质控问题配置
+
+        TrialQCQuestionConfirmUpdate=112,
+
+        SecondReviewConfirm = 113,
+
     }
   
 }

IRaCIS.Core.Domain.Share/QC/CheckChanllengeTypeEnum.cs

@@ -19,4 +19,14 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
+    public enum SecondReviewState
+    {
+        None = 0,
+
+        WaitAudit=1,
+
+        AuditPassed=2,
+
+        AuditFailed=3,
+    }
 }

IRaCIS.Core.Domain.Share/QC/TrialQCProcess.cs

@@ -14,7 +14,11 @@
 
         First = 1,
 
-        Second = 2
+        Second = 2,
+
+
+        //二次复核，只会一个人
+        SecondReview=3,
     }
 
 

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2903,6 +2903,11 @@ public enum PET5PSScore
         /// 保存肝脏分段
         /// </summary>
         SaveLiverSegments = 11,
+
+        /// <summary>
+        /// 保存eCRF
+        /// </summary>
+        SaveEICRFQuestions=12,
     }
 
     /// <summary>

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -288,4 +288,13 @@ public class VisitTask : BaseFullAuditEntity
 
     [Comment("退回原因")]
     public string PMBackReason { get; set; }
+
+    #region 完全随机增加字段
+
+    [Comment("完全随机阅片号")]
+    public int? RandomOrder { get; set; }
+
+
+    #endregion
+
 }

IRaCIS.Core.Domain/BaseModel/Entity.cs

@@ -108,6 +108,7 @@ public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
     [ForeignKey("CreateUserId")]
     [JsonIgnore]
     public UserRole CreateUserRole { get; set; }
+
 }
 public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
 {

IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs

@@ -8,6 +8,9 @@ public class TrialQCQuestionAnswer : BaseFullAuditEntity
     #region 导航属性
     [JsonIgnore]
     public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
+
+    [JsonIgnore]
+    public SubjectVisit SubjectVisit { get; set; }
     #endregion
     public Guid TrialId { get; set; }
 
@@ -20,4 +23,7 @@ public class TrialQCQuestionAnswer : BaseFullAuditEntity
 
     public Guid SubjectVisitId { get; set; }
     public Guid TrialQCQuestionConfigureId { get; set; }
+
+
+    public DateTime? SecondReviewTime { get; set; }
 }

IRaCIS.Core.Domain/Visit/SubjectVisit.cs

@@ -6,6 +6,8 @@ namespace IRaCIS.Core.Domain.Models;
 public class SubjectVisit : BaseFullDeleteAuditEntity
 {
     #region 导航属性
+    [JsonIgnore]
+    public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
 
     [JsonIgnore]
     public TrialSite TrialSite { get; set; }
@@ -185,7 +187,7 @@ public class SubjectVisit : BaseFullDeleteAuditEntity
     public Guid? SubmitUserId { get; set; }
     public ReadingStatusEnum ReadingStatus { get; set; }
 
-
+    public SecondReviewState SecondReviewState { get; set; }
 }
 
 [Comment("受试者访视影像回退记录表")]

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -83,7 +83,29 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
         }
 
+        /// <summary>
+        /// 翻译单位
+        /// </summary>
+        /// <param name="answerType">答案类型</param>
+        /// <param name="unit">单位</param>
+        /// <param name="customUnit">自定义单位</param>
+        /// <param name="unitDataList">单位字典</param>
+        /// <param name="answer">答案</param>
+        /// <returns></returns>
+        public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList, string? answer)
+        {
+            if (answerType == "upload")
+            {
+                return "❄❅❆❇❈❉❊";
+            }
 
+            if (unit == ValueUnit.Custom)
+            {
+                return answer + customUnit;
+            }
+
+            return answer + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
+        }
         public string GetEntityAuditOpt(EntityEntry entityEntry)
         {
             if (entityEntry.State == EntityState.Added)
@@ -176,6 +198,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         extraIdentification = oldentity.IsConfigureEmail ? "/EmailUpdate" : "/EmailSave";
                         break;
+                    case "configTrialBasicInfo/TrialConfigSignatureConfirm":
+
+                        if (entity.IsQCQuestionConfirmed == false)
+                        {
+                            extraIdentification = $"/ConfirmReset";
+                        }
+                        break;
                 }
 
 
@@ -1949,8 +1978,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     //待处理？
                     case "qcoperation/qcpassedorfailed":
 
+                        if (entity.AuditState == AuditStateEnum.QCPassed && (entity.SecondReviewState == SecondReviewState.AuditPassed || entity.SecondReviewState == SecondReviewState.AuditFailed))
+                        {
+                            extraIdentification = "/SecondReviewFinished";
+                        }
+                        else
+                        {
                             extraIdentification = "/" + (40 % (int)entity.AuditState).ToString();
 
+                        }
+
                         break;
 
                     //设置核查通过
@@ -1980,6 +2017,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                         break;
                 }
                 
+                if(_userInfo.RequestUrl== "QCOperation/addCheckChallengeReply" || _userInfo.RequestUrl == "QCOperation/UploadVisitCheckExcel")
+                {
                     if (entity.CheckChallengeState == CheckChanllengeTypeEnum.CRCWaitPMReply || entity.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply)
                     {
                         //发送对话  修改质疑状态  不需要区分接口
@@ -1987,6 +2026,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         extraIdentification = "/ModifyCheckChallengeState";
                     }
+                }
             
                 #endregion
 
@@ -2018,10 +2058,23 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomStudy)))
             {
                 var type = GetEntityAuditOpt(item);
+                var extraIdentification = string.Empty;
+
+                switch (_userInfo.RequestUrl)
+                {
+                    case "QCOperation/updateModality":
+                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator)
+                        {
+                            extraIdentification = "/2";
+                        }
+
+                        break;
+                }
 
                 await InsertInspection<DicomStudy>(item.Entity as DicomStudy, type, x => new InspectionConvertDTO()
                 {
-                    ObjectRelationParentId = x.SubjectVisitId
+                    ObjectRelationParentId = x.SubjectVisitId,
+                    ExtraIndentification = extraIdentification
                 });
             }
 
@@ -3013,6 +3066,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             QuestionId = t.Id,
                             t.DictionaryCode,
                             t.Unit,
+                            t.CustomUnit,
                             t.ShowOrder,
                             AnswerType = t.Type,
                         }).OrderBy(t => t.ShowOrder).ToListAsync();
@@ -3045,8 +3099,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             {
                                 TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id
                                 Type = t.ReadingQuestionTrial.QuestionName, //病灶类型
-                                t.ReadingQuestionTrial.Unit,
-                                t.ReadingQuestionTrial.CustomUnit,
+                                t.Unit,
+                                t.CustomUnit,
                                 t.DictionaryCode,
                                 t.QuestionName,
                                 t.QuestionEnName,
@@ -3060,7 +3114,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                                    new
                                    {
                                        //如果问题类型是附件 特殊处理 方便前端解析
-                                       Answer = u.AnswerType == "upload" ? "❄❅❆❇❈❉❊" + t.Answer : t.Answer,
+                                       Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
                                        u.QuestionName,
                                        u.QuestionEnName,
                                        u.DictionaryCode,
@@ -3091,8 +3145,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             (t, u) =>
                             new
                             {
-                                Answer = u.AnswerType == "upload" ? "❄❅❆❇❈❉❊" + t.Answer : t.Answer + unitDataList.Where(y => y.Unit == u.Unit).Select(x => x.UnitName).FirstIsNullReturnEmpty()
-                            ,
+                                Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
                                 u.DictionaryCode,
                                 u.QuestionName,
                                 u.QuestionEnName,
@@ -3152,6 +3205,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
 
                     Unit = (ValueUnit)int.Parse(x.Code),
+                    UnitName = x.Value.ToString(),
                 }).ToList();
 
                 //获取表格问题名称 组合成数组
@@ -3160,8 +3214,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
                     TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id
                     Type = t.ReadingQuestionTrial.QuestionName, //病灶类型
-                    t.ReadingQuestionTrial.Unit,
-                    t.ReadingQuestionTrial.CustomUnit,
+                    t.Unit,
+                    t.CustomUnit,
                     t.DictionaryCode,
                     t.QuestionName,
                     t.QuestionEnName,
@@ -3197,10 +3251,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 entity.RowMark = entity.OrderMark + entity.RowIndex.GetLesionMark();
 
+                string extraIdentification = string.Empty;
+
+                var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x => x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
+                if (readingQuestion.ReadingQuestionCriterionTrial.CriterionGroup == CriterionGroup.Nontumorous)
+                {
+                    extraIdentification = "/Nontumorous";
+                }
+
 
 
                 await InsertInspection<ReadingTableAnswerRowInfo>(entity, type, x => new InspectionConvertDTO()
                 {
+                    ExtraIndentification = extraIdentification,
                     VisitTaskId = x.VisitTaskId,
 
                     ObjectRelationParentId = x.VisitTaskId,
@@ -3220,7 +3283,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 new
                 {
                     //如果问题类型是附件 特殊处理 方便前端解析
-                    Answer = u.AnswerType == "upload" ? "❄❅❆❇❈❉❊" + t.Answer : t.Answer + unitDataList.Where(y => y.Unit == u.Unit).Select(x => x.UnitName).FirstIsNullReturnEmpty(),
+                    Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
                     //t.Answer        /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/,
                     u.QuestionName,
                     u.QuestionEnName,
@@ -3489,18 +3552,24 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
 
 
-                  isDistinctionInterface = false;
                     switch (_userInfo.RequestUrl)
                     {
                         //申请重阅
                         case "VisitTask/applyReReading":
+
+
                             extraIdentification = "/" + (int)entity.ReReadingApplyState;
 
                             //PM 申请重阅，区分不了是否有SPM参与
 
                             if (entity.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
                             {
-                                var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id);
+
+                                //var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id);
+
+                                var hasSPM = entitys.Where(x => x.Entity.GetType() == typeof(VisitTaskReReading))
+                                    .Select(t => t.Entity as VisitTaskReReading).Any(t => t.OriginalReReadingTaskId == entity.Id);
+
 
                                 if (!hasSPM)
                                 {
@@ -3515,6 +3584,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                         //同意重阅
                         case "VisitTask/ConfirmReReading":
 
+
                             if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
                             {
                                 extraIdentification = "/" + 1;
@@ -3536,26 +3606,34 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                             break;
 
-                    }
-
-                }
+                        case "ReadingImageTask/SubmitVisitTaskQuestions":
 
                             //访视任务-- 非Dicom 阅片
-                if (_userInfo.RequestUrl == "ReadingImageTask/SubmitVisitTaskQuestions" && entity.ReadingTaskState != ReadingTaskState.HaveSigned && type == AuditOpt.Update)
+                            if (entity.ReadingTaskState != ReadingTaskState.HaveSigned)
                             {
                                 //提交访视任务的时候 会多次更新同一个记录 只记录最后一次
                                 return;
                             }
 
-
+                            break;
 
                         //Dicom 阅片  签名
-                if (_userInfo.RequestUrl == "ReadingImageTask/SubmitDicomVisitTask")
-                {
+                        case "ReadingImageTask/SubmitDicomVisitTask":
+
                             //跳转阅片结果需要该参数
                             var subjectCode = _dbContext.Subject.Where(t => t.Id == entity.SubjectId).Select(t => t.Code).First();
 
                             obj.SubjectCode = subjectCode;
+
+                            break;
+
+                        case "ReadingImageTask/resetReadingTask":
+                            //跳转阅片结果需要该参数
+
+                            obj.IsReadingReset = true;
+
+                            break;
+
                     }
 
                     #region 裁判、肿瘤学、全局 都是通用的
@@ -3576,10 +3654,46 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                         obj.SelectResult = r1.Id == entity.JudgeResultTaskId ? "R1" : "R2";
                     }
 
-
                     #endregion
 
+                    //增加进入阅片中的稽查
 
+                    //重置阅片也会从待阅片 变为阅片中，因为复制病灶依赖这个改变
+                    if (obj.IsReadingReset != true)
+                    {
+                        if (entity.ReadingTaskState == ReadingTaskState.Reading)
+                        {
+                            if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState == ReadingTaskState.WaitReading))
+                            {
+                                isDistinctionInterface = false;
+                                extraIdentification = "/ChangeToReading";
+                            }
+                        }
+                    }
+
+
+
+                    if (entity.IsReadClinicalData == true)
+                    {
+                        if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData == false))
+                        {
+                            isDistinctionInterface = false;
+                            extraIdentification = "/ReadClinicalData";
+                        }
+                    }
+
+                    if (entity.TaskBlindName.Contains("Timepoint Ran"))
+                    {
+                        if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran")))
+                        {
+                            isDistinctionInterface = false;
+                            extraIdentification = "/TriggerSystemBlindingName";
+                        }
+                    }
+
+
+
+                }
 
 
                 #region 通过链接跳转 2022 12-19

IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs

@@ -62,6 +62,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         public string CutOffVisitName { get; set; }
 
         public string SelectResult { get; set; }
+
+        public bool? IsReadingReset { get;set; }
     }
     public class InspectionConvertDTO : DataInspection
     {

IRaCIS.Core.Infra.EFCore/Migrations/20250613024223_addRandomOrder.cs

@@ -0,0 +1,70 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addRandomOrder : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "RandomOrder",
+                table: "VisitTask",
+                type: "int",
+                nullable: true,
+                comment: "完全随机阅片号");
+
+            //migrationBuilder.CreateIndex(
+            //    name: "IX_NoneDicomStudy_TrialId",
+            //    table: "NoneDicomStudy",
+            //    column: "TrialId");
+
+            //migrationBuilder.CreateIndex(
+            //    name: "IX_ClinicalForm_ReadingId",
+            //    table: "ClinicalForm",
+            //    column: "ReadingId");
+
+            //migrationBuilder.AddForeignKey(
+            //    name: "FK_ClinicalForm_SubjectVisit_ReadingId",
+            //    table: "ClinicalForm",
+            //    column: "ReadingId",
+            //    principalTable: "SubjectVisit",
+            //    principalColumn: "Id");
+
+            //migrationBuilder.AddForeignKey(
+            //    name: "FK_NoneDicomStudy_Trial_TrialId",
+            //    table: "NoneDicomStudy",
+            //    column: "TrialId",
+            //    principalTable: "Trial",
+            //    principalColumn: "Id",
+            //    onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ClinicalForm_SubjectVisit_ReadingId",
+                table: "ClinicalForm");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_NoneDicomStudy_Trial_TrialId",
+                table: "NoneDicomStudy");
+
+            migrationBuilder.DropIndex(
+                name: "IX_NoneDicomStudy_TrialId",
+                table: "NoneDicomStudy");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ClinicalForm_ReadingId",
+                table: "ClinicalForm");
+
+            migrationBuilder.DropColumn(
+                name: "RandomOrder",
+                table: "VisitTask");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -487,6 +487,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.HasIndex("CreateUserId");
 
+                    b.HasIndex("ReadingId");
+
                     b.HasIndex("SubjectId");
 
                     b.ToTable("ClinicalForm", t =>
@@ -3287,6 +3289,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.HasIndex("SubjectVisitId");
 
+                    b.HasIndex("TrialId");
+
                     b.ToTable("NoneDicomStudy", t =>
                         {
                             t.HasComment("影像 - 非dicom检查");
@@ -14390,6 +14394,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(2000)")
                         .HasComment("既往任务Id  不包括自己");
 
+                    b.Property<int?>("RandomOrder")
+                        .HasColumnType("int")
+                        .HasComment("完全随机阅片号");
+
                     b.Property<int>("ReReadingApplyState")
                         .HasColumnType("int")
                         .HasComment("重阅状态");
@@ -14867,6 +14875,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.SubjectVisit", "SubjectVisit")
+                        .WithMany("ClinicalFormList")
+                        .HasForeignKey("ReadingId");
+
                     b.HasOne("IRaCIS.Core.Domain.Models.Subject", "Subject")
                         .WithMany("ClinicalFormList")
                         .HasForeignKey("SubjectId")
@@ -14878,6 +14890,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("CreateUserRole");
 
                     b.Navigation("Subject");
+
+                    b.Navigation("SubjectVisit");
                 });
 
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalQuestionAnswer", b =>
@@ -15467,6 +15481,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.Trial", null)
+                        .WithMany("NoneDicomStudyList")
+                        .HasForeignKey("TrialId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.Navigation("CreateUserRole");
 
                     b.Navigation("Subject");
@@ -16573,7 +16593,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .IsRequired();
 
                     b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "VisitTask")
-                        .WithMany()
+                        .WithMany("ReadingTaskQuestionMarkList")
                         .HasForeignKey("VisitTaskId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -19241,6 +19261,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                 {
                     b.Navigation("CheckChallengeDialogList");
 
+                    b.Navigation("ClinicalFormList");
+
                     b.Navigation("NoneDicomStudyList");
 
                     b.Navigation("PreviousHistoryList");
@@ -19309,6 +19331,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("EnrollList");
 
+                    b.Navigation("NoneDicomStudyList");
+
                     b.Navigation("ReadModuleList");
 
                     b.Navigation("ReadingClinicalDataList");
@@ -19436,6 +19460,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("ReadingTaskQuestionAnswerList");
 
+                    b.Navigation("ReadingTaskQuestionMarkList");
+
                     b.Navigation("TaskInfluenceList");
 
                     b.Navigation("TaskMedicalReviewList");

IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs

@@ -35,15 +35,19 @@ namespace IRaCIS.Core.Infra.EFCore
         Task<bool> UpdateAsync(TEntity entity, Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, CancellationToken cancellationToken = default);
 
-        /// <summary> EF跟踪方式 会去数据库查询完整的实体，再更新部分字段 </summary>
+        /// <summary> EF跟踪方式 会去数据库查询完整的实体，再更新部分字段 一定会产生更新sql </summary>
         Task<TEntity> UpdatePartialFromQueryAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, CancellationToken cancellationToken = default);
 
-        /// <summary> 稽查用这个 EF跟踪方式 先查询出来所有实体，再更新部分字段 </summary>
+        /// <summary> 稽查用这个 EF跟踪方式 先查询出来所有实体，再更新部分字段  一定会产生更新sql</summary>
         Task UpdatePartialFromQueryAsync(Expression<Func<TEntity, bool>> updateFilter,
             Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, bool ignoreQueryFilter = false, CancellationToken cancellationToken = default);
 
+        /// <summary> EF跟踪方式 会去数据库查询完整的实体，再更新部分字段  根据是否修改了字段ef 自动判断是否生成sql</summary>
+        Task<TEntity> UpdatePartialFromEFAutoAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
+           bool autoSave = false, CancellationToken cancellationToken = default);
+
         #endregion
 
 

IRaCIS.Core.Infra.EFCore/Repository/Repository.cs

@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.Extensions.Localization;
+using System.Reflection;
 
 namespace IRaCIS.Core.Infra.EFCore
 {
@@ -167,6 +168,36 @@ namespace IRaCIS.Core.Infra.EFCore
             return searchEntity;
         }
 
+        public async  Task<TEntity> UpdatePartialFromEFAutoAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
+         bool autoSave = false, CancellationToken cancellationToken = default)
+        {
+            var searchEntity = await _dbSet.FindAsync(id);
+
+            if (searchEntity == null)
+            {
+                throw new BusinessValidationFailedException(I18n.T("Repository_UpdateError"));
+            }
+
+            var list = ((MemberInitExpression)updateFactory.Body).Bindings.Select(mb => mb.Member.Name)
+               .Select(propName => typeof(TEntity).GetProperty(propName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)).ToList();
+
+            Func<TEntity, TEntity> func = updateFactory.Compile();
+
+            TEntity applyObj = func(searchEntity);
+
+            foreach (PropertyInfo prop in list)
+            {
+                object value = prop.GetValue(applyObj);
+                prop.SetValue(searchEntity, value);
+            }
+
+            await SaveChangesAsync(autoSave);
+
+            return searchEntity;
+        }
+
+
+
         public async Task UpdatePartialFromQueryAsync(Expression<Func<TEntity, bool>> updateFilter,
             Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, bool ignoreQueryFilter = false, CancellationToken cancellationToken = default)
@@ -191,6 +222,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
 
 
+
         /// <summary>EF跟踪方式 删除</summary>
         public async Task<bool> DeleteAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {

IRaCIS.Core.Infrastructure/_IRaCIS/_Config/_StaticData.cs

@@ -232,6 +232,10 @@ public static class StaticData
 
         public const string TrialReadingTaskList_Export = "TrialReadingTaskList_Export";
 
+        public const string TrialTaskRandomOrderList_Export = "TrialTaskRandomOrderList_Export";
+
+        
+
         public const string TrialReReadingTaskList_Export = "TrialReReadingTaskList_Export";
 
         public const string TrialMedicalReviewList_Export = "TrialMedicalReviewList_Export";