From 56ee781b2eef5ad08bbaeb590f7d4fcbe6670d44 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 25 Oct 2022 17:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskHelpeService.cs | 16 +++++++++++++--- .../Reading/ReadingPeriod/ReadModuleService.cs | 2 +- .../ReadingPeriod/ReadingPeriodSetService.cs | 3 +-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 9d2846d18..db27f8f30 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application.Service private readonly IRepository _readingJudgeInfoRepository; private readonly IRepository _taskAllocationRuleRepository; private readonly IRepository _subjectUserRepository; + private readonly IRepository _readModuleRepository; private readonly IMapper _mapper; private readonly IUserInfo _userInfo; @@ -41,11 +42,13 @@ namespace IRaCIS.Core.Application.Service public VisitTaskHelpeService(IRepository visitTaskRepository, IRepository subjectUserRepository, IRepository trialRepository, IEasyCachingProvider provider, IRepository subjectVisitRepository, + IRepository readModuleRepository, IRepository readingJudgeInfoRepository, IRepository taskAllocationRuleRepository, IMapper mapper, IUserInfo userInfo, IRepository visitTaskReReadingRepository, IRepository trialReadingCriterionRepository) { _visitTaskRepository = visitTaskRepository; _trialRepository = trialRepository; + this._readModuleRepository = readModuleRepository; _provider = provider; _subjectVisitRepository = subjectVisitRepository; this._readingJudgeInfoRepository = readingJudgeInfoRepository; @@ -813,9 +816,11 @@ namespace IRaCIS.Core.Application.Service var originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync(); + + foreach (var item in generateTaskCommand.ReadingGenerataTaskList) { - + item.VisitNum = await _readModuleRepository.Where(x => x.Id == item.ReadModuleId).Select(x => x.SubjectVisit.VisitNum).FirstOrDefaultAsync(); var task1 = await _visitTaskRepository.AddAsync(new VisitTask() { TrialId = trialId, @@ -847,12 +852,17 @@ namespace IRaCIS.Core.Application.Service originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync(); + + foreach (var item in generateTaskCommand.ReadingGenerataTaskList) { //需要 根据标准筛选 - var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed).FirstOrDefaultAsync(); + var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed&&x.TrialReadingCriterionId== originalTaskInfo.TrialReadingCriterionId).FirstOrDefaultAsync(); - var singleTask = await _visitTaskRepository.AddAsync(new VisitTask() + item.VisitNum = await _readModuleRepository.Where(x => x.Id == item.ReadModuleId).Select(x => x.SubjectVisit.VisitNum).FirstOrDefaultAsync(); + + + var singleTask = await _visitTaskRepository.AddAsync(new VisitTask() { TrialId = trialId, SubjectId = item.SubjectId, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index fee506406..5fcaf50f3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -303,7 +303,7 @@ namespace IRaCIS.Application.Services { IsUrgent = readModuleData.IsUrgent ?? false, SubjectId = readModuleData.SubjectId, - VisitNum=await _subjectVisitRepository.Where(x=>x.Id==readModuleData.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync() , + ReadingName = readModuleData.ModuleName, ReadModuleId =readModuleData.Id, ReadingCategory = ReadingCategory.Global, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs index 281b91023..9f1eaa9b5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs @@ -206,7 +206,6 @@ namespace IRaCIS.Application.Services { IsUrgent = readModule.IsUrgent??false, SubjectId = readModule.SubjectId, - VisitNum= await _subjectVisitRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync(), ReadingName = readModule.ModuleName, ReadModuleId =readModule.Id, ReadingCategory = ReadingCategory.Global, @@ -264,7 +263,7 @@ namespace IRaCIS.Application.Services { IsUrgent = readModule.IsUrgent ?? false, SubjectId = readModule.SubjectId, - VisitNum=await _visitTaskRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitTaskNum).FirstOrDefaultAsync(), + ReadingName = readModule.ModuleName, ReadModuleId =readModule.Id, ReadingCategory = ReadingCategory.Oncology,