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

修改

Uat_IRC_Net8
he 2025-01-13 14:56:14 +08:00
parent 7544bc81a3
commit c1fdf67d39
9 changed files with 18658 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9784,6 +9784,11 @@
是否公共分页
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.CriterionGroup">
<summary>
标准分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.Description">
<summary>
描述
@ -9814,6 +9819,11 @@
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionGroup">
<summary>
标准分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.IseCRFShowInDicomReading">
<summary>
eCRF报告是否显示在图像页面
@ -11014,6 +11024,11 @@
返回的对象
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemView.CriterionGroup">
<summary>
标准分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemView.CriterionId">
<summary>
标准ID
@ -11054,6 +11069,11 @@
返回的对象
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.CriterionGroup">
<summary>
标准分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.ReadingQuestionCriterionSystemId">
<summary>
系统标准ID

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

@ -755,6 +755,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[NotDefault]
public Guid TrialId { get; set; }
/// <summary>
/// 标准分组
/// </summary>
public CriterionGroup CriterionGroup { get; set; }
/// <summary>
/// 描述
/// </summary>
@ -800,6 +805,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public Guid? Id { get; set; }
/// <summary>
/// 标准分组
/// </summary>
public CriterionGroup CriterionGroup { get; set; }
/// <summary>
/// eCRF报告是否显示在图像页面
/// </summary>
@ -2607,6 +2617,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid Id { get; set; }
/// <summary>
/// 标准分组
/// </summary>
public CriterionGroup CriterionGroup { get; set; }
/// <summary>
/// 标准ID
/// </summary>
@ -2658,6 +2673,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid Id { get; set; }
/// <summary>
/// 标准分组
/// </summary>
public CriterionGroup CriterionGroup { get; set; }
/// <summary>
/// 系统标准ID
/// </summary>

1
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -1141,6 +1141,7 @@ namespace IRaCIS.Core.Application.Service
SynchronizeTime = DateTime.Now,
IsMustGlobalReading = systemCriterion.IsMustGlobalReading,
IseCRFShowInDicomReading = systemCriterion.IseCRFShowInDicomReading,
CriterionGroup = systemCriterion.CriterionGroup,
IsGlobalReading = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsGlobalReading,
IsReadingPeriod = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsReadingPeriod,
});

16
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -665,6 +665,22 @@ namespace IRaCIS.Core.Domain.Share
Acknowledgement = 1
}
/// <summary>
/// 标准分组
/// </summary>
public enum CriterionGroup
{
/// <summary>
/// 非肿瘤
/// </summary>
Nontumorous = 0,
/// <summary>
/// 肿瘤
/// </summary>
Tumor = 1,
}
/// <summary>
/// 标准类型

6
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs
View File

@ -28,6 +28,12 @@ public class ReadingQuestionCriterionSystem : BaseAddAuditEntity
public string Description { get; set; } = string.Empty;
[Comment("标准类型")]
public CriterionType CriterionType { get; set; }
/// <summary>
/// 标准分组
/// </summary>
public CriterionGroup CriterionGroup { get; set; }
[Comment("肿瘤学阅片")]
public bool IsOncologyReading { get; set; } = false;

5
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -74,6 +74,11 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
[Comment("标准类型")]
public CriterionType CriterionType { get; set; }
/// <summary>
/// 标准分组
/// </summary>
public CriterionGroup CriterionGroup { get; set; }
[Comment("是否加急")]
public bool IsUrgent { get; set; } = false;

18544
IRaCIS.Core.Infra.EFCore/Migrations/20250113065326_CriterionGroup.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

40
IRaCIS.Core.Infra.EFCore/Migrations/20250113065326_CriterionGroup.cs Normal file
View File

@ -0,0 +1,40 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class CriterionGroup : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "CriterionGroup",
table: "ReadingQuestionCriterionTrial",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "CriterionGroup",
table: "ReadingQuestionCriterionSystem",
type: "int",
nullable: false,
defaultValue: 0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CriterionGroup",
table: "ReadingQuestionCriterionTrial");
migrationBuilder.DropColumn(
name: "CriterionGroup",
table: "ReadingQuestionCriterionSystem");
}
}
}

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

@ -5398,6 +5398,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<int>("CriterionGroup")
.HasColumnType("int");
b.Property<string>("CriterionName")
.IsRequired()
.HasMaxLength(400)
@ -5463,6 +5466,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<int>("CriterionGroup")
.HasColumnType("int");
b.Property<string>("CriterionModalitys")
.IsRequired()
.HasMaxLength(400)