添加 CircleRadius
continuous-integration/drone/push Build is failing Details

Test_IRC_Net10
he 2026-04-14 11:28:03 +08:00
parent 1618f0454c
commit 6c34489aee
9 changed files with 22109 additions and 30 deletions

View File

@ -17212,17 +17212,17 @@
</member> </member>
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question"> <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
<summary> <summary>
质疑 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary> </summary>
</member> </member>
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency"> <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
<summary> <summary>
一致性核查 һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto"> <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
<summary> <summary>
复制 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView"> <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
@ -19056,6 +19056,11 @@
文件路径 文件路径
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.CircleRadius">
<summary>
定圆工具默认半径
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.DefaultSegmentName"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.DefaultSegmentName">
<summary> <summary>
默认SegmentName 默认SegmentName
@ -19336,6 +19341,11 @@
默认SegmentName 默认SegmentName
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.CircleRadius">
<summary>
定圆工具默认半径
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.SegmentToolList"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.SegmentToolList">
<summary> <summary>
分割工具 分割工具

View File

@ -2087,6 +2087,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsHaveKeyFile { get; set; } = false; public bool IsHaveKeyFile { get; set; } = false;
/// <summary>
/// 定圆工具默认半径
/// </summary>
public decimal? CircleRadius { get; set; }
/// <summary>
/// 默认SegmentName
/// </summary>
public DefaultSegmentNameDto DefaultSegmentName { get; set; }
} }
public class GetReadingImgInDto public class GetReadingImgInDto

View File

@ -3791,6 +3791,8 @@ namespace IRaCIS.Core.Application.Service
x.IseCRFShowInDicomReading, x.IseCRFShowInDicomReading,
x.IsReadingTaskViewInOrder, x.IsReadingTaskViewInOrder,
x.ReadingToolList, x.ReadingToolList,
x.CircleRadius,
x.DefaultSegmentName,
}).FirstNotNullAsync(); }).FirstNotNullAsync();
task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults; task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
@ -3834,6 +3836,8 @@ namespace IRaCIS.Core.Application.Service
var trialInfo = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).FirstNotNullAsync(); var trialInfo = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).FirstNotNullAsync();
// 如果已经签名 就不需要再读了 // 如果已经签名 就不需要再读了
task.CircleRadius = criterionInfo.CircleRadius;
task.DefaultSegmentName = criterionInfo.DefaultSegmentName;
task.IsNeedReadClinicalData = visitTaskInfo.ReadingTaskState == ReadingTaskState.HaveSigned ? false : task.IsNeedReadClinicalData; task.IsNeedReadClinicalData = visitTaskInfo.ReadingTaskState == ReadingTaskState.HaveSigned ? false : task.IsNeedReadClinicalData;
task.DigitPlaces = criterionInfo.DigitPlaces; task.DigitPlaces = criterionInfo.DigitPlaces;
task.CriterionType = criterionInfo.CriterionType; task.CriterionType = criterionInfo.CriterionType;

View File

@ -396,6 +396,12 @@ namespace IRaCIS.Core.Application.Contracts
} }
public class GetTrialReadingInfoOutDto public class GetTrialReadingInfoOutDto
{ {
/// <summary>
/// 定圆工具默认半径
/// </summary>
public decimal? CircleRadius { get; set; }
/// <summary> /// <summary>
/// 默认SegmentName /// 默认SegmentName
/// </summary> /// </summary>
@ -952,6 +958,11 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary> /// </summary>
public DefaultSegmentNameDto DefaultSegmentName { get; set; } = new DefaultSegmentNameDto() { }; public DefaultSegmentNameDto DefaultSegmentName { get; set; } = new DefaultSegmentNameDto() { };
/// <summary>
/// 定圆工具默认半径
/// </summary>
public decimal? CircleRadius { get; set; }
public List<string> ReadingToolList { get; set; } = new List<string>() { }; public List<string> ReadingToolList { get; set; } = new List<string>() { };
/// <summary> /// <summary>

View File

@ -632,6 +632,7 @@ namespace IRaCIS.Core.Application
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial() await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
{ {
CircleRadius = inDto.CircleRadius,
ReadingToolList = inDto.ReadingToolList, ReadingToolList = inDto.ReadingToolList,
SegmentToolList = inDto.SegmentToolList, SegmentToolList = inDto.SegmentToolList,
IsImageFilter = inDto.IsImageFilter, IsImageFilter = inDto.IsImageFilter,

View File

@ -191,6 +191,11 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
/// </summary> /// </summary>
[MaxLength] [MaxLength]
public DefaultSegmentNameDto DefaultSegmentName { get; set; } = new DefaultSegmentNameDto(); public DefaultSegmentNameDto DefaultSegmentName { get; set; } = new DefaultSegmentNameDto();
/// <summary>
/// 定圆工具默认半径
/// </summary>
public decimal? CircleRadius { get; set; }
} }

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class circleRadius : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<decimal>(
name: "CircleRadius",
table: "ReadingQuestionCriterionTrial",
type: "decimal(18,2)",
precision: 18,
scale: 2,
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CircleRadius",
table: "ReadingQuestionCriterionTrial");
}
}
}

View File

@ -6582,6 +6582,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("int") .HasColumnType("int")
.HasComment("仲裁对象"); .HasComment("仲裁对象");
b.Property<decimal?>("CircleRadius")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<DateTime>("CreateTime") b.Property<DateTime>("CreateTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -6606,6 +6610,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("int") .HasColumnType("int")
.HasComment("标准类型"); .HasComment("标准类型");
b.Property<string>("DefaultSegmentName")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("Description") b.Property<string>("Description")
.IsRequired() .IsRequired()
.HasMaxLength(400) .HasMaxLength(400)
@ -18545,35 +18553,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.OwnsOne("IRaCIS.Core.Domain.Models.DefaultSegmentNameDto", "DefaultSegmentName", b1 =>
{
b1.Property<Guid>("ReadingQuestionCriterionTrialId")
.HasColumnType("uniqueidentifier");
b1.Property<string>("SegmentNameList")
.IsRequired()
.HasColumnType("nvarchar(max)");
b1.Property<string>("SegmentationName")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b1.HasKey("ReadingQuestionCriterionTrialId");
b1.ToTable("ReadingQuestionCriterionTrial");
b1.ToJson("DefaultSegmentName");
b1.WithOwner()
.HasForeignKey("ReadingQuestionCriterionTrialId");
});
b.Navigation("CreateUserRole"); b.Navigation("CreateUserRole");
b.Navigation("DefaultSegmentName")
.IsRequired();
b.Navigation("Trial"); b.Navigation("Trial");
}); });