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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-06-24 13:43:29 +08:00
parent 814f27244a e53531636d
commit b030959b64
11 changed files with 19968 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -7149,6 +7149,11 @@
自定义计算问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.DefaultValue">
<summary>
默认值
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionQueryBase">
<summary>
查询临床数据基类
@ -7284,6 +7289,11 @@
关联Value
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalTableQuestionBase.DefaultValue">
<summary>
默认值
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalTableQuestionDto">
<summary>
项目临床数据问题

10
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
View File

@ -276,6 +276,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
/// <summary>
/// 默认值
/// </summary>
public string DefaultValue { get; set; } = string.Empty;
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
@ -474,6 +480,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
}
}
/// <summary>
/// 默认值
/// </summary>
public string DefaultValue { get; set; } = string.Empty;
public List<string> RelevanceValueList { get; set; } = new List<string>();
}

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

@ -812,6 +812,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public ReadingVersion? ReadingVersionEnum { get; set; }
public ReadingTool? ReadingTool { get; set; }
/// <summary>
/// 阅片工具
/// </summary>
public List<string> ReadingToolList { get; set; } = new List<string>();
}

6
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
View File

@ -393,6 +393,12 @@ namespace IRaCIS.Core.Application.Service.RC
indto.ReadingVersionEnum=(ReadingVersion)maxDic;
}
indto.ReadingTool = ReadingTool.Dicom;
indto.ReadingToolList = new List<string>()
{
"Length", "Bidirectional", "RectangleROI", "ArrowAnnotate", "CircleROI"
};
var entity = await _readingQuestionCriterionTrialRepository.InsertOrUpdateAsync(indto, true);
return ResponseOutput.Ok(entity.Id.ToString());
}

3
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
View File

@ -100,4 +100,7 @@ public class SystemClinicalQuestion : BaseAddAuditEntity
[Comment("自定义计算问题")]
[MaxLength]
public string CalculateQuestions { get; set; } = "[]";
[Comment("默认值")]
public string DefaultValue { get; set; } = string.Empty;
}

3
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs
View File

@ -72,4 +72,7 @@ public class SystemClinicalTableQuestion : BaseAddAuditEntity
[Comment("关联Value")]
public string RelevanceValue { get; set; } = string.Empty;
[Comment("默认值")]
public string DefaultValue { get; set; } = string.Empty;
}

3
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
View File

@ -106,4 +106,7 @@ public class TrialClinicalQuestion : BaseAddAuditEntity
[Comment("单位")]
public string Unit { get; set; } = string.Empty;
[Comment("默认值")]
public string DefaultValue { get; set; } = string.Empty;
}

3
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs
View File

@ -84,4 +84,7 @@ public class TrialClinicalTableQuestion : BaseAddAuditEntity
[Comment("关联Value")]
public string RelevanceValue { get; set; } = string.Empty;
[Comment("默认值")]
public string DefaultValue { get; set; } = string.Empty;
}

19784
IRaCIS.Core.Infra.EFCore/Migrations/20250624032534_defaultvalue.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

114
IRaCIS.Core.Infra.EFCore/Migrations/20250624032534_defaultvalue.cs Normal file
View File

@ -0,0 +1,114 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class defaultvalue : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "DefaultValue",
table: "TrialClinicalTableQuestion",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "",
comment: "默认值");
migrationBuilder.AddColumn<string>(
name: "DefaultValue",
table: "TrialClinicalQuestion",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "",
comment: "默认值");
migrationBuilder.AddColumn<string>(
name: "DefaultValue",
table: "SystemClinicalTableQuestion",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "",
comment: "默认值");
migrationBuilder.AddColumn<string>(
name: "DefaultValue",
table: "SystemClinicalQuestion",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "",
comment: "默认值");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_ReadingTaskQuestionMark_ReadingQuestionTrial_QuestionId",
table: "ReadingTaskQuestionMark");
migrationBuilder.DropColumn(
name: "DefaultValue",
table: "TrialClinicalTableQuestion");
migrationBuilder.DropColumn(
name: "DefaultValue",
table: "TrialClinicalQuestion");
migrationBuilder.DropColumn(
name: "DefaultValue",
table: "SystemClinicalTableQuestion");
migrationBuilder.DropColumn(
name: "DefaultValue",
table: "SystemClinicalQuestion");
migrationBuilder.AlterColumn<Guid>(
name: "TrialReadingCriterionId",
table: "TrialEmailNoticeConfig",
type: "uniqueidentifier",
nullable: true,
oldClrType: typeof(Guid),
oldType: "uniqueidentifier",
oldNullable: true,
oldComment: "下次版本删除");
migrationBuilder.AlterColumn<Guid>(
name: "QuestionId",
table: "ReadingTaskQuestionMark",
type: "uniqueidentifier",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
oldClrType: typeof(Guid),
oldType: "uniqueidentifier",
oldNullable: true);
migrationBuilder.AddColumn<int>(
name: "CriterionTypeEnum",
table: "EmailNoticeConfig",
type: "int",
nullable: true,
comment: "标准枚举--后续废弃，这里可以选择多个标准");
migrationBuilder.AddForeignKey(
name: "FK_ReadingTaskQuestionMark_ReadingQuestionTrial_QuestionId",
table: "ReadingTaskQuestionMark",
column: "QuestionId",
principalTable: "ReadingQuestionTrial",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}

24
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -9395,6 +9395,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("int")
.HasComment("自定义计算标记");
b.Property<string>("DefaultValue")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("默认值");
b.Property<string>("DictionaryCode")
.IsRequired()
.HasMaxLength(400)
@ -9514,6 +9520,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<string>("DefaultValue")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("默认值");
b.Property<string>("DictionaryCode")
.IsRequired()
.HasMaxLength(400)
@ -11281,6 +11293,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("int")
.HasComment("自定义计算标记");
b.Property<string>("DefaultValue")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("默认值");
b.Property<string>("DictionaryCode")
.IsRequired()
.HasMaxLength(400)
@ -11415,6 +11433,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<string>("DefaultValue")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("默认值");
b.Property<string>("DictionaryCode")
.IsRequired()
.HasMaxLength(400)