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

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -10,6 +10,7 @@ namespace IRaCIS.Core.Application.Helper
 
     public static class CacheKeys
     {
+        //项目缓存
         public static string Trial(string trialIdStr) => $"TrialId:{trialIdStr}";
 
         //检查编号递增锁
@@ -33,8 +34,6 @@ namespace IRaCIS.Core.Application.Helper
         //超时没请求接口自动退出
         public static string UserAutoLoginOut(Guid userId) => $"UserAutoLoginOut:{userId}";
 
-        // 你可以为其他实体和模块定义更多的键
-
         /// <summary>
         /// 跳过阅片
         /// </summary>

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -109,17 +109,13 @@ namespace IRaCIS.Core.Application.Helper
         public string AccessKeyId { get; set; }
         public string AccessKeySecret { get; set; }
 
-
         public string EndPoint { get; set; }
         public string BucketName { get; set; }
 
-
         public string Region { get; set; }
 
         public string ViewEndpoint { get; set; }
 
-
-
         public string SecurityToken { get; set; }
         public DateTime Expiration { get; set; }
 

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -602,9 +602,9 @@ namespace IRaCIS.Core.Application.ViewModel
         [JsonIgnore]
         public List<SubjectUserView> DoctorUserList { get; set; }
 
-        public List<SubjectUserView> PreviousDoctorUserList => DoctorUserList.Where(t => t.OrignalSubjectUserId != null).ToList();
+        public List<SubjectUserView> PreviousDoctorUserList => DoctorUserList.Where(t => t.ReplacedSubjectUserId != null).ToList();
 
-        public List<SubjectUserView> NowDoctorUserList => DoctorUserList.Where(t => t.OrignalSubjectUserId == null).ToList();
+        public List<SubjectUserView> NowDoctorUserList => DoctorUserList.Where(t => t.ReplacedSubjectUserId == null).ToList();
 
 
 
@@ -622,7 +622,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsConfirmed { get; set; }
 
         //该属性有值 说明该医生被替换了 分配的时候 要过滤掉
-        public Guid? OrignalSubjectUserId { get; set; }
+        public Guid? ReplacedSubjectUserId { get; set; }
 
         public UserSimpleInfo DoctorUser { get; set; }
     }

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service
 
             foreach (var subjectGroup in needGenerateVisit.GroupBy(t => t.SubjectId).Select(g => new { SubjectId = g.Key, SubjectVisitList = g.ToList() }))
             {
-                var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectGroup.SubjectId && t.OrignalSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
+                var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectGroup.SubjectId && t.ReplacedSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
 
 
 
@@ -632,7 +632,7 @@ namespace IRaCIS.Core.Application.Service
 
                                 {
 
-                                    var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.OrignalSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
+                                    var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.ReplacedSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
 
                                     var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList);
                                     var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -171,7 +171,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
             {
                 foreach (var doctorArm in command.DoctorArmList)
                 {
-                    if (!await _subjectUserRepository.Where(t => t.TrialReadingCriterionId == command.TrialReadingCriterionId).AnyAsync(t => t.SubjectId == subjectId && t.DoctorUserId == doctorArm.DoctorUserId && t.ArmEnum == doctorArm.ArmEnum && t.IsConfirmed && t.OrignalSubjectUserId == null))
+                    if (!await _subjectUserRepository.Where(t => t.TrialReadingCriterionId == command.TrialReadingCriterionId).AnyAsync(t => t.SubjectId == subjectId && t.DoctorUserId == doctorArm.DoctorUserId && t.ArmEnum == doctorArm.ArmEnum && t.IsConfirmed && t.ReplacedSubjectUserId == null))
                     {
                         await _subjectUserRepository.AddAsync(new SubjectUser() { TrialId = command.TrialId, TrialReadingCriterionId = command.TrialReadingCriterionId, ArmEnum = doctorArm.ArmEnum, DoctorUserId = doctorArm.DoctorUserId, SubjectId = subjectId, AssignTime = DateTime.Now });
 
@@ -246,7 +246,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// <returns></returns>
         public async Task<(List<SubjectUserDTO>, object)> GetSubjectAssignedDoctorList(Guid subjectId, Guid trialReadingCriterionId)
         {
-            var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null && t.IsConfirmed && t.TrialReadingCriterionId == trialReadingCriterionId).ProjectTo<SubjectUserDTO>(_mapper.ConfigurationProvider).ToListAsync();
+            var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.ReplacedSubjectUserId == null && t.IsConfirmed && t.TrialReadingCriterionId == trialReadingCriterionId).ProjectTo<SubjectUserDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType, x.IsGlobalReading, x.IsOncologyReading, x.IsArbitrationReading }).FirstOrDefaultAsync()).IfNullThrowException();
 
