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

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -9,6 +9,7 @@
 		<Company>上海展影医疗科技有限公司</Company>
 		<Product>IRC影像系统 (EICS)</Product>
 		<Copyright>上海展影医疗科技有限公司版权所有</Copyright>
+		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -10,6 +10,7 @@
 		<OutputPath>..\bin\</OutputPath>
 		<DocumentationFile>.\IRaCIS.Core.Application.xml</DocumentationFile>
 		<NoWarn>1701;1702;1591</NoWarn>
+		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2940,7 +2940,7 @@
             <param name="modality"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.DownloadImageSuccess(System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.DownloadImageSuccess(System.Guid,System.Nullable{System.Guid})">
             <summary>
             影像下载成功回调
             </summary>

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

@@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
             //subject 随机阅片  或者无序 有上传 才处理任务编号
             if (_visitTaskRepository.Any(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId &&
-           (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom 
+           (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom
            //||(t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.Random && t.TrialReadingCriterion.ImageDownloadEnum != ReadingImageDownload.None)
            )))
             {
@@ -119,6 +119,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var subjectCode = string.Empty;
             var subjectId = inQuery.SubjectId;
+            bool? isIRImageDownloaded = null;
+
+            if(inQuery.VisitTaskId != null)
+            {
+                isIRImageDownloaded= _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId).Select(t => t.IsIRImageDownloaded).FirstOrDefault();
+            }
 
             if (criterionInfo.IsReadingTaskViewInOrder == ReadingOrder.Random)
             {
@@ -325,7 +331,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 }
 
 
-                return ResponseOutput.Ok(list, new { TrialModality = criterionInfo.Modalitys , IsReadingTaskViewInOrder = criterionInfo.IsReadingTaskViewInOrder });
+                return ResponseOutput.Ok(list, new { TrialModality = criterionInfo.Modalitys, IsReadingTaskViewInOrder = criterionInfo.IsReadingTaskViewInOrder, IsIRImageDownloaded= isIRImageDownloaded });
             }
 
 
@@ -899,6 +905,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var subjectCode = inQuery.SubjectCode;
             var subjectId = inQuery.SubjectId;
             var doctorUserId = _userInfo.UserRoleId;
+            bool? isIRImageDownloaded = null;
 
             if (inQuery.VisitTaskId != null)
             {
@@ -910,18 +917,20 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     SubjectCode = t.IsAnalysisCreate ? t.BlindSubjectCode : t.Subject.Code,
                     SubjectId = t.SubjectId,
                     t.DoctorUserId,
-                    t.IsAnalysisCreate
+                    t.IsAnalysisCreate,
+                    t.IsIRImageDownloaded,
                 }).FirstNotNullAsync();
 
                 subjectId = taskInfo.SubjectId;
                 subjectCode = taskInfo.SubjectCode;
                 doctorUserId = (Guid)taskInfo.DoctorUserId!;
+                isIRImageDownloaded = taskInfo.IsIRImageDownloaded;
             }
 
             var info = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
                  .Select(t => new { t.IsImageFilter, t.CriterionType, t.TrialId, t.CriterionModalitys, t.IsReadingTaskViewInOrder }).FirstNotNullAsync();
 
-            var config = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList, t.Trial.IsShowStudyName }).FirstOrDefaultAsync();
+            var config = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList, t.Trial.IsShowStudyName, IsIRImageDownloaded= isIRImageDownloaded }).FirstOrDefaultAsync();
 
 
             //靶段标注上传，查看访视级别，上传绑定访视级别
@@ -1875,10 +1884,15 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         /// </summary>
         /// <param name="trialImageDownloadId"></param>
         /// <returns></returns>
-        public async Task<IResponseOutput> DownloadImageSuccess(Guid trialImageDownloadId)
+        public async Task<IResponseOutput> DownloadImageSuccess(Guid trialImageDownloadId, Guid? visitTaskId)
         {
             await _trialImageDownloadRepository.UpdatePartialFromQueryAsync(t => t.Id == trialImageDownloadId, u => new TrialImageDownload()
             { DownloadEndTime = DateTime.Now, IsSuccess = true }, true);
+
+            if (visitTaskId != null)
+            {
+                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == visitTaskId.Value, u => new VisitTask() { IsIRImageDownloaded = true });
+            }
             return ResponseOutput.Ok();
         }
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -324,4 +324,10 @@ public class VisitTask : BaseFullAuditEntity
 
     #endregion
 
+    #region 支持控制IR 下载影像
+
+    public bool? IsIRImageDownloaded { get; set; }
+
+    #endregion
+
 }

IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin</OutputPath>
+	  <NoWarn>$(NoWarn);NU1903</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

IRaCIS.Core.Infra.EFCore/Migrations/20260727054038_addIRDownload.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addIRDownload : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsIRImageDownloaded",
+                table: "VisitTask",
+                type: "bit",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsIRImageDownloaded",
+                table: "VisitTask");
+        }
+    }
+}

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

@@ -16668,6 +16668,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("bit")
                         .HasComment("重阅重置任务的 标注是转化之前的 还是转化之后的");
 
+                    b.Property<bool?>("IsIRImageDownloaded")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsNeedClinicalDataSign")
                         .HasColumnType("bit")
                         .HasComment("临床数据");

IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj

@@ -2,6 +2,7 @@
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<OutputPath>..\bin</OutputPath>
+		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>