From 79d76dcbaf82a98fc8194b92d5874a48662dab6c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 24 Sep 2024 14:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                |  6 ++++++
 .../ImageAndDoc/DTO/UnionStudyViewDodel.cs     |  2 ++
 .../ImageAndDoc/DownloadAndUploadService.cs    | 18 ++++++++++++++----
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index fed48da3d..82319338a 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2763,6 +2763,12 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IVUSCalculateService.UploadIVUSTemplate">
+            <summary>
+            导入IVUS数据
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IVUSCalculateService.CalculatePatchDataStatisticsAndPVA(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             计算斑块数据统计和PVA数据
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 571f4e1f3..804a7d83e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -234,6 +234,8 @@ namespace IRaCIS.Core.Application.Contracts
         [NotDefault]
         public Guid TrialId { get; set; }
 
+        public Guid? VisitTaskId { get; set; }
+
     }
 
     public class TaskStudyArchiveConfirmResult
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 21f87dece..5741a886c 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -4,6 +4,7 @@ using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
@@ -257,14 +258,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 t.StudyInstanceUid,
                 t.SubjectId,
-                SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code
+                SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code,
+                t.VisitTaskId
             }).ToList();
 
             var notAllowedUidList2 = _dicomStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
             {
                 t.StudyInstanceUid,
                 t.SubjectId,
-                SubejectCode = t.Subject.Code
+                SubejectCode = t.Subject.Code,
+                VisitTaskId = Guid.Empty
             }).ToList();
 
             var notAllowedUidList = notAllowedUidList1.Union(notAllowedUidList2);
@@ -280,7 +283,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     //同一个subject 同一份影响
                     if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
                     {
-                        result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = true });
+                        if (inCommand.VisitTaskId != null && findStudy.VisitTaskId!=Guid.Empty && findStudy.VisitTaskId!=inCommand.VisitTaskId)
+                        {
+                            result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
+                        }
+                        else
+                        {
+                            result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = true });
+                        }
                     }
                     else
                     {
@@ -593,7 +603,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         public async Task<List<TaskNoneDicomStudyDTO>> GetIRUploadTaskNoneDicomStudyList(IRUploadStudyQuery inQuery)
         {
             var info = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
-                 .Select(t => new { t.IsImageFilter, t.CriterionModalitys,t.IsReadingTaskViewInOrder }).FirstNotNullAsync();
+                 .Select(t => new { t.IsImageFilter, t.CriterionModalitys, t.IsReadingTaskViewInOrder }).FirstNotNullAsync();
 
             var query = from u in _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)