修改附加评估提交

2023-03-23 15:06:09 +08:00
parent bd028771b6
commit c28fbf0093
11 changed files with 324 additions and 91 deletions
@@ -42,10 +42,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
        private readonly IRepository<VisitTaskReReading> _visitTaskReReadingRepository;
        private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
        private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
-        private readonly IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository;

        private readonly IRepository<ReadingClinicalData> _readingClinicalDataReposiotry;
+        private readonly IRepository<SubjectCriteriaEvaluation> _subjectCriteriaEvaluationRepository;
+        private readonly IRepository<SubjectCriteriaEvaluationVisitFilter> _subjectCriteriaEvaluationVisitFilterRepository;

+        private readonly IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository;
+        private readonly IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository;

        public VisitTaskService(IRepository<SubjectVisit> subjectVisitRepository, IRepository<VisitTask> visitTaskRepository, IRepository<Trial> trialRepository,
            IRepository<Subject> subjectRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<TaskAllocationRule> taskAllocationRuleRepository,
@@ -53,7 +56,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
             IRepository<TaskMedicalReview> taskMedicalReviewRepository,
            IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
            , IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository,
-            IRepository<ReadingClinicalData> readingClinicalDataReposiotry
+            IRepository<ReadingClinicalData> readingClinicalDataReposiotry,
+            IRepository<SubjectCriteriaEvaluation> subjectCriteriaEvaluationRepository,
+            IRepository<SubjectCriteriaEvaluationVisitFilter> subjectCriteriaEvaluationVisitFilterRepository,
+            IRepository<SubjectCriteriaEvaluationVisitStudyFilter> subjectCriteriaEvaluationVisitStudyFilterRepository
            )
        {
            _readingClinicalDataReposiotry = readingClinicalDataReposiotry;
@@ -69,6 +75,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
            _readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;

            _trialReadingCriterionRepository = trialReadingCriterionRepository;
+            _subjectCriteriaEvaluationRepository = subjectCriteriaEvaluationRepository;
+            _subjectCriteriaEvaluationVisitFilterRepository = subjectCriteriaEvaluationVisitFilterRepository;
+            _subjectCriteriaEvaluationVisitStudyFilterRepository = subjectCriteriaEvaluationVisitStudyFilterRepository;
        }

        /// <summary>
@@ -90,12 +99,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
            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)
        {
            var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm)
-              
+
                .OrderBy(t => t.ShowOrder)
-                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, IsAutoCreate=t.IsAutoCreate,IsAdditionalAssessment=t.IsAdditionalAssessment, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType, ReadingInfoSignTime = t.ReadingInfoSignTime })
+                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, IsAutoCreate = t.IsAutoCreate, IsAdditionalAssessment = t.IsAdditionalAssessment, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType, ReadingInfoSignTime = t.ReadingInfoSignTime })
                .ToListAsync();

            if (list.Count == 0)
@@ -119,11 +128,16 @@ namespace IRaCIS.Core.Application.Service.Allocation
        [HttpPost]
        public async Task<(PageOutput<SubjectAssignStat>, object?)> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
        {
+
+            var isAddtinoarlCriterion = await _trialReadingCriterionRepository.AnyAsync(t => t.Id == querySubjectAssign.TrialReadingCriterionId && t.IsAutoCreate == false);
+
            var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
                 .WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId)
                 .WhereIf(querySubjectAssign.SubjectId != null, t => t.Id == querySubjectAssign.SubjectId)
                 .WhereIf(querySubjectAssign.DoctorUserId != null, t => t.SubjectDoctorList.Any(t => t.DoctorUserId == querySubjectAssign.DoctorUserId && t.TrialReadingCriterionId == querySubjectAssign.TrialReadingCriterionId))
                 .WhereIf(!string.IsNullOrEmpty(querySubjectAssign.SubjectCode), t => t.Code.Contains(querySubjectAssign.SubjectCode))