@@ -479,13 +479,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     var armEnum = assginSubjectDoctorCommand.DoctorUserIdArmList.Where(t => t.DoctorUserId == doctorUserId).First().ArmEnum;
 
 
-                    if (await _subjectUserRepository.AnyAsync(t => t.TrialId == trialId && t.SubjectId == subjectId && t.DoctorUserId == doctorUserId && t.ArmEnum != armEnum && t.OrignalSubjectUserId == null))
+                    if (await _subjectUserRepository.AnyAsync(t => t.TrialId == trialId && t.SubjectId == subjectId && t.DoctorUserId == doctorUserId && t.ArmEnum != armEnum && t.ReplacedSubjectUserId == null))
                     {
                         //---有Subject 在其他Arm组已有该医生，不允许在新的组添加该医生
                         throw new BusinessValidationFailedException(_localizer["VisitTask_InconsistentSubjectStatus"]);
                     }
 
-                    if (await _subjectUserRepository.AnyAsync(t => t.TrialId == trialId && t.SubjectId == subjectId && t.DoctorUserId == doctorUserId && t.ArmEnum == armEnum && t.OrignalSubjectUserId == null))
+                    if (await _subjectUserRepository.AnyAsync(t => t.TrialId == trialId && t.SubjectId == subjectId && t.DoctorUserId == doctorUserId && t.ArmEnum == armEnum && t.ReplacedSubjectUserId == null))
                     {
                         //---有Subject 已有该Arm组的医生，不允许继续分配,请刷新页面，确认页面数据是否过期
                         throw new BusinessValidationFailedException(_localizer["VisitTask_DuplicateDoctorInArm"]);
@@ -568,11 +568,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
             //将关系确认
             if (assignConfirmCommand.SubjectDoctorUserList.Count == 0)
             {
-                await _subjectUserRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.IsConfirmed == false && t.OrignalSubjectUserId == null, u => new SubjectUser() { IsConfirmed = true });
+                await _subjectUserRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.IsConfirmed == false && t.ReplacedSubjectUserId == null, u => new SubjectUser() { IsConfirmed = true });
             }
             else
             {
-                await _subjectUserRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.IsConfirmed == false && t.OrignalSubjectUserId == null
+                await _subjectUserRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.IsConfirmed == false && t.ReplacedSubjectUserId == null
                 && subjectIdList.Contains(t.SubjectId), u => new SubjectUser() { IsConfirmed = true });
             }
 
@@ -597,7 +597,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                 if (assignConfirmCommand.SubjectDoctorUserList.Count == 0)
                 {
-                    subjectDoctorIdArmList = _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null).Select(t => new DoctorArm() { DoctorUserId = t.DoctorUserId, ArmEnum = t.ArmEnum }).ToList();
+                    subjectDoctorIdArmList = _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.ReplacedSubjectUserId == null).Select(t => new DoctorArm() { DoctorUserId = t.DoctorUserId, ArmEnum = t.ArmEnum }).ToList();
                 }
                 else
                 {

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -527,6 +527,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         [NotDefault]
         public string SubjectCode { get; set; }
+
+        public Guid? VisitTaskId { get; set; }
     }
 
 
@@ -554,6 +556,6 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid SubjectVisitId { get; set; }
 
-        public Guid VisitTaskId { get; set; }
+        public Guid TaskId { get; set; }
     }
 }

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

@@ -606,7 +606,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             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)
-                        join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId).WhereIf(info.IsImageFilter,t=> ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
+                        join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId).WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
                         on u.SourceSubjectVisitId equals ns.SubjectVisitId
 
                         select new TaskNoneDicomStudyDTO()
@@ -738,9 +738,21 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         [HttpPost]
         public async Task<List<SubjectCRCImageUploadedStudyDto>> GetSubjectImageDownloadSelectList(IRReadingDownloadQuery inQuery)
         {
+            var doctorUserId = _userInfo.Id;
+
+            var isAnalysisCreate = false;
+
+            //医学审核查看下载按钮，这个时候需要知道医生
+            if (inQuery.VisitTaskId != null && inQuery.VisitTaskId != Guid.Empty)
+            {
+                var info = await _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId).Select(t => new { t.DoctorUserId, t.IsAnalysisCreate }).FirstNotNullAsync();
+
+                doctorUserId = (Guid)info.DoctorUserId!;
+                isAnalysisCreate = info.IsAnalysisCreate;
+            }
 
             var query = _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
