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

IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs

@@ -30,6 +30,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public new List<UserTypeEnum> CopyUserTypeList => TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(t => t.UserType).ToList();
 
         public List<CriterionType>? SysCriterionTypeList { get; set; }
+
     }
 
 
@@ -127,7 +128,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid SubjectId { get; set; }
 
-        public Guid TrialReadingCriterionId { get; set; }
+        public CriterionType CriterionType { get; set; }
 
         public EmailBusinessScenario BusinessScenarioEnum { get; set; }
     }

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -102,7 +102,7 @@ namespace IRaCIS.Core.Application.Services
             {
                 IsPublish = true,
                 IsDeleted = false,
-            },false,true);
+            }, false, true);
             await _trialDocumentRepository.SaveChangesAsync();
             Console.WriteLine("开始 发布项目文档");
 
@@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Services
                 {
                     // 从新作用域解析服务
                     var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new ImageQCRecurringEvent { TrialId= Guid.Parse("08de2254-5d7d-581a-0242-0a0001000000") });
+                    await mediator.Publish(new ImageQCRecurringEvent { TrialId = Guid.Parse("08de2254-5d7d-581a-0242-0a0001000000") });
                 }
             });
             return ResponseOutput.Result(true);
@@ -171,7 +171,7 @@ namespace IRaCIS.Core.Application.Services
             .WhereIf(inQuery.UserTypeId != null, t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId))
             .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
             .WhereIf(inQuery.IsPublish != null, t => t.IsPublish == inQuery.IsPublish)
-            .WhereIf(!string.IsNullOrEmpty(inQuery.FileTypeCode), t => t.FileType.Code== inQuery.FileTypeCode)
+            .WhereIf(!string.IsNullOrEmpty(inQuery.FileTypeCode), t => t.FileType.Code == inQuery.FileTypeCode)
             .ProjectTo<TrialDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, isEn_Us = _userInfo.IsEn_Us });
 
             return await trialDocumentQueryable.ToPagedListAsync(inQuery);
@@ -180,7 +180,7 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<PageOutput<TrialSignDocView>> GetTrialSignDocumentList(TrialDocQuery inQuery)
         {
-            var trialDocQueryable = from trialDoc in _trialDocumentRepository.Where(t=>t.IsPublish)
+            var trialDocQueryable = from trialDoc in _trialDocumentRepository.Where(t => t.IsPublish)
                                     .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId)
                                     .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
 
@@ -353,7 +353,7 @@ namespace IRaCIS.Core.Application.Services
             #region 统一用户修改 
 
             var systemDocQuery =
-                 from sysDoc in _systemDocumentRepository.Where(t=>t.IsPublish).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                 from sysDoc in _systemDocumentRepository.Where(t => t.IsPublish).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                  from trialUser in _trialIdentityUserRepository.AsQueryable(false)
@@ -392,7 +392,7 @@ namespace IRaCIS.Core.Application.Services
 
             //项目文档查询
             var trialDocQuery =
-                  from trialDoc in _trialDocumentRepository.Where(t=>t.IsPublish).Where(t => t.TrialId == inQuery.TrialId).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                  from trialDoc in _trialDocumentRepository.Where(t => t.IsPublish).Where(t => t.TrialId == inQuery.TrialId).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                   from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId && t.IdentityUserId == _userInfo.IdentityUserId
                                 && t.TrialUserRoleList.Any(t => trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
 
@@ -582,7 +582,7 @@ namespace IRaCIS.Core.Application.Services
             #endregion
 
 
-            var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t=>t.IsPublish)
+            var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t => t.IsPublish)
                        .Where(t => t.TrialId == inQuery.TrialId && t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
                        .Where(t => t.Trial.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)))
                        .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
@@ -713,7 +713,8 @@ namespace IRaCIS.Core.Application.Services
                 .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime)
                .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
                 .WhereIf(!string.IsNullOrEmpty(inQuery.UserName), t => t.UserName.Contains(inQuery.UserName))
-                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted);
+                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA, t => t.ConfirmTime != null);
 
             var result = await unionQuery.ToPagedListAsync(inQuery);
 
@@ -945,7 +946,7 @@ namespace IRaCIS.Core.Application.Services
             var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
 
             //EA 但是没有在进行的培训记录查看权限，那么返回空数据