+                 .WhereIf(isAddtinoarlCriterion, t => t.SubjectCriteriaEvaluationList.Where(t=>t.TrialReadingCriterionId==querySubjectAssign.TrialReadingCriterionId).Any(t=>t.IsJoinEvaluation))
+

                 .ProjectTo<SubjectAssignStat>(_mapper.ConfigurationProvider, new { trialReadingCriterionId = querySubjectAssign.TrialReadingCriterionId });

@@ -740,7 +754,7 @@ namespace IRaCIS.Core.Application.Service.Allocation

            var trialTaskConfig = _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialUrgentConfig>(_mapper.ConfigurationProvider).FirstOrDefault();

-            return (pageList,trialTaskConfig);
+            return (pageList, trialTaskConfig);
        }


@@ -1468,6 +1482,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                        {
                            //执行类似一致性核查回退流程
                            await VisitBackAsync(origenalTask.SourceSubjectVisitId);
+
+                            await InfluenceAddtioncalEvaluationCritrionAsync(origenalTask);
                        }
                        else
                        {
@@ -1929,6 +1945,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
                    }

                }
+
+
+
+             
            }


@@ -1959,9 +1979,9 @@ namespace IRaCIS.Core.Application.Service.Allocation

            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();

-            if (criterionConfig.IsAutoCreate==false)
+            if (criterionConfig.IsAutoCreate == false)
            {
-                return ResponseOutput.NotOk("手动生成任务的不允许影像退回");
+                return ResponseOutput.NotOk("手动生成任务的不允许在此入口影像退回");
            }

            if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned)
@@ -1970,7 +1990,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
            }


-            if( await _subjectVisitRepository.AnyAsync(t=>t.Id==task.SourceSubjectVisitId && t.CheckState!= CheckStateEnum.CVPassed))
+            if (await _subjectVisitRepository.AnyAsync(t => t.Id == task.SourceSubjectVisitId && t.CheckState != CheckStateEnum.CVPassed))
            {
                return ResponseOutput.NotOk("当前访视已回退到影像上传，不允许继续回退！");
            }
@@ -2252,11 +2272,39 @@ namespace IRaCIS.Core.Application.Service.Allocation
                return ResponseOutput.NotOk("仅PM 可以进行回退操作");
            }

+
+
+            await InfluenceAddtioncalEvaluationCritrionAsync(task);
+
+
            await _visitTaskRepository.SaveChangesAsync();

            return ResponseOutput.Ok();
        }

+
+        /// <summary>
+        ///  如果是基线退回   影响附加评估标准  是否参与评估
+        /// </summary>
+        /// <returns></returns>
+        private async Task InfluenceAddtioncalEvaluationCritrionAsync(VisitTask task)
+        {
+           
+            if (_subjectVisitRepository.Any(t => t.Id == task.SourceSubjectVisitId && t.IsBaseLine))
+            {
+                await _subjectCriteriaEvaluationRepository.UpdatePartialFromQueryAsync(t => t.TrialReadingCriterion.IsAutoCreate == false && t.SubjectId == task.SubjectId, u => new SubjectCriteriaEvaluation()
+                {
+                    IsJoinEvaluation = false
+                });
+
+                //删除筛选的访视数据
+                await _subjectCriteriaEvaluationVisitFilterRepository.BatchDeleteNoTrackingAsync(t => t.TrialReadingCriterion.IsAutoCreate == false && t.SubjectId == task.SubjectId);
+
+                //删除筛选的序列数据
+                await _subjectCriteriaEvaluationVisitStudyFilterRepository.BatchDeleteNoTrackingAsync(t => t.TrialReadingCriterion.IsAutoCreate == false && t.SubjectVisit.SubjectId == task.SubjectId);
+            }
+        }
+
        //包括临床数据签名状态
        private async Task VisitBackAsync(Guid? subjectVisitId)
        {
@@ -2512,7 +2560,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                    {
                        // 当前任务及其之后的所有访视任务  两个阅片人的

-                        // 1.后续访视不处理
                        //2.当前任务未完成，不会产生全局任务。后续任务均为访视任务，且均为待阅片，取消分配；
                        filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum);

@@ -2686,6 +2733,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
        }


+
+
        /// <summary>
        /// 获取已影响的列表
        /// </summary>