From 14194bbb008a54aed498b829c8ec68792f04ba7f Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 27 Jun 2022 10:12:47 +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 --- .../IRaCIS.Core.Application.xml | 5 +++++ .../Allocation/VisitTaskHelpeService.cs | 2 +- .../Reading/ReadingClinicalDataService.cs | 1 - .../Reading/ReadingImageTaskService.cs | 22 +++++++++---------- .../Allocation/AllocationRelation.cs | 4 ++-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index dc40774ec..98aaa48ee 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1050,6 +1050,11 @@ 上传方式 + + + 上传角色 + + 模板文件名称 diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 709c5cbef..7420d172d 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -384,7 +384,7 @@ namespace IRaCIS.Core.Application.Service }); break; - case ReadingCategory.ReadingPeriod: + //case ReadingCategory.ReadingPeriod: case ReadingCategory.Global: if (trialConfig.ReadingType == ReadingMethod.Double) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index 9d9365ff1..eff07d4e0 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -218,7 +218,6 @@ namespace IRaCIS.Application.Services if (userTypes.Contains(_userInfo.UserTypeEnumInt)) { inDto.UploadRole = UploadRole.PM; - } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index d3ced3580..043c729f3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -516,13 +516,13 @@ namespace IRaCIS.Application.Services { // ****** 先生成阅片期 阅片期任务阅片完成之后生成肿瘤学的 如果没有阅片期 直接生成肿瘤学 *********//// #region 建立关系 - Dictionary typeChange = new Dictionary(); - typeChange.Add(ModuleTypeEnum.InPlanSubjectVisit, ReadingCategory.Visit); - typeChange.Add(ModuleTypeEnum.OutPlanSubjectVisit, ReadingCategory.Visit); + Dictionary typeChangeDic = new Dictionary(); + typeChangeDic.Add(ModuleTypeEnum.InPlanSubjectVisit, ReadingCategory.Visit); + typeChangeDic.Add(ModuleTypeEnum.OutPlanSubjectVisit, ReadingCategory.Visit); //typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod); - typeChange.Add(ModuleTypeEnum.Global, ReadingCategory.Global); - typeChange.Add(ModuleTypeEnum.Referee, ReadingCategory.Judge); - typeChange.Add(ModuleTypeEnum.Oncology, ReadingCategory.Oncology); + typeChangeDic.Add(ModuleTypeEnum.Global, ReadingCategory.Global); + typeChangeDic.Add(ModuleTypeEnum.Referee, ReadingCategory.Judge); + typeChangeDic.Add(ModuleTypeEnum.Oncology, ReadingCategory.Oncology); #endregion var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync(); List needReadList = new List(); @@ -539,9 +539,9 @@ namespace IRaCIS.Application.Services SubjectId = x.SubjectId, ReadingName = x.ModuleName, ReadModuleId = x.Id, - ReadingCategory = typeChange[x.ModuleType], + ReadingCategory = typeChangeDic[x.ModuleType], }).ToListAsync(); - if (needReadList.Any(x => x.ReadingCategory == ReadingCategory.ReadingPeriod)) + if (needReadList.Any(x => x.ReadingCategory == ReadingCategory.Global)) { needReadList = needReadList.Where(x => x.ReadingCategory != ReadingCategory.Oncology).ToList(); } @@ -549,13 +549,13 @@ namespace IRaCIS.Application.Services await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand() { - ReadingCategory = ReadingCategory.ReadingPeriod, + ReadingCategory = ReadingCategory.Global, TrialId = taskInfo.TrialId, ReadingGenerataTaskList = needReadList }) ; break; // 肿瘤学 - case ReadingCategory.ReadingPeriod: + case ReadingCategory.Global: var subjectId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync(); needReadList=await _readModuleRepository.Where(x => x.SubjectVisitId == subjectId&&x.ModuleType==ModuleTypeEnum.Oncology) .Select(x => new ReadingGenerataTaskDTO @@ -564,7 +564,7 @@ namespace IRaCIS.Application.Services SubjectId = x.SubjectId, ReadingName = x.ModuleName, ReadModuleId = x.Id, - ReadingCategory = typeChange[x.ModuleType], + ReadingCategory = typeChangeDic[x.ModuleType], }).ToListAsync(); needReadList = needReadList.Where(x => _visitTaskRepository.Where(y => y.SouceReadModuleId == x.ReadModuleId).Count() == 0).ToList(); await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand() diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs index 9eda82931..507cb8d61 100644 --- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs +++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs @@ -7,8 +7,8 @@ namespace IRaCIS.Core.Domain.Share //访视 Visit = 1, - //阅片周期 - ReadingPeriod = 2, + ////阅片周期 + //ReadingPeriod = 2, //全局 Global = 3,