diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 2685e2710..e38083603 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -151,7 +151,6 @@ namespace IRaCIS.Core.Application.Service { x.VisitTaskId = taskInfo.Id; x.IsCurrentTaskAdd = false; - x.isf x.Id = NewId.NextGuid(); }); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 862d8f7de..d863fd555 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -387,6 +387,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public string Answer { get; set; } + public bool IsFirstChangeTask { get; set; } = false; public List CrterionDictionaryGroup { get; set; } public List Childrens = new List(); @@ -740,6 +741,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string FromMark { get; set; } = string.Empty; + /// + /// 病灶类型 + /// + public LesionType? LesionType { get; set; } + /// /// 截图地址 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 44b1008da..0cd00e6ee 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -643,6 +643,14 @@ namespace IRaCIS.Application.Services { x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup; }); + + if (taskinfo.IsConvertedTask && taskinfo.BeforeConvertedTaskId != null) + { + questions.ForEach(x => + { + x.IsFirstChangeTask =true; + }); + } } else { diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 244523aa2..86d716f30 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -97,6 +97,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() + .ForMember(d => d.LesionType, u => u.MapFrom(s => s.ReadingQuestionTrial.LesionType)) .ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder)) .ForMember(d => d.OrderMark, u => u.MapFrom(s => s.ReadingQuestionTrial.OrderMark)) .ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString()))