Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -11680,6 +11680,11 @@
             影像标记
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ImageMarkTypeEnum">
+            <summary>
+            影像标记类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.IsPreinstall">
             <summary>
             是否预设
@@ -13026,6 +13031,11 @@
             影像标记
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ImageMarkTypeEnum">
+            <summary>
+            影像标记类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ImageTool">
             <summary>
             影像工具
@@ -16979,17 +16989,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            质疑
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            一致性核查
+            һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            复制
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
@@ -18808,6 +18818,11 @@
             阅片工具
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.SegmentToolList">
+            <summary>
+            分割工具
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialId">
             <summary>
             项目ID
@@ -19068,6 +19083,11 @@
             表单类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.SegmentToolList">
+            <summary>
+            分割工具
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.TrialReadingCriterionId">
             <summary>
             项目标准ID

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -324,6 +324,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ImageMark? ImageMarkEnum { get; set; }
 
+        /// <summary>
+        /// 影像标记类型
+        /// </summary>
+        public ImageMarkType? ImageMarkTypeEnum { get; set; }
+
 
         /// <summary>
         /// 是否预设
@@ -2463,6 +2468,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ImageMark? ImageMarkEnum { get; set; }
 
+        /// <summary>
+        /// 影像标记类型
+        /// </summary>
+        public ImageMarkType? ImageMarkTypeEnum { get; set; }
+
         /// <summary>
         /// 影像工具
         /// </summary>

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -405,6 +405,12 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public List<string> ReadingToolList { get; set; }
 
+        /// <summary>
+        /// 分割工具
+        /// </summary>
+        public List<string> SegmentToolList { get; set; } = new List<string>();
+
+
         public string TrialModalitys { get; set; }
 
         public bool IsImageFilter { get; set; }
@@ -937,6 +943,11 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public List<string> ReadingToolList { get; set; } = new List<string>() { };
 
+        /// <summary>
+        /// 分割工具
+        /// </summary>
+        public List<string> SegmentToolList { get; set; } = new List<string>();
+
         public List<KeyFile> KeyFileList { get; set; }=new  List<KeyFile>() { };
 
         public bool IsImageFilter { get; set; }

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -504,6 +504,23 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
+    /// <summary>
+    /// 影像标记类型
+    /// </summary>
+    public enum ImageMarkType
+    {
+        /// <summary>
+        /// 普通标记
+        /// </summary>
+        Normal = 0,
+
+        /// <summary>
+        /// 分割标记
+        /// </summary>
+        Segment = 1,
+
+    }
+
     /// <summary>
     /// 导出结果
     /// </summary>

IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs

@@ -180,6 +180,11 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
     /// 阅片工具
     /// </summary>
     public List<string> ReadingToolList { get; set; } = new List<string>();
+
+    /// <summary>
+    /// 分割工具
+    /// </summary>
+    public List<string> SegmentToolList { get; set; } = new List<string>();
 }
 
 

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -295,7 +295,11 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public ImageMark? ImageMarkEnum { get; set; }
 
-   
+    /// <summary>
+    /// 影像标记类型
+    /// </summary>
+    public ImageMarkType? ImageMarkTypeEnum { get; set; }
+
 
     /// <summary>
     /// 影像工具
@@ -307,6 +311,8 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public string ImageToolAttribute { get; set; } = string.Empty;
 
+   
+
     [NotMapped]
     public List<ExportResult> ExportResult
     {

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs

@@ -197,6 +197,11 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public ImageMark? ImageMarkEnum { get; set; }
 
+    /// <summary>
+    /// 影像标记类型
+    /// </summary>
+    public ImageMarkType? ImageMarkTypeEnum { get; set; }
+
     /// <summary>
     /// 影像工具
     /// </summary>

IRaCIS.Core.Infra.EFCore/Migrations/20260319021151_ImageMarkTypeEnum.cs

@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class ImageMarkTypeEnum : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ImageMarkTypeEnum",
+                table: "ReadingTableQuestionTrial",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ImageMarkTypeEnum",
+                table: "ReadingQuestionTrial",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SegmentToolList",
+                table: "ReadingQuestionCriterionTrial",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "[]");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ImageMarkTypeEnum",
+                table: "ReadingTableQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ImageMarkTypeEnum",
+                table: "ReadingQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "SegmentToolList",
+                table: "ReadingQuestionCriterionTrial");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -6774,6 +6774,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<int>("ReadingVersionEnum")
                         .HasColumnType("int");
 
+                    b.Property<string>("SegmentToolList")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("ShowOrder")
                         .HasColumnType("int")
                         .HasComment("排序");
@@ -7184,6 +7188,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<int?>("ImageMarkEnum")
                         .HasColumnType("int");
 
+                    b.Property<int?>("ImageMarkTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<string>("ImageTool")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -7977,6 +7984,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<int?>("ImageMarkEnum")
                         .HasColumnType("int");
 
+                    b.Property<int?>("ImageMarkTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<string>("ImageTool")
                         .IsRequired()
                         .HasMaxLength(400)