修改

IRaCIS.Core.Application/Service/Doctor/DTO/EducationModel.cs

@@ -64,6 +64,8 @@
 
         public string HospitalCN { get; set; } = String.Empty;
 
+        public Guid? HospitalId { get; set; }
+
         public string SchoolCN { get; set; } = String.Empty;
 
         public string CountryCN { get; set; } = String.Empty;

IRaCIS.Core.Domain/Dcotor/Postgraduate.cs

@@ -23,7 +23,10 @@ public  class Postgraduate : BaseFullAuditEntity
     
     public string Hospital { get; set; } = string.Empty;
 
-    
+
+    public Guid? HospitalId { get; set; }
+
+
     public string School { get; set; } = string.Empty;
     
     public string Country { get; set; } = string.Empty;

IRaCIS.Core.Infra.EFCore/Migrations/20241028085025_Hospitalid.cs

@@ -0,0 +1,94 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class Hospitalid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeVisitTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "在访视或者全局任务上记录  裁判任务的Id",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "裁判任务的Id");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeResultTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "在裁判任务上记录 裁判结果的任务ID（访视或者全局）",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "裁判结果的任务ID（访视或者全局）");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "HospitalId",
+                table: "Postgraduate",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReadingTableQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem",
+                column: "ReadingQuestionId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ReadingTableQuestionSystem_ReadingQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem",
+                column: "ReadingQuestionId",
+                principalTable: "ReadingQuestionSystem",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ReadingTableQuestionSystem_ReadingQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ReadingTableQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropColumn(
+                name: "HospitalId",
+                table: "Postgraduate");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeVisitTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "裁判任务的Id",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "在访视或者全局任务上记录  裁判任务的Id");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeResultTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "裁判结果的任务ID（访视或者全局）",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "在裁判任务上记录 裁判结果的任务ID（访视或者全局）");
+        }
+    }
+}

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

@@ -3472,6 +3472,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
+                    b.Property<Guid?>("HospitalId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<string>("Major")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -6498,6 +6501,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.HasIndex("DependParentId");
 
+                    b.HasIndex("ReadingQuestionId");
+
                     b.ToTable("ReadingTableQuestionSystem", t =>
                         {
                             t.HasComment("系统表格问题");
@@ -13330,11 +13335,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Property<Guid?>("JudgeResultTaskId")
                         .HasColumnType("uniqueidentifier")
-                        .HasComment("裁判结果的任务ID（访视或者全局）");
+                        .HasComment("在裁判任务上记录 裁判结果的任务ID（访视或者全局）");
 
                     b.Property<Guid?>("JudgeVisitTaskId")
                         .HasColumnType("uniqueidentifier")
-                        .HasComment("裁判任务的Id");
+                        .HasComment("在访视或者全局任务上记录  裁判任务的Id");
 
                     b.Property<string>("PastResultTaskIds")
                         .IsRequired()
@@ -15283,7 +15288,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .IsRequired();
 
                     b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "VisitTask")
-                        .WithMany("LesionAnswerList")
+                        .WithMany()
                         .HasForeignKey("VisitTaskId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -15311,9 +15316,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .WithMany()
                         .HasForeignKey("DependParentId");
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.ReadingQuestionSystem", "ReadingQuestionSystem")
+                        .WithMany("ReadingTableQuestionTrialList")
+                        .HasForeignKey("ReadingQuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.Navigation("CreateUser");
 
                     b.Navigation("DependParentQuestion");
+
+                    b.Navigation("ReadingQuestionSystem");
                 });
 
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial", b =>
@@ -17692,6 +17705,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("VisitTaskList");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingQuestionSystem", b =>
+                {
+                    b.Navigation("ReadingTableQuestionTrialList");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingQuestionTrial", b =>
                 {
                     b.Navigation("ReadingTableQuestionTrialList");
@@ -17949,8 +17967,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("JudgeVisitList");
 
-                    b.Navigation("LesionAnswerList");
-
                     b.Navigation("LesionList");
 
                     b.Navigation("ReadingTaskQuestionAnswerList");