-                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == doctorUserId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == isAnalysisCreate)
                 .ProjectTo<SubjectCRCImageUploadedDto>(_mapper.ConfigurationProvider);
 
 
@@ -816,10 +828,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var isQueryDicom = inQuery.DicomStudyIdList.Count > 0;
             var isQueryNoneDicom = inQuery.NoneDicomStudyIdList.Count > 0;
 
+            var taskIdList = inQuery.SubjectVisitTaskList.Select(t => t.TaskId).ToList();
+
             var subjectVisitIdList = inQuery.SubjectVisitTaskList.Select(t => t.SubjectVisitId).ToList();
 
             var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id)))
-                        join visitTask in _visitTaskRepository.Where(t => t.TaskState == TaskState.Effect && t.DoctorUserId == _userInfo.Id && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+                            //一致性分析，导致查询出来两条数据
+                        join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id))
+
                         on sv.Id equals visitTask.SourceSubjectVisitId
                         select new
                         {

IRaCIS.Core.Application/Service/Management/_MapConfig.cs

@@ -136,7 +136,8 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.FeedBackUserName, c => c.MapFrom(t => t.CreateUser.UserName))
                  .ForMember(d => d.FeedBackFullName, c => c.MapFrom(t => t.CreateUser.FullName))
                   .ForMember(d => d.UserTypeEnum, c => c.MapFrom(t => t.CreateUser.UserTypeEnum));
-            CreateMap<UserFeedBack, UserFeedBackAddOrEdit>().ReverseMap();
+
+            CreateMap<UserFeedBackAddOrEdit, UserFeedBack>().ReverseMap();
         }
     }
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -6,6 +6,7 @@ using Panda.DynamicWebApi.Attributes;
 using IRaCIS.Core.Application.Contracts;
 using MassTransit;
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Application.Services
 {
@@ -66,7 +67,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetReadingImageFile(GetReadingImgInDto inDto)
+        public async Task<IResponseOutput<List<NoneDicomStudyView>>> GetReadingImageFile(GetReadingImgInDto inDto)
         {
             var task = await GetNextTask(new GetNextTaskInDto()
             {
@@ -84,10 +85,26 @@ namespace IRaCIS.Application.Services
                 // 阅片期取前面所有的图像
                 visitIds.AddRange(await _subjectVisitRepository.Where(x => x.VisitNum <= task.VisitNum && x.SubjectId == task.SubjectId).Select(x => x.Id).ToListAsync());
             }
-            List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId) && t.NoneDicomFileList.Any(t=>!t.FileType.Contains(StaticData.FileType.Zip)))
-                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true }).ToListAsync();
 
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).FirstNotNullAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).Select(t => new { t.BlindSubjectCode, t.TrialReadingCriterionId, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();
+
+
+            IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
+            if (inDto.VisistTaskId == null)
+            {
+                noneDicomStudyQueryable = _noneDicomStudyRepository
+                    .Where(t => visitIds.Contains(t.SubjectVisitId) && t.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip)))
+                    .WhereIf(taskinfo.IsImageFilter == true, t => taskinfo.CriterionModalitys.Contains(t.Modality))
+                    .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true });
+            }
+            else
+            {
+                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == inDto.VisistTaskId))
+                          .Where(t => visitIds.Contains(t.SubjectVisitId))
+                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true, visiTaskId = inDto.VisistTaskId });
+            }
+            List<NoneDicomStudyView> result = await noneDicomStudyQueryable.ToListAsync();
+
 
             var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
             {
@@ -121,7 +138,7 @@ namespace IRaCIS.Application.Services
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).FirstNotNullAsync();
 
-            return ResponseOutput.Ok (result, new
+            return ResponseOutput.Ok(result, new
             {
                 VisitTaskId = task.VisitTaskId,
                 SubjectId = task.SubjectId,

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -654,7 +654,7 @@ namespace IRaCIS.Application.Services
 
 
             var query = subjectVisitQuery.Union(readMouduleQuery)
-                 .WhereIf(inQuery.SubjectId != null, x => x.Id == inQuery.SubjectId)
+                 .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
                   .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteCode), x => x.TrialSiteCode.Contains(inQuery.TrialSiteCode))
                   .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectCode), x => x.SubjectCode.Contains(inQuery.SubjectCode))
                   .WhereIf(isFilterModuleType, t => t.ModuleType == inQuery.ModuleType)

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -67,7 +67,7 @@ namespace IRaCIS.Application.Services
                  .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.User.FullName).Contains(inQuery.UserRealName))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.User.OrganizationName.Contains(inQuery.OrganizationName))
