下载增加TrialSiteCode

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -763,6 +763,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             TrialId = sv.TrialId,
                             SubjectId=sv.SubjectId,
                             SubjectCode = sv.Subject.Code,
+                            TrialSiteCode=sv.TrialSite.TrialSiteCode,
                             VisitName = sv.VisitName,
 
                             StudyList = sv.StudyList.Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
@@ -812,6 +813,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 TrialId = result.TrialId,
                 SubjectId = result.SubjectId,
                 SubjectCode = result.SubjectCode,
+                TrialSiteCode = result.TrialSiteCode,
                 IP = _userInfo.IP,
                 DownloadStartTime = DateTime.Now,
                 IsSuccess = false,
@@ -969,6 +971,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var subjectVisitIdList = inQuery.SubjectVisitTaskList.Select(t => t.SubjectVisitId).ToList();
 
+            var trialSiteCode = _visitTaskRepository.Where(t => t.Id == taskIdList.FirstOrDefault()).Select(t => t.IsAnalysisCreate ? t.BlindTrialSiteCode : t.Subject.TrialSite.TrialSiteCode).FirstOrDefault()??string.Empty;
+
             var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id)))
                             //一致性分析，导致查询出来两条数据
                         join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id))
@@ -1030,6 +1034,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 TrialId = info.TrialId,
                 SubjectId=inQuery.SubjectId,
                 SubjectCode = inQuery.SubjectCode,
+                TrialSiteCode= trialSiteCode,
                 IP = _userInfo.IP,
                 DownloadStartTime = DateTime.Now,
                 IsSuccess = false,

IRaCIS.Core.Domain/Image/TrialImageDownload.cs

@@ -17,6 +17,9 @@ public class TrialImageDownload : BaseFullAuditEntity
 
     public Guid SubjectId { get; set; }
 
+    [Comment("一致性分析的就显示一致性分析的中心")]
+    public string TrialSiteCode { get; set; }
+
     public string SubjectCode { get; set; }
 
     public bool IsSuccess { get; set; }

IRaCIS.Core.Infra.EFCore/Migrations/20241012011240_DownloadAddTrialSiteCode.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class DownloadAddTrialSiteCode : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "TrialSiteCode",
+                table: "TrialImageDownload",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "",
+                comment: "一致性分析的就显示一致性分析的中心");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TrialImageDownload_SubjectId",
+                table: "TrialImageDownload",
+                column: "SubjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TrialImageDownload_Subject_SubjectId",
+                table: "TrialImageDownload",
+                column: "SubjectId",
+                principalTable: "Subject",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_TrialImageDownload_Subject_SubjectId",
+                table: "TrialImageDownload");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TrialImageDownload_SubjectId",
+                table: "TrialImageDownload");
+
+            migrationBuilder.DropColumn(
+                name: "TrialSiteCode",
+                table: "TrialImageDownload");
+        }
+    }
+}

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

@@ -11287,6 +11287,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("TrialId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("TrialSiteCode")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("一致性分析的就显示一致性分析的中心");
+
                     b.Property<DateTime>("UpdateTime")
                         .HasColumnType("datetime2");
 
@@ -11302,6 +11308,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.HasIndex("CreateUserId");
 
+                    b.HasIndex("SubjectId");
+
                     b.HasIndex("TrialId");
 
                     b.ToTable("TrialImageDownload", t =>
@@ -16641,6 +16649,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.Subject", "Subject")
+                        .WithMany()
+                        .HasForeignKey("SubjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.HasOne("IRaCIS.Core.Domain.Models.Trial", "Trial")
                         .WithMany()
                         .HasForeignKey("TrialId")
@@ -16649,6 +16663,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("CreateUser");
 
+                    b.Navigation("Subject");
+
                     b.Navigation("Trial");
                 });