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

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

@@ -0,0 +1,19 @@
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Domain.Models;
+
+[Comment("标准阅读关键点")]
+[Table("CriterionKeyFileRead")]
+public class CriterionKeyFileRead : BaseAddAuditEntity
+{
+    /// <summary>
+    /// 项目标准Id
+    /// </summary>
+    public Guid TrialCriterionId { get; set; }
+
+    /// <summary>
+    /// 用户Id
+    /// </summary>
+    public Guid IdentityUserId { get; set; }
+
+}

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

@@ -0,0 +1,24 @@
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Domain.Models;
+
+[Comment("系统标准阅片关键点文件")]
+[Table("SystemCriterionKeyFile")]
+public class SystemCriterionKeyFile : BaseAddAuditEntity
+{
+    /// <summary>
+    /// 系统标准Id
+    /// </summary>
+    public Guid SystemCriterionId { get; set; }
+    
+    /// <summary>
+    /// 问价名称
+    /// </summary>
+    public string FileName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件路径
+    /// </summary>
+    public string FilePath { get; set; } = string.Empty;
+
+}

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

@@ -0,0 +1,24 @@
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Domain.Models;
+
+[Comment("项目标准阅片关键点文件")]
+[Table("TrialCriterionKeyFile")]
+public class TrialCriterionKeyFile : BaseAddAuditEntity
+{
+    /// <summary>
+    /// 姓名标准Id
+    /// </summary>
+    public Guid TrialCriterionId { get; set; }
+    
+    /// <summary>
+    /// 问价名称
+    /// </summary>
+    public string FileName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件路径
+    /// </summary>
+    public string FilePath { get; set; } = string.Empty;
+
+}

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

@@ -324,6 +324,12 @@ public class IRaCISDBContext : DbContext
 
 
     #region Reading
+
+    public virtual DbSet<TrialCriterionKeyFile> TrialCriterionKeyFile { get; set; }
+
+    public virtual DbSet<SystemCriterionKeyFile> SystemCriterionKeyFile { get; set; }
+
+    public virtual DbSet<CriterionKeyFileRead> CriterionKeyFileRead { get; set; }
     public virtual DbSet<TrialCriterionDictionaryCode> TrialCriterionDictionaryCode { get; set; }
 
     public virtual DbSet<ReadingImportFile> ReadingImportFile { get; set; }

IRaCIS.Core.Infra.EFCore/Migrations/20251112033209_KeyFile.cs

@@ -0,0 +1,151 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class KeyFile : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CriterionKeyFileRead",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TrialCriterionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    IdentityUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CriterionKeyFileRead", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_CriterionKeyFileRead_User_CreateUserId",
+                        column: x => x.CreateUserId,
+                        principalTable: "User",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "标准阅读关键点");
+
+            migrationBuilder.CreateTable(
+                name: "SystemCriterionKeyFile",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    SystemCriterionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    FileName = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false),
+                    FilePath = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false),
+                    CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SystemCriterionKeyFile", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_SystemCriterionKeyFile_User_CreateUserId",
+                        column: x => x.CreateUserId,
+                        principalTable: "User",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "系统标准阅片关键点文件");
+
+            migrationBuilder.CreateTable(
+                name: "TrialCriterionKeyFile",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TrialCriterionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    FileName = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false),
+                    FilePath = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false),
+                    CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TrialCriterionKeyFile", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TrialCriterionKeyFile_User_CreateUserId",
+                        column: x => x.CreateUserId,
+                        principalTable: "User",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "项目标准阅片关键点文件");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReadingTableAnswerRowInfo_SeriesId",
+                table: "ReadingTableAnswerRowInfo",
+                column: "SeriesId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReadingTableAnswerRowInfo_StudyId",
+                table: "ReadingTableAnswerRowInfo",
+                column: "StudyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CriterionKeyFileRead_CreateUserId",
+                table: "CriterionKeyFileRead",
+                column: "CreateUserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SystemCriterionKeyFile_CreateUserId",
+                table: "SystemCriterionKeyFile",
+                column: "CreateUserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TrialCriterionKeyFile_CreateUserId",
+                table: "TrialCriterionKeyFile",
+                column: "CreateUserId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ReadingTableAnswerRowInfo_DicomSeries_SeriesId",
+                table: "ReadingTableAnswerRowInfo",
+                column: "SeriesId",
+                principalTable: "DicomSeries",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ReadingTableAnswerRowInfo_NoneDicomStudy_StudyId",
+                table: "ReadingTableAnswerRowInfo",
+                column: "StudyId",
+                principalTable: "NoneDicomStudy",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ReadingTableAnswerRowInfo_DicomSeries_SeriesId",
+                table: "ReadingTableAnswerRowInfo");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_ReadingTableAnswerRowInfo_NoneDicomStudy_StudyId",
+                table: "ReadingTableAnswerRowInfo");
+
+            migrationBuilder.DropTable(
+                name: "CriterionKeyFileRead");
+
+            migrationBuilder.DropTable(
+                name: "SystemCriterionKeyFile");
+
+            migrationBuilder.DropTable(
+                name: "TrialCriterionKeyFile");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ReadingTableAnswerRowInfo_SeriesId",
+                table: "ReadingTableAnswerRowInfo");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ReadingTableAnswerRowInfo_StudyId",
+                table: "ReadingTableAnswerRowInfo");
+        }
+    }
+}

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

