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

IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs

@@ -293,6 +293,33 @@ namespace IRaCIS.Core.Domain.Share
         Freeze = 5,
     }
 
+    /// <summary>
+    /// 评估进度
+    /// </summary>
+    public enum EvaluateProgress
+    {
+        /// <summary>
+        /// 默认
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        /// 放射学
+        /// </summary>
+        Radiology = 1,
+
+        /// <summary>
+        /// 核医学
+        /// </summary>
+        NuclearMedicine = 2,
+
+        /// <summary>
+        /// 肿瘤学
+        /// </summary>
+        Oncology = 3,
+
+    }
+
     //阅片状态
     public enum ReadingTaskState
     {

IRaCIS.Core.Domain/Allocation/TaskEvaluateProgress.cs

@@ -0,0 +1,20 @@
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Domain.Models;
+
+[Comment("项目阅片 - 任务评估进度")]
+[Table("TaskEvaluateProgress")]
+public class TaskEvaluateProgress : BaseAddAuditEntity
+{
+    /// <summary>
+    /// 任务Id
+    /// </summary>
+    public Guid VisitTaskId { get; set; }
+
+    /// <summary>
+    /// 评估进度
+    /// </summary>
+    public EvaluateProgress EvaluateProgressEnum { get; set; }
+}
+
+

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -304,6 +304,11 @@ public class VisitTask : BaseFullAuditEntity
     [ForeignKey("SubjectCriterionClaimUserId")]
     public UserRole SubjectCriterionClaimUser { get; set; }
 
+    /// <summary>
+    /// 评估进度
+    /// </summary>
+    public EvaluateProgress EvaluateProgressEnum { get; set; } = EvaluateProgress.Default;
+
 
     [NotMapped]
     public List<string> PIAuditImagePathList

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

@@ -543,6 +543,8 @@ public class IRaCISDBContext : DbContext
 
     public virtual DbSet<TaskConsistentRule> TaskConsistentRule { get; set; }
 
+    public virtual DbSet<TaskEvaluateProgress> TaskEvaluateProgress { get; set; }
+
 
     public virtual DbSet<TaskInfluence> TaskInfluence { get; set; }
 

IRaCIS.Core.Infra.EFCore/Migrations/20250828061251_TaskEvaluateProgress.cs

@@ -0,0 +1,46 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class TaskEvaluateProgress : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "EvaluateProgressEnum",
+                table: "VisitTask",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateTable(
+                name: "TaskEvaluateProgress",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    VisitTaskId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    EvaluateProgressEnum = table.Column<int>(type: "int", nullable: false),
+                    CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TaskEvaluateProgress", x => x.Id);
+                },
+                comment: "项目阅片 - 任务评估进度");
+
+        
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+         
+        }
+    }
+}

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

@@ -10103,6 +10103,33 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         });
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskEvaluateProgress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("EvaluateProgressEnum")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("VisitTaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreateUserId");
+
+                    b.ToTable("TaskEvaluateProgress", t =>
+                        {
+                            t.HasComment("项目阅片 - 任务评估进度");
+                        });
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskInfluence", b =>
                 {
                     b.Property<Guid>("Id")
@@ -14017,6 +14044,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("DoctorUserId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<int>("EvaluateProgressEnum")
+                        .HasColumnType("int");
+
                     b.Property<DateTime?>("ExpetidEmailNoticeTime")
                         .HasColumnType("datetime2")
                         .HasComment("通知IR加急阅片时间");
@@ -17278,6 +17308,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("TrialReadingCriterion");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskEvaluateProgress", 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.TaskInfluence", b =>
                 {
                     b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")