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

2024-07-01 14:54:15 +08:00
parent f446d400a1
commit f158f092ce
11 changed files with 308 additions and 8 deletions
@@ -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();
        }

+
+
+
    }
 }