-            if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing && t.AuditRecordIdentityUserList.Any(c=>c.IdentityUserId==_userInfo.IdentityUserId)))
+            if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing && t.AuditRecordIdentityUserList.Any(c => c.IdentityUserId == _userInfo.IdentityUserId)))
             {
                 return ResponseOutput.Ok(new PageOutput<UnionDocumentWithConfirmInfoView>());
             }
@@ -1113,7 +1114,7 @@ namespace IRaCIS.Core.Application.Services
 
                 _mapper.Map(addOrEditTrialDocument, document);
                 document.UpdateTime = DateTime.Now;
-               
+
                 #region 不区分路径了
 
                 //if (document.FileTypeId != addOrEditTrialDocument.FileTypeId)

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -773,10 +773,12 @@ namespace IRaCIS.Core.Application.Service
         {
             var subjectId = generateEmailCommand.SubjectId;
             var businessScenarioEnum = generateEmailCommand.BusinessScenarioEnum;
-            var trialReadingCriterionId = generateEmailCommand.TrialReadingCriterionId;
+            var criterionType = generateEmailCommand.CriterionType;
 
 
-            var trialConfig = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.IsEnrollementQualificationConfirm, t.Trial.IsPDProgressView }).FirstNotNullAsync();
+
+            var trialConfig = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.IsEnrollementQualificationConfirm, t.Trial.IsPDProgressView, t.TrialId }).FirstNotNullAsync();
+            var trialReadingCriterionId = _readingQuestionCriterionTrialRepository.Where(t => t.CriterionType == criterionType && t.TrialId == trialConfig.TrialId).Select(t => t.Id).FirstOrDefault();
 
             //找到入组确认 或者Pd 进展   已生成任务的  访视
             var subjectVisitList = await _subjectVisitRepository.Where(t => t.SubjectId == subjectId & t.CheckState == CheckStateEnum.CVPassed && (t.IsEnrollmentConfirm == true || t.PDState == PDStateEnum.PDProgress)).ToListAsync();
@@ -1671,10 +1673,10 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
         {
             //await SyncSystemEmainCofigDocListAsync(inQuery.TrialId);
 
-            var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
+            var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView, TrialCriterionTypeList = t.TrialReadingCriterionList.Where(t => t.IsSigned).Select(t => t.CriterionType).ToList() }).First();
 
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
-               .WhereIf(inQuery.EmailTopic.IsNotNullOrEmpty(), t => t.EmailTopic.Contains(inQuery.EmailTopic)||t.EmailTopicCN.Contains(inQuery.EmailTopic))
+               .WhereIf(inQuery.EmailTopic.IsNotNullOrEmpty(), t => t.EmailTopic.Contains(inQuery.EmailTopic) || t.EmailTopicCN.Contains(inQuery.EmailTopic))
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.IsDistinguishCriteria == false)
               .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.IsDistinguishCriteria == true)
               .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(c => c == inQuery.CriterionTypeEnum))
@@ -1692,6 +1694,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
             var orderQuery = inQuery.Asc ? trialEmailNoticeConfigQueryable.OrderBy(sortField) : trialEmailNoticeConfigQueryable.OrderBy(sortField + " desc");
             var list = await orderQuery.ToListAsync();
 
+
             return ResponseOutput.Ok(list, trialConfig);
         }
 

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

@@ -134,6 +134,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string Bodypart { get; set; } = string.Empty;
 
+        public string BodyPartForEditOther { get; set; } = string.Empty;
+
         public DateTime? StudyTime { get; set; }
 
 

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

@@ -1192,7 +1192,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     if (isSucess)
                     {
-                        await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                        await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic["DICOMDIR"]}" });
                     }
 
                 }
@@ -1632,11 +1632,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     {
                         if (isTaskStudy)
                         {
-                            await _taskStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new TaskStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                            await _taskStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new TaskStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic["DICOMDIR"]}" });
                         }
                         else
                         {
-                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic["DICOMDIR"]}" });
                         }
 
                     }
@@ -2310,7 +2310,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         if (isSucess)
                         {
-                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic["DICOMDIR"]}" });
                         }
                     }
                 }

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

@@ -382,7 +382,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         Id = t.Id,
 
-                        Bodypart = t.BodyPartExamined,
+                        Bodypart = t.BodyPartForEdit,
+                        BodyPartForEditOther = t.BodyPartForEditOther,
 
                         Modalities = t.Modalities,
 
