From 4047220d53a5a17d9856864c51188b7d07dab36e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 26 Nov 2025 15:49:09 +0800
Subject: [PATCH] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8-12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 24 ++++++++++++-------
 .../ImageAndDoc/DownloadAndUploadService.cs   | 10 ++++++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 872d7361e..72a97326d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1116,14 +1116,6 @@
             <param name="trialId"></param>
             <returns></returns>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.TrialImageDownloadService.TrialImageAddExtralField(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries})" -->
-        <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.DownloadDeleteTrialImage(System.Guid)">
-            <summary>
-            下载已经删除的影像
-            </summary>
-            <param name="trialId"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.WriteTrialNeedDealData(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},System.Guid)">
             <summary>
             读取该项目的数据，进行维护
@@ -1525,6 +1517,14 @@
             <param name="inCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.AuditDocumentService.MoveSubtreeAsync(System.Guid,System.Nullable{System.Guid})">
+            <summary>
+            GPT 移动子树代码--适合一次提交事务
+            </summary>
+            <param name="subtreeRootId"></param>
+            <param name="newParentId"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.AuditDocumentService.AddClosureRelationsAsync(System.Guid,System.Nullable{System.Guid})">
             <summary>
             插入闭包表关系
@@ -2219,6 +2219,12 @@
             <param name="inCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetTrialSubjectVisitMarkList(IRaCIS.Core.Application.Contracts.SubjectVisitMarkQuery)">
+            <summary>
+            获取受试者级别 访视标注列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetSubejectOrVisitZipInfo(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Application.Contracts.SubejctZipInfoQuery)">
             <summary>
             受试者级别所有的影像
@@ -13047,7 +13053,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.AddOrUpdateReadingTableQuestionTrial(IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit)">
             <summary>
-            新增修改想想项目表格问题
+            新增修改项目表格问题
             </summary>
             <param name="indto"></param>
             <returns></returns>
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 5c9ab031e..191510bfe 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -174,6 +174,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                    .Select(t => new StudyBasicInfo()
                    {
                        Id = t.Id,
+                       SubjectVisitId=t.SubjectVisitId,
+                       
                        StudyInstanceUid = t.StudyInstanceUid,
                        ModalityForEdit = t.ModalityForEdit,
                        BodyPartExamined = t.BodyPartExamined,
@@ -194,6 +196,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                    UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo()
                    {
                        Id = t.Id,
+                       SubjectVisitId=t.SubjectVisitId,
                        StudyInstanceUid = t.StudyInstanceUid,
                        ModalityForEdit = t.ModalityForEdit,
                        BodyPartExamined = t.BodyPartExamined,
@@ -1343,8 +1346,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     foreach (var item in list)
                     {
-                        item.DicomStudyList.Where(t => inQuery.IsImageSegmentLabel == false ? t.ModalityForEdit == "XA" : true).ToList()
-                            .AddRange(preDicomStudyList.Where(t => t.SubjectVisitId == item.SourceSubjectVisitId).ToList());
+                        var dicomList = item.DicomStudyList.Where(t => inQuery.IsImageSegmentLabel == false ? t.ModalityForEdit == "XA" : true).ToList();
+
+                        dicomList.AddRange(preDicomStudyList.Where(t => t.SubjectVisitId == item.SourceSubjectVisitId).ToList());
+
+                        item.DicomStudyList = dicomList;
 
                         item.NoneDicomStudyList = _mapper.Map<List<NoneDicomStudyBasicInfo>>(preNoneDicomStudyList.Where(t => t.SubjectVisitId == item.SourceSubjectVisitId).ToList());
                     }