Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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;