Compare commits
No commits in common. "d04b425d628fb37527403c9c014378f82d0199ba" and "dd902c13555ab0caf82b767324e5ed3fb49ac59c" have entirely different histories.
d04b425d62
...
dd902c1355
|
@ -9784,11 +9784,6 @@
|
|||
是否公共分页
|
||||
</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>
|
||||
描述
|
||||
|
@ -9819,11 +9814,6 @@
|
|||
修约小数点
|
||||
</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报告是否显示在图像页面
|
||||
|
@ -11024,11 +11014,6 @@
|
|||
返回的对象
|
||||
</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
|
||||
|
@ -11069,11 +11054,6 @@
|
|||
返回的对象
|
||||
</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
|
||||
|
|
|
@ -755,11 +755,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
[NotDefault]
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标准分组
|
||||
/// </summary>
|
||||
public CriterionGroup CriterionGroup { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 描述
|
||||
/// </summary>
|
||||
|
@ -805,11 +800,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
{
|
||||
public Guid? Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标准分组
|
||||
/// </summary>
|
||||
public CriterionGroup CriterionGroup { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// eCRF报告是否显示在图像页面
|
||||
/// </summary>
|
||||
|
@ -2617,11 +2607,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public Guid Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标准分组
|
||||
/// </summary>
|
||||
public CriterionGroup CriterionGroup { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标准ID
|
||||
/// </summary>
|
||||
|
@ -2673,11 +2658,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public Guid Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标准分组
|
||||
/// </summary>
|
||||
public CriterionGroup CriterionGroup { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统标准ID
|
||||
/// </summary>
|
||||
|
|
|
@ -1141,7 +1141,6 @@ 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,
|
||||
});
|
||||
|
|
|
@ -664,22 +664,6 @@ namespace IRaCIS.Core.Domain.Share
|
|||
Acknowledgement = 1
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 标准分组
|
||||
/// </summary>
|
||||
public enum CriterionGroup
|
||||
{
|
||||
/// <summary>
|
||||
/// 非肿瘤
|
||||
/// </summary>
|
||||
Nontumorous = 0,
|
||||
|
||||
/// <summary>
|
||||
/// 肿瘤
|
||||
/// </summary>
|
||||
Tumor = 1,
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 标准类型
|
||||
|
|
|
@ -28,12 +28,6 @@ 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;
|
||||
|
||||
|
|
|
@ -74,11 +74,6 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
|
|||
[Comment("标准类型")]
|
||||
public CriterionType CriterionType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 标准分组
|
||||
/// </summary>
|
||||
public CriterionGroup CriterionGroup { get; set; }
|
||||
|
||||
[Comment("是否加急")]
|
||||
public bool IsUrgent { get; set; } = false;
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,40 +0,0 @@
|
|||
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");
|
||||
}
|
||||
}
|
||||
}
|
|
@ -5398,9 +5398,6 @@ 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)
|
||||
|
@ -5466,9 +5463,6 @@ 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)
|
||||
|
|
Loading…
Reference in New Issue