修改

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

@@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class ReadingGenerataTaskDTO
     {
-        public Guid Id { get; set; }
+        public Guid ReadModuleId { get; set; }
 
         public Guid SubjectId { get; set; }
 

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

@@ -22,16 +22,19 @@ namespace IRaCIS.Core.Application.Services
 
         private readonly IRepository<TrialDocument> _trialDocumentRepository;
         private readonly IRepository<TrialDocUserTypeConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
+        private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
 
         public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
              IRepository<TrialDocUserTypeConfirmedUser> trialDocUserTypeConfirmedUserRepository,
+                  IRepository<Trial> trialRepository,
             IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository
             , IRepository<SystemDocument> systemDocumentRepository)
         {
             _trialDocumentRepository = trialDocumentRepository;
             this._trialDocUserTypeConfirmedUserRepository = trialDocUserTypeConfirmedUserRepository;
+            this._trialRepository = trialRepository;
             this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository;
             _systemDocumentRepository = systemDocumentRepository;
         }
@@ -209,8 +212,10 @@ namespace IRaCIS.Core.Application.Services
                       .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                       .CountAsync();
 
+            var trialTaskConfig = _trialRepository.Where(t => t.Id == querySystemDocument.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
 
-            return (result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr= trialInfo.TrialStatusStr });
+
+            return (result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr= trialInfo.TrialStatusStr,TrialConfig= trialTaskConfig });
         }
 
 

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

@@ -331,16 +331,27 @@ namespace IRaCIS.Application.Services
 
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == VisitTaskId).FirstOrDefaultAsync();
-            if (taskInfo.ReadingCategory == ReadingCategory.Visit)
+
+            // 任务类型
+            switch (taskInfo.ReadingCategory)
             {
-                if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
+                case ReadingCategory.Visit:
-                {
+                    //if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
-                    var needReadList = await _readModuleRepository.Where(x => x.SubjectVisitId == taskInfo.SourceSubjectVisitId).ToListAsync();
+                    //{
-
+                    //    var needReadList = await _readModuleRepository.Where(x => x.SubjectVisitId == taskInfo.SourceSubjectVisitId)
+                    //        .Select(x=> new ReadingGenerataTaskDTO { 
+                    //        IsUrgent=x.IsUrgent,
+                    //        SubjectId=x.SubjectId,
+                    //        ReadingName=
+                    //        }).ToListAsync();
+                    //    if()
 
 
+                    //}
+                    break;
             }
-            }
+
+          
         }
 
         /// <summary>

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

@@ -146,6 +146,44 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
+    }
+
+    public class TrialBasicConfigView : TrialTaskConfigView
+    {
+        /// <summary>
+        /// QC流程  0 不审，1 单审，2双审  
+        /// </summary>
+        public TrialQCProcess QCProcessEnum { get; set; }
+
+        /// <summary>
+        /// 影像一致性核查
+        /// </summary>
+        public bool IsImageConsistencyVerification { get; set; } = false;
+
+        /// <summary>
+        /// 流程是否确认
+        /// </summary>
+        public bool IsTrialProcessConfirmed { get; set; } = false;
+
+       
+
+        //阅片方式
+        public int ReadingMode { get; set; }
+
+        //阅片类型 
+        public int ReadingType { get; set; }
+
+
+        public bool IsGlobalReading { get; set; } = true;
+
+        public bool? IsArbitrationReading { get; set; }
+
+        public bool? IsClinicalReading { get; set; }
+
+
+        public int ArbitrationRule { get; set; }
+
+     
     }
 
     public class TrialTaskConfigView : TrialTaskConfig

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

@@ -216,7 +216,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialExternalUserConfirm, TrialSiteUserSurvey>();
 
 
-
+            CreateMap<Trial, TrialBasicConfigView>();
 
 
             CreateMap<Trial, TrialUserExportDTO>()