-                .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider, new { trialSiteId = inQuery.TrialSiteId });
+                .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(inQuery);
 

IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs

@@ -98,7 +98,7 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
               .ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId))
               .ForMember(d => d.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName))
-              .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.SiteList.Any(k => k.TrialSiteId == trialSiteId)));
+              .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId)));
             CreateMap<User, AssginSiteCRCListDTO>();
 
             var trialId = Guid.Empty;

IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs

@@ -186,8 +186,11 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetReadingVisitStudyListIndto
     {
+        [NotDefault]
         public Guid TrialId { get; set; }
+        [NotDefault]
         public Guid SujectVisitId { get; set; }
+        [NotDefault]
         public Guid VisitTaskId { get; set; }
     }
 

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Services
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository
        ) : BaseService, ISubjectVisitService
     {
-       
+
 
         [HttpPost]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
@@ -541,7 +541,7 @@ namespace IRaCIS.Core.Application.Services
                         SeriesId = x.SeriesId,
                         StudyId = x.StudyId,
                         InstanceId = x.InstanceId,
-                        NumberOfFrames=x.NumberOfFrames,
+                        NumberOfFrames = x.NumberOfFrames,
                     }).ToListAsync();
 
 
@@ -594,20 +594,20 @@ namespace IRaCIS.Core.Application.Services
                                       HtmlPath = k.HtmlPath,
                                       Path = k.Path,
                                       InstanceNumber = k.InstanceNumber,
-                                      StudyId= k.StudyId,
-                                      SeriesId= k.SeriesId,
+                                      StudyId = k.StudyId,
+                                      SeriesId = k.SeriesId,
                                   }).ToListAsync();
 
                                 item.InstanceInfoList.ForEach(x =>
                                 {
 
-                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id&&y.NumberOfFrames!=0).Select(y => y.NumberOfFrames).Distinct().ToList();
+                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0).Select(y => y.NumberOfFrames).Distinct().ToList();
 
                                     if (keyFramesList.Count() > 0)
                                     {
                                         x.KeyFramesList = keyFramesList;
                                     }
-                                   
+
                                     var item = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id);
                                     if (item != null)
                                     {
@@ -632,7 +632,7 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-                            studyList.Insert(0,thisVisitTaskStudy);
+                            studyList.Insert(0, thisVisitTaskStudy);
 
                         }
 
@@ -658,7 +658,7 @@ namespace IRaCIS.Core.Application.Services
             #region 非Dicom 检查查询
 
             var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId && x.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip)))
-                  .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality) ).ToListAsync();
+                  .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality)).ToListAsync();
 
 
             List<VisitStudyDTO> noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()
@@ -672,11 +672,14 @@ namespace IRaCIS.Core.Application.Services
 
             }).ToList();
 
+            var isExistTaskNoneDicomFile = _noneDicomStudyFileRepository.Any(t => t.VisitTaskId == indto.VisitTaskId);
+
             foreach (var item in noDicomStudyList)
             {
                 var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
 
-                var instanceCount = await _noneDicomStudyFileRepository.Where(x => x.NoneDicomStudyId == item.StudyId).CountAsync();
+                var instanceCount = await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile,x=>x.OriginNoneDicomStudyId== item.StudyId)
+                    .WhereIf(isExistTaskNoneDicomFile==false, x=>x.NoneDicomStudyId == item.StudyId).CountAsync();
 
                 if (instanceCount == 0)
                 {
@@ -697,7 +700,9 @@ namespace IRaCIS.Core.Application.Services
                     SubjectVisitId=nodicom.SubjectVisitId,
                     SubjectId=nodicom.SubjectId,
                     SeriesNumber=1,
-                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId && !x.FileType.Contains(StaticData.FileType.Zip)).Select(x=>x.Path).FirstOrDefaultAsync(),
+                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile,x=>x.OriginNoneDicomStudyId== item.StudyId)
+                    .WhereIf(isExistTaskNoneDicomFile==false, x=>x.NoneDicomStudyId == item.StudyId)
+                    .Where(x=> !x.FileType.Contains(StaticData.FileType.Zip)).Select(x=>x.Path).FirstOrDefaultAsync(),
                     }
 
                 };