@@ -799,6 +799,33 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         });
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionKeyFileRead", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("IdentityUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("TrialCriterionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreateUserId");
+
+                    b.ToTable("CriterionKeyFileRead", t =>
+                        {
+                            t.HasComment("标准阅读关键点");
+                        });
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionNidusSystem", b =>
                 {
                     b.Property<Guid>("Id")
@@ -7284,8 +7311,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.HasIndex("QuestionId");
 
+                    b.HasIndex("SeriesId");
+
                     b.HasIndex("SplitRowId");
 
+                    b.HasIndex("StudyId");
+
                     b.HasIndex("VisitTaskId");
 
                     b.ToTable("ReadingTableAnswerRowInfo", t =>
@@ -10418,6 +10449,40 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         });
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.SystemCriterionKeyFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<Guid>("SystemCriterionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreateUserId");
+
+                    b.ToTable("SystemCriterionKeyFile", t =>
+                        {
+                            t.HasComment("系统标准阅片关键点文件");
+                        });
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser", b =>
                 {
                     b.Property<Guid>("Id")
@@ -12538,6 +12603,40 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.ToTable("TrialCriterionDictionaryCode");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialCriterionKeyFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<Guid>("TrialCriterionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreateUserId");
+
+                    b.ToTable("TrialCriterionKeyFile", t =>
+                        {
+                            t.HasComment("项目标准阅片关键点文件");
+                        });
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialDicomAE", b =>
                 {
                     b.Property<Guid>("Id")
@@ -16272,6 +16371,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("CreateUserRole");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionKeyFileRead", b =>
+                {
+                    b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
+                        .WithMany()
+                        .HasForeignKey("CreateUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreateUserRole");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionNidusSystem", b =>
                 {
                     b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
@@ -17855,10 +17965,19 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.DicomSeries", "DicomSeries")
+                        .WithMany()
+                        .HasForeignKey("SeriesId")
+                        .HasPrincipalKey("Id");
+
                     b.HasOne("IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo", "SplitRow")
                         .WithMany()
                         .HasForeignKey("SplitRowId");
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.NoneDicomStudy", "NoneDicomStudy")
+                        .WithMany()
+                        .HasForeignKey("StudyId");
+
                     b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "VisitTask")
                         .WithMany("LesionList")
                         .HasForeignKey("VisitTaskId")
@@ -17867,12 +17986,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("CreateUserRole");
 
+                    b.Navigation("DicomSeries");
+
                     b.Navigation("FristAddTask");
 
                     b.Navigation("Instance");
 
                     b.Navigation("MergeRow");
 
+                    b.Navigation("NoneDicomStudy");
+
                     b.Navigation("OrganInfo");
 
                     b.Navigation("ReadingQuestionTrial");
@@ -18747,6 +18870,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("CreateUserRole");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.SystemCriterionKeyFile", b =>
+                {
+                    b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
+                        .WithMany()
+                        .HasForeignKey("CreateUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreateUserRole");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser", b =>
                 {
                     b.HasOne("IRaCIS.Core.Domain.Models.IdentityUser", "ConfirmUser")
@@ -19361,6 +19495,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("TrialReadingCriterion");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialCriterionKeyFile", b =>
+                {
+                    b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
+                        .WithMany()
+                        .HasForeignKey("CreateUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreateUserRole");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialDicomAE", b =>
                 {
                     b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")