diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 7035be90c..74828f43c 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -152,6 +152,21 @@ + + + 申请重阅 1:IR 2:PM + + + + + + + + 确认重阅与否 1同意 2 拒绝 + + + + 系统模板文档配置表 @@ -1175,6 +1190,21 @@ 标准 + + + 裁判类别 + + + + + 答案分组 + + + + + 答案组合 + + @@ -4259,7 +4289,7 @@ - + 触发裁判任务(新) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 32a64b3c0..ecc203f49 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -428,7 +428,7 @@ namespace IRaCIS.Application.Services { Id= NewId.NextGuid(), SubjectId = dto.SubjectId, - ModuleType = dto.ReadingSetType==ReadingSetType.ImageReading? ModuleTypeEnum.Read: ModuleTypeEnum.Oncology, + ModuleType = dto.ReadingSetType==ReadingSetType.ImageReading? ModuleTypeEnum.Global: ModuleTypeEnum.Oncology, IsUrgent = visit.IsUrgent, ModuleName = dto.Name, SubjectVisitId = visit.Id, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 6b1ececd7..e908266d4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -359,7 +359,7 @@ namespace IRaCIS.Application.Services Dictionary typeChange = new Dictionary(); typeChange.Add(ModuleTypeEnum.InPlanSubjectVisit, ReadingCategory.Visit); typeChange.Add(ModuleTypeEnum.OutPlanSubjectVisit, ReadingCategory.Visit); - typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod); + //typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod); typeChange.Add(ModuleTypeEnum.Global, ReadingCategory.Global); typeChange.Add(ModuleTypeEnum.Referee, ReadingCategory.Judge); typeChange.Add(ModuleTypeEnum.Oncology, ReadingCategory.Oncology); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index c78b1e6ad..064d67de5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -304,7 +304,7 @@ namespace IRaCIS.Application.Services { Id = NewId.NextGuid(), SubjectId = item.SubjectVisit.SubjectId, - ModuleType = item.ReadingPeriodSet.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Read : ModuleTypeEnum.Oncology, + ModuleType = item.ReadingPeriodSet.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Global : ModuleTypeEnum.Oncology, IsUrgent = item.SubjectVisit.IsUrgent, ModuleName = item.ReadingPeriodSet.ReadingPeriodName, SubjectVisitId = item.SubjectVisitId, diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 12792c7cf..c2f27f2cf 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -22,10 +22,10 @@ namespace IRaCIS.Core.Domain.Share /// OutPlanSubjectVisit = 1, - /// - /// 阅片期 - /// - Read = 2, + ///// + ///// 阅片期 + ///// + //Read = 2, /// /// 全局阅片