添加ShowChartTypeEnum
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-11-18 16:18:59 +08:00
parent 7873523c1b
commit df65d592ad
11 changed files with 21438 additions and 1 deletions

View File

@ -11320,6 +11320,11 @@
数据来源 数据来源
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.DictionaryCode"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.DictionaryCode">
<summary> <summary>
字典code 字典code
@ -11403,6 +11408,11 @@
数据来源 数据来源
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.Unit"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.Unit">
<summary> <summary>
单位 单位
@ -11841,6 +11851,11 @@
数据来源 数据来源
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.QuestionEnName">
<summary> <summary>
问题英文名称 问题英文名称
@ -11916,6 +11931,11 @@
数据来源 数据来源
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Unit"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Unit">
<summary> <summary>
单位 单位
@ -12171,6 +12191,11 @@
默认值 默认值
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ClassifyEditType"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ClassifyEditType">
<summary> <summary>
分类编辑类型 是否可编辑 分类编辑类型 是否可编辑
@ -12351,6 +12376,11 @@
数据来源 数据来源
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Unit"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Unit">
<summary> <summary>
单位 单位
@ -12711,6 +12741,11 @@
数据来源 数据来源
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ShowChartTypeEnum">
<summary>
显示图表类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Unit"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Unit">
<summary> <summary>
单位 单位

View File

@ -431,6 +431,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 数据来源 /// 数据来源
/// </summary> /// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry; public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
public Guid? Id { get; set; } public Guid? Id { get; set; }
@ -561,6 +567,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry; public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
/// <summary> /// <summary>
/// 单位 /// 单位
/// </summary> /// </summary>
@ -1241,6 +1252,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry; public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
/// <summary> /// <summary>
/// 问题英文名称 /// 问题英文名称
/// </summary> /// </summary>
@ -1352,6 +1368,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry; public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
/// <summary> /// <summary>
/// 单位 /// 单位
/// </summary> /// </summary>
@ -1817,6 +1838,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[Comment("数据来源")] [Comment("数据来源")]
public DataSources DataSource { get; set; } = DataSources.ManualEntry; public DataSources DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
[Comment("限制编辑")] [Comment("限制编辑")]
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
@ -2223,6 +2249,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry; public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
/// <summary> /// <summary>
/// 单位 /// 单位
/// </summary> /// </summary>
@ -2630,6 +2661,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry; public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
/// <summary> /// <summary>
/// 单位 /// 单位
/// </summary> /// </summary>

View File

@ -15,6 +15,11 @@ namespace IRaCIS.Core.Application.Service
//是否英文环境 //是否英文环境
var isEn_Us = false; var isEn_Us = false;
CreateMap<ReadingQuestionTrial, ReadingReportDto>();
CreateMap<ReadingTableQuestionTrial, ReadingReportDto>();
CreateMap<SystemCriterionKeyFile, SystemCriterionKeyFileView>(); CreateMap<SystemCriterionKeyFile, SystemCriterionKeyFileView>();
CreateMap<SystemCriterionKeyFile, SystemCriterionKeyFileAddOrEdit>().ReverseMap(); CreateMap<SystemCriterionKeyFile, SystemCriterionKeyFileAddOrEdit>().ReverseMap();

View File

@ -378,6 +378,23 @@ namespace IRaCIS.Core.Domain.Share
ReportResult = 2, ReportResult = 2,
} }
/// <summary>
/// 显示图表的类型
/// </summary>
public enum ShowChartType
{
/// <summary>
/// 不显示
/// </summary>
NotShow = 0,
/// <summary>
/// 柱状图
/// </summary>
BarGraph = 1,
}
/// <summary> /// <summary>
/// 数据来源 /// 数据来源
/// </summary> /// </summary>

View File

@ -176,6 +176,11 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
[Comment("数据来源")] [Comment("数据来源")]
public DataSources DataSource { get; set; } = DataSources.ManualEntry; public DataSources DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
[Comment("最大答案长度")] [Comment("最大答案长度")]
public int? MaxAnswerLength { get; set; } public int? MaxAnswerLength { get; set; }

View File

@ -238,7 +238,10 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
[Comment("数据来源")] [Comment("数据来源")]
public DataSources DataSource { get; set; } = DataSources.ManualEntry; public DataSources DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
[Comment("问题英文名称")] [Comment("问题英文名称")]
public string QuestionEnName { get; set; } = string.Empty; public string QuestionEnName { get; set; } = string.Empty;
@ -287,6 +290,8 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
/// </summary> /// </summary>
public ImageMark? ImageMarkEnum { get; set; } public ImageMark? ImageMarkEnum { get; set; }
/// <summary> /// <summary>
/// 影像工具 /// 影像工具
/// </summary> /// </summary>

View File

@ -130,6 +130,11 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
[Comment("数据来源")] [Comment("数据来源")]
public DataSources DataSource { get; set; } = DataSources.ManualEntry; public DataSources DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
[Comment("限制编辑")] [Comment("限制编辑")]
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;

