下载记录表 增加SubjectId字段

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

@@ -761,6 +761,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         select new
                         {
                             TrialId = sv.TrialId,
+                            SubjectId=sv.SubjectId,
                             SubjectCode = sv.Subject.Code,
                             VisitName = sv.VisitName,
 
@@ -809,6 +810,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 Id = NewId.NextSequentialGuid(),
                 TrialId = result.TrialId,
+                SubjectId = result.SubjectId,
                 SubjectCode = result.SubjectCode,
                 IP = _userInfo.IP,
                 DownloadStartTime = DateTime.Now,
@@ -1026,6 +1028,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 Id = NewId.NextSequentialGuid(),
                 TrialId = info.TrialId,
+                SubjectId=inQuery.SubjectId,
                 SubjectCode = inQuery.SubjectCode,
                 IP = _userInfo.IP,
                 DownloadStartTime = DateTime.Now,

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -794,6 +794,28 @@ namespace IRaCIS.Core.Application.Contracts
         public string FullName { get; set; }
 
         public string UserTypeShortName { get; set; }
+
+        public DateTime? FirstReadingTime { get; set; }
+
+        public bool IsNeedClinicalDataSign { get; set; }
+
+        public bool IsClinicalDataSign { get; set; }
+
+        public CompleteClinicalDataEnum CompleteClinicalDataEnum =>
+    (IsNeedClinicalDataSign && IsClinicalDataSign) ? CompleteClinicalDataEnum.Complete : (IsNeedClinicalDataSign && IsClinicalDataSign == false) ? CompleteClinicalDataEnum.NotComplete : CompleteClinicalDataEnum.NA;
+
+
+
+        public string ReadingDuration
+        {
+            get
+            {
+                if (!SignTime.HasValue)
+                    return "";
+                else return string.Format("{0}h:{1}m:{2}s", (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes, (SignTime - FirstReadingTime)?.Seconds)
+                         /*string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes)*/;
+            }
+        }
     }
 
 
@@ -876,8 +898,11 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid TrialId { get; set; }
 
+        public string TrialSiteCode { get; set; }
+
         public string SubjectCode { get; set; }
 
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsSuccess { get; set; }
 
         public DateTime DownloadStartTime { get; set; }
@@ -892,6 +917,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int DicomStudyCount { get; set; }
 
+        public int TotalStudyCount => DicomStudyCount + NoneDicomStudyCount;
+
         public int ImageCount { get; set; }
         public long ImageSize { get; set; }
 

IRaCIS.Core.Domain/Image/TrialImageDownload.cs

@@ -12,6 +12,8 @@ public class TrialImageDownload : BaseFullAuditEntity
 
     public Guid TrialId { get; set; }
 
+    public Guid SubjectId { get; set; }
+
     public string SubjectCode { get; set; }
 
     public bool IsSuccess { get; set; }

IRaCIS.Core.Infra.EFCore/Migrations/20241011030308_TrialImageDownloadAddSubejctId.cs

@@ -0,0 +1,30 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class TrialImageDownloadAddSubejctId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "SubjectId",
+                table: "TrialImageDownload",
+                type: "uniqueidentifier",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SubjectId",
+                table: "TrialImageDownload");
+        }
+    }
+}

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

@@ -11281,6 +11281,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
+                    b.Property<Guid>("SubjectId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<Guid>("TrialId")
                         .HasColumnType("uniqueidentifier");