XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-03-24 11:31:36 +08:00
parent 561db9a9c9 1c2030a425
commit a04fb8394e
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -151,7 +151,6 @@ namespace IRaCIS.Core.Application.Service
{ {
x.VisitTaskId = taskInfo.Id; x.VisitTaskId = taskInfo.Id;
x.IsCurrentTaskAdd = false; x.IsCurrentTaskAdd = false;
x.isf
x.Id = NewId.NextGuid(); x.Id = NewId.NextGuid();
}); });

6
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -387,6 +387,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public string Answer { get; set; } public string Answer { get; set; }
public bool IsFirstChangeTask { get; set; } = false;
public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; } public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
public List<DicomReadingQuestionAnswer> Childrens = new List<DicomReadingQuestionAnswer>(); public List<DicomReadingQuestionAnswer> Childrens = new List<DicomReadingQuestionAnswer>();
@ -740,6 +741,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string FromMark { get; set; } = string.Empty; public string FromMark { get; set; } = string.Empty;
/// <summary>
/// 病灶类型
/// </summary>
public LesionType? LesionType { get; set; }
/// <summary> /// <summary>
/// 截图地址 /// 截图地址

8
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -643,6 +643,14 @@ namespace IRaCIS.Application.Services
{ {
x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup; x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup;
}); });
if (taskinfo.IsConvertedTask && taskinfo.BeforeConvertedTaskId != null)
{
questions.ForEach(x =>
{
x.IsFirstChangeTask =true;
});
}
} }
else else
{ {

1
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -97,6 +97,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingTableAnswerRowInfo, GetTableAnswerRowInfoOutDto>() CreateMap<ReadingTableAnswerRowInfo, GetTableAnswerRowInfoOutDto>()
.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.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder))
.ForMember(d => d.OrderMark, u => u.MapFrom(s => s.ReadingQuestionTrial.OrderMark)) .ForMember(d => d.OrderMark, u => u.MapFrom(s => s.ReadingQuestionTrial.OrderMark))
.ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString())) .ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString()))