From 5038d7ad53f72406542974eb7ea6b5137a421ad8 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 30 May 2024 14:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E9=87=8D?=
 =?UTF-8?q?=E4=BC=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DownloadAndUploadService.cs       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index ab25b257f..dc776a144 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -59,11 +59,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     SubejctId = u.SubjectId,
 
+                    
+
                     SiteId=u.Subject.SiteId,
 
                     CriterionModalitys= u.TrialReadingCriterion.CriterionModalitys,
 
-                    SubjectCode = u.IsSelfAnalysis == true ? u.Subject.Code : u.BlindSubjectCode,
+                    SubjectCode = u.IsSelfAnalysis == true ?  u.BlindSubjectCode :  u.Subject.Code ,
                     TaskBlindName = u.TaskBlindName,
                     TaskName = u.TaskName,
 
@@ -314,9 +316,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 else
                 {
 
-                    var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); ;
+                    var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString(), findOriginStudy.VisitTaskId.ToString()); 
 
-                    var study = await _repository.Where<TaskStudy>().FirstOrDefaultAsync(t => t.Id == studyId);
+                    var study = await _repository.FirstOrDefaultAsync<TaskStudy>(t => t.Id == studyId);
 
                     //重传的时候也要赋值检查Id
                     studyMonitor.StudyId = study.Id;