diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index d2c914bde..96b753b63 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1670,6 +1670,21 @@ 是否显示在Dicom阅片中 + + + 问题类型 + + + + + 问题类型 + + + + + 字典code + + 问题类型 @@ -1885,6 +1900,16 @@ 问题ID + + + 字典code + + + + + 问题类型 + + Type @@ -1995,6 +2020,16 @@ 系统标准Id + + + 问题类型 + + + + + 字典code + + 类型 @@ -2130,6 +2165,11 @@ 字典code + + + 问题类型 + + 项目标准Id @@ -2875,6 +2915,11 @@ 阅片期名称 + + + 标准ID + + 靶病灶 @@ -2895,11 +2940,6 @@ 整体疗效 - - - 标准ID - - 靶病灶 @@ -3086,6 +3126,16 @@ 分组 + + + 问题类型 + + + + + 字典code + + 系统标准Id @@ -3196,6 +3246,16 @@ 分组 + + + 问题类型 + + + + + 字典code + + 关联ID @@ -3426,6 +3486,11 @@ Id + + + 问题类型 + + 系统标准Id @@ -3451,6 +3516,11 @@ 父问题触发 + + + 字典code + + 问题名称 @@ -3531,6 +3601,16 @@ 系统标准Id + + + 问题类型 + + + + + 字典code + + 是否是裁判问题 @@ -3766,6 +3846,13 @@ + + + 获取系统器官分页信息 + + + + 新增或修改系统器官数据 @@ -7809,6 +7896,12 @@ + + + 获取疗效对照 + + + 新增修改疗效对照 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs index e446b46de..a226a5faf 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs @@ -149,7 +149,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class TableRowInfo { - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } public List TableQuestionList { get; set; } = new List(); } @@ -168,7 +168,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid QuestionId { get; set; } - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// 问题标识 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 3ded3d0be..215373252 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public bool IsShowInDicom { get; set; } = false; - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// 问题类型 @@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class VistTaskTableQuestionRowInfo { - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// 序号标记 @@ -191,9 +191,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsCurrentTask { get; set; } } + public class SplitLesionInDto + { + public Guid VisitTaskId { get; set; } + + public Guid QuestionId { get; set; } + + public decimal RowIndex { get; set; } + } + + public class GetReadingToolInDto { public Guid VisitTaskId { get; set; } + } public class GetReadingToolOutDto @@ -227,7 +238,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid QuestionId { get; set; } - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } } public class GetDicomReadingQuestionAnswerInDto @@ -239,7 +250,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class CopyTableAnswerDto { - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// 问题标识 @@ -366,7 +377,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// RowIndex /// - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// MeasureData @@ -953,7 +964,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid QuestionId { get; set; } - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// 任务Id diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index b791e0dea..fdf6cb0ca 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -110,6 +110,11 @@ namespace IRaCIS.Application.Services } + public async Task SplitLesion() + { + + } + /// /// 根据任务ID获取ReadingTool /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs index 2fbb09bc4..610797868 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs @@ -44,7 +44,7 @@ namespace IRaCIS.Core.Domain.Models /// /// RowIndex /// - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// MeasureData diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionAnswer.cs index 8357efdb4..3792037ac 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionAnswer.cs @@ -39,7 +39,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 行号 /// - public int RowIndex { get; set; } + public decimal RowIndex { get; set; } /// /// 答案