修改一致性分析 以及项目部位编辑

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

@@ -154,7 +154,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
 
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.Id == inCommand.TaskConsistentRuleId);
+            var filterObj = await _taskConsistentRuleRepository.Where(t => t.Id == inCommand.TaskConsistentRuleId).Include(t=>t.TrialReadingCriterion).FirstOrDefaultAsync();
             var doctorUserId = inCommand.DoctorUserId;
             var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
 
@@ -174,7 +174,7 @@ namespace IRaCIS.Core.Application.Service
                     throw new BusinessValidationFailedException(_localizer["TaskConsistent_NotAllowedGenerate1"]);
                 }
 
-                inCommand.SubejctIdList = GetRandomSubjectIdList(subjectList.Select(t => t.SubjectId).ToList(), filterObj.PlanSubjectCount);
+                inCommand.SubejctIdList = subjectList.Select(t => t.SubjectId).ToList().GetRandomCountList(filterObj.PlanSubjectCount);
             }
 
             var list = await GetIQueryableDoctorSelfConsistentSubjectView(filterObj, doctorUserId, inCommand.SubejctIdList).ToListAsync();
@@ -212,7 +212,18 @@ namespace IRaCIS.Core.Application.Service
                         blindSubjectCode = filterObj.BlindTrialSiteCode + (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
                     }
 
-                    subject.VisitTaskList = subject.VisitTaskList.Take(filterObj.PlanVisitCount).ToList();
+                    //有序阅片
+                    if (filterObj.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
+                    {
+                        subject.VisitTaskList = subject.VisitTaskList.Take(filterObj.PlanVisitCount).ToList();
+
+                    }
+                    else
+                    {
+                        //完全随机 和受试者随机，都是随机挑选访视
+                        subject.VisitTaskList = subject.VisitTaskList.GetRandomCountList(filterObj.PlanVisitCount);
+                    }
+
 
                     subject.VisitTaskList.ForEach(t =>
                     {
@@ -325,10 +336,12 @@ namespace IRaCIS.Core.Application.Service
         {
             var trialId = inCommand.TrialId;
 
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.IsSelfAnalysis == false);
+            var filterObj = await _taskConsistentRuleRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.IsSelfAnalysis == false).Include(t=>t.TrialReadingCriterion).FirstNotNullAsync();
 
             var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
 
+       
+
             //随机分配
             if (inCommand.IsAutoAllocateGenerateTask)
             {
@@ -345,7 +358,7 @@ namespace IRaCIS.Core.Application.Service
                     throw new BusinessValidationFailedException(_localizer["TaskConsistent_NotAllowedGenerate1"]);
                 }
 
-                inCommand.SubejctIdList = GetRandomSubjectIdList(subjectSelectList.Select(t => t.SubjectId).ToList(), filterObj.PlanSubjectCount);
+                inCommand.SubejctIdList = subjectSelectList.Select(t => t.SubjectId).ToList().GetRandomCountList(filterObj.PlanSubjectCount) ;
             }
 
 
@@ -415,6 +428,11 @@ namespace IRaCIS.Core.Application.Service
                     foreach (var needAddDoctorUserId in needAddDoctorUserIdList)
                     {
 
+                        //if(filterObj.TrialReadingCriterion.IsReadingTaskViewInOrder== ReadingOrder.InOrder)
+                        //{
+
+                        //}
+
                         //每个医生 都生成处理的任务
                         foreach (var task in subject.SubjectTaskVisitList.Take(filterObj.PlanVisitCount))
                         {
@@ -995,5 +1013,8 @@ namespace IRaCIS.Core.Application.Service
             //return matchSubjectIdList.OrderBy(g => random.Next()).Take(countToSelect).ToList();
         }
 
+
+
+
     }
 }

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

@@ -1411,6 +1411,18 @@ namespace IRaCIS.Core.Application.Service
                     break;
                 case GenerateTaskCategory.SelfConsistent:
 
+                    var readingCriterionId = generateTaskCommand.GenerataConsistentTaskList.First().TrialReadingCriterionId;
+                    //var trialReadingCriterion=_trialReadingCriterionRepository.Where(t=>t.Id== trialReadingCriterionId).FirstOrDefault();
+
+                    //判断是否存在传输方式为Pdf得临床数据
+
+                    var exsitPDF = await _trialClinicalDataSetRepository.AnyAsync(t => t.TrialId == trialId &&
+                    t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == readingCriterionId)
+                    && t.ClinicalUploadType == ClinicalUploadType.PDF);
+
+                    var taskState = exsitPDF ? TaskState.NotEffect : TaskState.Effect;
+
+
                     foreach (var task in generateTaskCommand.GenerataConsistentTaskList)
                     {
                         var consistentTask = new VisitTask()
@@ -1424,7 +1436,7 @@ namespace IRaCIS.Core.Application.Service
                             VisitTaskNum = task.VisitTaskNum,
                             ReadingCategory = task.ReadingCategory,
 
-                            TaskState = TaskState.Effect,
+                            TaskState = taskState,
                             Code = currentMaxCodeInt + 1,
                             TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
 

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

@@ -1106,6 +1106,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         [NotDefault]
         public Guid TrialId { get; set; }
+
+
+        public bool IsHandAdd { get; set; } = true;
     }
 
     public class TrialBodyPartView
@@ -1114,5 +1117,9 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         public string Name { get; set; }
+
+        public Guid Id { get; set; }
+
+        public bool IsHandAdd { get; set; }
     }
 }

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

@@ -1318,7 +1318,7 @@ namespace IRaCIS.Core.Application
 
         public async Task<IResponseOutput<List<TrialBodyPartView>>> GetTrialBodyPartList(Guid trialId)
         {
-            var list = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialBodyPartList).Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN }).ToListAsync();
+            var list = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialBodyPartList).Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN ,Id=t.Id,IsHandAdd=t.IsHandAdd}).ToListAsync();
 
             return ResponseOutput.Ok(list);
         }