From 9162f6ec9917ca291124be7a2df7c151de1618fb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 27 Jul 2023 09:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/VisitTaskHelpeService.cs | 70 +------------------ .../SubjectVisitCheckPassedTrigger.cs | 47 ------------- 2 files changed, 1 insertion(+), 116 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 263f052c9..3052d46fd 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -715,36 +715,9 @@ namespace IRaCIS.Core.Application.Service _provider.Set($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30)); - #region 分配 - if (isAssignSubjectToDoctor) - { - - - 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 - { - - - } - - - } - - - } - #endregion } - else if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single) + if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single) { @@ -775,47 +748,6 @@ namespace IRaCIS.Core.Application.Service _provider.Set($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30)); - #region 分配 - - if (isAssignSubjectToDoctor) - { - - if (trialReadingCriterionConfig.TaskAllocateObjEnum == TaskAllocateObj.Subject) - { - - if (trialReadingCriterionConfig.IsFollowVisitAutoAssign) - { - - - //该Subject 之前是否有已分配的 如果改变配置 可能会出现 一个Subject 分配的同一个医生 有的在Arm1 有的在Arm2 - var allocateSubjectArmList = _visitTaskRepository.Where(t => 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) - { - //if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable).Count() < 2) - //{ - // throw new BusinessValidationFailedException("能参与读片的医生数量必须>=2,自动分配任务中止"); - - //} - - - } - } - else - { - //后续Subect 不自动分配 不处理 - } - - - - - } - - - } - #endregion } diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs index cfbe3ad5b..551e4d648 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs @@ -68,59 +68,12 @@ namespace IRaCIS.Core.Application.Triggers context.Entity.IsPMBackOrReReading = false; - //找到手动生成任务的标准 - var criterionList = await _trialReadingCriterionRepository.Where(t => t.IsAutoCreate == false && t.IsSigned == true).Select(t => new { t.Id, t.TrialId,t.IsReadingTaskViewInOrder }).ToListAsync(); - - foreach (var criterion in criterionList) - { - //if(!await _SubjectCriteriaEvaluationVisitFilterRepository.AnyAsync(t=>t.SubjectId==subjectVisit.SubjectId&& t.SubjectVisitId==subjectVisit.Id && t.TrialReadingCriterionId == criterion.Id)) - //{ - // await _SubjectCriteriaEvaluationVisitFilterRepository.AddAsync(new SubjectCriteriaEvaluationVisitFilter() { SubjectId = subjectVisit.SubjectId, SubjectVisitId = subjectVisit.Id, TrialReadingCriterionId = criterion.Id }); - //} - - - - - - - } - await _visitTaskHelpeService.GenerateVisitTaskAsync(subjectVisit.TrialId, new List() { subjectVisit.Id }, true); } } - // 触发临床数据 - //if (context.ChangeType == ChangeType.Added) - //{ - // var cRCClinicalDatas = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == context.Entity.TrialId && x.UploadRole == UploadRole.CRC && x.IsConfirm) - // .Select(x => new - // { - // x.Id, - // x.ClinicalDataLevel, - // }).ToListAsync(); - - // List readingClinicals = new List(); - // readingClinicals.AddRange( - - // cRCClinicalDatas.WhereIf(!context.Entity.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Select(x => new ReadingClinicalData() - // { - // ClinicalDataTrialSetId = x.Id, - // IsVisit = true, - // SubjectId = context.Entity.SubjectId, - // ReadingId = context.Entity.Id, - // TrialId = context.Entity.TrialId - - // }).ToList() - - // ); - - - // await _readingClinicalDataRepository.AddRangeAsync(readingClinicals); - // await _readingClinicalDataRepository.SaveChangesAsync(); - - //} }