IRC.Core.Dicom/Service/OSSService.cs

@@ -118,7 +118,7 @@ public class AWSTempToken
     public string SecretAccessKey { get; set; }
     public string BucketName { get; set; }
     public string ViewEndpoint { get; set; }
-    public DateTime? Expiration { get; set; }
+    public DateTime Expiration { get; set; }
 }
 
 public enum ObjectStoreUse

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

@@ -19050,11 +19050,6 @@
             文件路径
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.DefaultSegmentName">
-            <summary>
-            默认SegmentName
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingToolList">
             <summary>
             阅片工具

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

@@ -396,11 +396,6 @@ namespace IRaCIS.Core.Application.Contracts
     }
     public class GetTrialReadingInfoOutDto
     {
-        /// <summary>
-        /// 默认SegmentName
-        /// </summary>
-        public DefaultSegmentNameDto DefaultSegmentName { get; set; }
-
         public ReadingVersion ReadingVersionEnum { get; set; }
 
         public List<KeyFile> KeyFileList { get; set; }

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

@@ -186,11 +186,11 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
     /// </summary>
     public List<string> SegmentToolList { get; set; } = new List<string>();
 
-    ///// <summary>
+    /// <summary>
-    ///// 默认SegmentName
+    /// 默认SegmentName
-    ///// </summary>
+    /// </summary>
-    //[MaxLength]
+    [MaxLength]
-    //public DefaultSegmentNameDto DefaultSegmentName { get; set; }
+    public DefaultSegmentNameDto DefaultSegmentName { get; set; }
 }
 
 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -103,11 +103,11 @@ public class IRaCISDBContext : DbContext
 
         modelBuilder.Entity<ReadingQuestionCriterionTrial>(entity =>
         {
-            ////默认SegmentName
+            //默认SegmentName
-            //entity.OwnsOne(x => x.DefaultSegmentName, ownedNavigationBuilder =>
+            entity.OwnsOne(x => x.DefaultSegmentName, ownedNavigationBuilder =>
-            //{
+            {
-            //    ownedNavigationBuilder.ToJson();
+                ownedNavigationBuilder.ToJson();
-            //});
+            });
         });
 
         #region pgsql codefirst 配置 暂时屏蔽

IRaCIS.Core.Infra.EFCore/Migrations/20260413074126_SegmentName2.cs

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

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

@@ -18545,8 +18545,35 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .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("DefaultSegmentName")
+                        .IsRequired();
+
                     b.Navigation("Trial");
                 });