View File

@ -143,6 +143,11 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
[Comment("数据来源")] [Comment("数据来源")]
public DataSources DataSource { get; set; } = DataSources.ManualEntry; public DataSources DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 显示图表类型
/// </summary>
public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
[Comment("最大答案长度")] [Comment("最大答案长度")]
public int? MaxAnswerLength { get; set; } public int? MaxAnswerLength { get; set; }

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,83 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class ShowChartType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ShowChartTypeEnum",
table: "ReadingTableQuestionTrial",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "ShowChartTypeEnum",
table: "ReadingTableQuestionSystem",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "ShowChartTypeEnum",
table: "ReadingQuestionTrial",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "ShowChartTypeEnum",
table: "ReadingQuestionSystem",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.CreateIndex(
name: "IX_TrialCriterionKeyFile_TrialCriterionId",
table: "TrialCriterionKeyFile",
column: "TrialCriterionId");
migrationBuilder.AddForeignKey(
name: "FK_TrialCriterionKeyFile_ReadingQuestionCriterionTrial_TrialCriterionId",
table: "TrialCriterionKeyFile",
column: "TrialCriterionId",
principalTable: "ReadingQuestionCriterionTrial",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_TrialCriterionKeyFile_ReadingQuestionCriterionTrial_TrialCriterionId",
table: "TrialCriterionKeyFile");
migrationBuilder.DropIndex(
name: "IX_TrialCriterionKeyFile_TrialCriterionId",
table: "TrialCriterionKeyFile");
migrationBuilder.DropColumn(
name: "ShowChartTypeEnum",
table: "ReadingTableQuestionTrial");
migrationBuilder.DropColumn(
name: "ShowChartTypeEnum",
table: "ReadingTableQuestionSystem");
migrationBuilder.DropColumn(
name: "ShowChartTypeEnum",
table: "ReadingQuestionTrial");
migrationBuilder.DropColumn(
name: "ShowChartTypeEnum",
table: "ReadingQuestionSystem");
}
}
}

View File

@ -6718,6 +6718,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("nvarchar(400)") .HasColumnType("nvarchar(400)")
.HasComment("备注"); .HasComment("备注");
b.Property<int>("ShowChartTypeEnum")
.HasColumnType("int");
b.Property<int>("ShowOrder") b.Property<int>("ShowOrder")
.HasColumnType("int") .HasColumnType("int")
.HasComment("排序"); .HasComment("排序");
@ -7028,6 +7031,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("nvarchar(400)") .HasColumnType("nvarchar(400)")
.HasComment("备注"); .HasComment("备注");
b.Property<int>("ShowChartTypeEnum")
.HasColumnType("int");
b.Property<int>("ShowOrder") b.Property<int>("ShowOrder")
.HasColumnType("int") .HasColumnType("int")
.HasComment("排序"); .HasComment("排序");
@ -7551,6 +7557,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("nvarchar(400)") .HasColumnType("nvarchar(400)")
.HasComment("备注"); .HasComment("备注");
b.Property<int>("ShowChartTypeEnum")
.HasColumnType("int");
b.Property<int>("ShowOrder") b.Property<int>("ShowOrder")
.HasColumnType("int") .HasColumnType("int")
.HasComment("排序号"); .HasComment("排序号");
@ -7781,6 +7790,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("nvarchar(400)") .HasColumnType("nvarchar(400)")
.HasComment("注释"); .HasComment("注释");
b.Property<int>("ShowChartTypeEnum")
.HasColumnType("int");
b.Property<int>("ShowOrder") b.Property<int>("ShowOrder")
.HasColumnType("int"); .HasColumnType("int");
@ -12631,6 +12643,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.HasIndex("CreateUserId"); b.HasIndex("CreateUserId");
b.HasIndex("TrialCriterionId");
b.ToTable("TrialCriterionKeyFile", t => b.ToTable("TrialCriterionKeyFile", t =>
{ {
t.HasComment("项目标准阅片关键点文件"); t.HasComment("项目标准阅片关键点文件");
@ -19503,7 +19517,15 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.HasOne("IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial", "TrialReadingCriterion")
.WithMany("KeyFileList")
.HasForeignKey("TrialCriterionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("CreateUserRole"); b.Navigation("CreateUserRole");
b.Navigation("TrialReadingCriterion");
}); });
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialDicomAE", b => modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialDicomAE", b =>
@ -20870,6 +20892,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial", b => modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial", b =>
{ {
b.Navigation("KeyFileList");
b.Navigation("TrialClinicalDataSetCriterionList"); b.Navigation("TrialClinicalDataSetCriterionList");
b.Navigation("TrialCriterionAdditionalAssessmentTypeList"); b.Navigation("TrialCriterionAdditionalAssessmentTypeList");