@@ -433,6 +434,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                      Id = t.Id,
 
                      Bodypart = t.BodyPart,
+                     BodyPartForEditOther=t.BodyPartForEditOther,
 
                      Modalities = t.Modality,
 

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

@@ -1,4 +1,5 @@
-using IRaCIS.Application.Contracts;
+using Aliyun.OSS;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
@@ -32,7 +33,7 @@ namespace IRaCIS.Core.Application
         IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
         IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
          IRepository<SystemCriterionKeyFile> _systemCriterionKeyFileRepository,
-            IOSSService oSSService,
+            IOSSService _oSSService,
           IRepository<TrialCriterionKeyFile> _trialCriterionKeyFileRepository,
         IOrganInfoService _iOrganInfoService,
         IRepository<TrialBodyPart> _trialBodyPartRepository,
@@ -331,22 +332,22 @@ namespace IRaCIS.Core.Application
         public async Task SynchronizeKeyFile(Guid TrialReadingCriterionId)
         {
             var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == TrialReadingCriterionId).AsNoTracking().FirstOrDefaultAsync();
-            if (trialCriterion != null && trialCriterion.ReadingQuestionCriterionSystemId!=null) 
+            if (trialCriterion != null && trialCriterion.ReadingQuestionCriterionSystemId != null)
             {
                 var systemCriterionKeyFile = await _systemCriterionKeyFileRepository.Where(x => x.SystemCriterionId == trialCriterion.ReadingQuestionCriterionSystemId).ToListAsync();
 
-                List<TrialCriterionKeyFile> trialCriterionKeyFiles= new List<TrialCriterionKeyFile>();
+                List<TrialCriterionKeyFile> trialCriterionKeyFiles = new List<TrialCriterionKeyFile>();
 
-                foreach (var item in systemCriterionKeyFile) 
+                foreach (var item in systemCriterionKeyFile)
                 {
 
-                    var path=  await oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/ReadingModule/{trialCriterion.CriterionName}", true,true);
+                    var path = await _oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/ReadingModule/{trialCriterion.CriterionName}", true, true);
 
                     trialCriterionKeyFiles.Add(new TrialCriterionKeyFile
                     {
-                        TrialCriterionId= TrialReadingCriterionId,
-                        FileName= item.FileName,
-                        FilePath= path
+                        TrialCriterionId = TrialReadingCriterionId,
+                        FileName = item.FileName,
+                        FilePath = path
                     });
                 }
 
@@ -1325,6 +1326,18 @@ namespace IRaCIS.Core.Application
 
                 await _trialRepository.BatchUpdateNoTrackingAsync(u => u.Id == trialId, s => new Trial { TrialFinishedTime = DateTime.Now });
 
+
+                if (_readingQuestionCriterionTrialRepository.Any(t => t.IsSigned && t.ImageUploadEnum != ReadingImageUpload.None))
+                {
+                    await _oSSService.SetImmediateArchiveRule($"{trial.Id}/Image/");
+                    await _oSSService.SetImmediateArchiveRule($"{trial.Id}/TaskImage/");
+
+                }
+                else
+                {
+                    await _oSSService.SetImmediateArchiveRule($"{trial.Id}/Image/");
+                }
+
             }
 
             await _fusionCache.SetAsync(CacheKeys.Trial(trial.Id.ToString()), trialStatusStr, TimeSpan.FromDays(7));
@@ -1546,7 +1559,7 @@ namespace IRaCIS.Core.Application
         [AllowAnonymous]
         public async Task<TrialConfigInfo> GetTrialExtralConfig(Guid trialId)
         {
-            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr,t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault();
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault();
 
             var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 

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

@@ -338,6 +338,7 @@ namespace IRaCIS.Core.Application.Service
                 trial.DeclarationTypes = $"|{string.Join('|', updateModel.DeclarationTypeEnumList.Select(x => ((int)x).ToString()).ToList())}|";
                 trial.AttendedReviewerTypes = $"|{string.Join('|', updateModel.AttendedReviewerTypeEnumList.Select(x => ((int)x).ToString()).ToList())}|";
 
+                trial.EmailFromName = $"{_systemEmailConfig.FromName}-{trial.TrialCode}";
                 trial.UpdateTime = DateTime.Now;