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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-11-04 18:02:28 +08:00
parent 9cbd1faf93 3354aa37f4
commit 506955ca7c
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2499,7 +2499,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 是否显示
/// </summary>
public int ShowQuestion { get; set; }
public ShowQuestion ShowQuestion { get; set; }
/// <summary>
/// 最大问题数
@ -2666,7 +2666,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
public ShowQuestion ShowQuestion { get; set; }
/// <summary>
/// 最大问题数

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

@ -438,7 +438,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Remark { get; set; }
public Guid? RelevanceId { get; set; }
public string RelevanceValue { get; set; } = string.Empty;
public int ShowQuestion { get; set; }
public ShowQuestion ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
public string DataTableName { get; set; } = string.Empty;
public string DataTableColumn { get; set; } = string.Empty;
@ -577,7 +577,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Remark { get; set; }
public Guid? RelevanceId { get; set; }
public string RelevanceValue { get; set; } = string.Empty;
public int ShowQuestion { get; set; }
public ShowQuestion ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
public string DataTableName { get; set; } = string.Empty;
public string DataTableColumn { get; set; } = string.Empty;
@ -1707,7 +1707,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string RelevanceValue { get; set; } = string.Empty;
[Comment("是否显示")]
public int ShowQuestion { get; set; }
public ShowQuestion ShowQuestion { get; set; }
[Comment("最大问题数")]
public int? MaxRowCount { get; set; }

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs
View File

@ -284,6 +284,7 @@ namespace IRaCIS.Core.Application.Service
RelevanceValue = x.RelevanceValue,
ImageCount = 0,
ParentId = item.Id,
ShowQuestion=x.ShowQuestion,
DataTableColumn = x.DataTableColumn,
LesionType = item.LesionType,
QuestionName = x.QuestionName,
@ -298,6 +299,7 @@ namespace IRaCIS.Core.Application.Service
Id = x.Id,
DictionaryCode = x.DictionaryCode,
Type = x.Type,
ShowQuestion = x.ShowQuestion,
TableQuestionType = x.TableQuestionType,
DependParentId = x.DependParentId,
IsDepend = x.IsDepend,

2
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
View File

@ -87,7 +87,7 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
public string RelevanceValue { get; set; } = string.Empty;
[Comment("是否显示")]
public int ShowQuestion { get; set; }
public ShowQuestion ShowQuestion { get; set; }
[Comment("最大问题数")]
public int? MaxRowCount { get; set; }

2
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
View File

@ -90,7 +90,7 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
public string RelevanceValue { get; set; } = string.Empty;
public int ShowQuestion { get; set; }
public ShowQuestion ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
[Comment("图片数量")]