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

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -485,7 +485,13 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
+            //创建账号 和创建角色 一条，更新的时候才记录更新角色
+            if (!sysUserInfo.IsFirstAdd)
+            {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
+
+            }
+
 
         }
 
@@ -547,7 +553,12 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
+            //创建账号 和创建角色 一条，更新的时候才记录更新角色
+            if (!sysUserInfo.IsFirstAdd)
+            {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
+
+            }
 
         }
 
@@ -673,7 +684,13 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = sysUserInfo.Id, OptType = UserOptType.UpdateUserRole }, true);
+            //创建账号 和创建角色 一条，更新的时候才记录更新角色
+            if (!sysUserInfo.IsFirstAdd)
+            {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = sysUserInfo.Id, OptType = UserOptType.UpdateUserRole }, true);
+
+            }
+
 
 
             return (sysUserInfo.Id, sysUserInfo.UserRoleList.First(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer).Id);

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

@@ -19,8 +19,14 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet("{seriesId:guid}")]
         public async Task<IResponseOutput<List<DicomInstanceDTO>>> List(Guid seriesId)
         {
-            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId)/*.OrderBy(s => s.SliceLocation)*/.OrderBy(s => s.InstanceNumber).
-                ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
+            var qcAuditState = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => t.DicomStudy.SubjectVisit.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId).IgnoreQueryFilters()
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                .OrderBy(s => s.InstanceNumber).ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new { t.DicomSerie.ImageResizePath,t.DicomSerie.IsDeleted,t.DicomSerie.IsReading }).FirstOrDefaultAsync();

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

@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Services
     [ApiExplorerSettings(GroupName = "Image")]
     [AllowAnonymous]
     public class SeriesService(IRepository<DicomSeries> _seriesRepository,
-        IRepository<DicomInstance> _instanceRepository, 
+        IRepository<DicomInstance> _instanceRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService
     {
 
@@ -22,14 +22,25 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet, Route("{studyId:guid}")]
         public async Task<IResponseOutput<List<DicomSeriesDTO>>> List(Guid studyId)
         {
-             //断点
-            var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).OrderBy(s => s.SeriesNumber).
-              ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
+            //质控的时候，要标记序列，和instance 删除  ，所以要返回全部，但是 质控通过后，pm 进去看的时候要看过滤后的
+
+            var qcAuditState = await _seriesRepository.Where(s => s.StudyId == studyId).Select(t => t.DicomStudy.SubjectVisit.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，预览过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+            //断点
+            var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
               .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-            var instanceList = await _instanceRepository.Where(s => s.StudyId == studyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
-                        .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath ,t.IsReading,t.IsDeleted}).ToListAsync();//.GroupBy(u => u.SeriesId);
+            var instanceList = await _instanceRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
+                 .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                 .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
+                 .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
+                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();//.GroupBy(u => u.SeriesId);
+
 
             foreach (var series in seriesList)
             {
@@ -42,10 +53,12 @@ namespace IRaCIS.Core.Application.Services
                        HtmlPath = k.HtmlPath,
                        Path = k.Path,
                        InstanceNumber = k.InstanceNumber,
-                       IsReading=k.IsReading,
-                       IsDeleted=k.IsDeleted
+                       IsReading = k.IsReading,
+                       IsDeleted = k.IsDeleted
 
                    }).ToList();
+
+                series.InstanceCount = series.InstanceInfoList.Count;
             }
 
             #region 暂时废弃

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

@@ -63,12 +63,15 @@ namespace IRaCIS.Core.Application.Service
                 // .ForMember(o => o.InstancePathList, t => t.MapFrom(u => u.DicomInstanceList.OrderBy(t=>t.InstanceNumber).Select(t => t.Path)))
                 ;
 
+            var isNeedStat = false;
             CreateMap<DicomStudy, QAStudyInfoDTO>()
                 .ForMember(o => o.IsCompleteClinicalData, t => t.MapFrom(u => !u.ReadingClinicalDataList.Any(x => x.ReadingClinicalDataPDFList.Count() == 0)))
                 .ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
                 .ForMember(o => o.Uploader, t => t.MapFrom(u => u.CreateUserRole.IdentityUser.FullName))
                 .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))
-                 .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t => t.FailedFileCount > 0)))
+                .ForMember(o => o.SeriesCount, t => t.MapFrom(u => isNeedStat == false ? u.SeriesCount : u.SeriesList.Count()))
+                .ForMember(o => o.InstanceCount, t => t.MapFrom(u => isNeedStat == false ? u.InstanceCount : u.InstanceList.Count()))
+                .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t => t.FailedFileCount > 0)))
                 .ForMember(o => o.Modalities, t => t.MapFrom(u => string.Join('、', u.SeriesList.Select(t => t.Modality).Distinct())));
 
 

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -408,9 +408,9 @@ namespace IRaCIS.Core.Application.Image.QA
                                                 ParentTriggerValue = data.ParentTriggerValue,
                                                 Type = data.Type,
                                                 TypeValue = data.TypeValue
-                                            }).ToListAsync();
+                                            }).OrderBy(t => t.ShowOrder).ToListAsync();
 
-            var result = questionAnswerlist.Where(x => x.ParentId == null).ToList();
+            var result = questionAnswerlist.Where(x => x.ParentId == null).OrderBy(t=>t.ShowOrder).ToList();
             result.ForEach(x =>
             {
                 GetQuestionChild(x, questionAnswerlist);
@@ -422,7 +422,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
         private void GetQuestionChild(QCQuestionAnswer parent, List<QCQuestionAnswer> dataList)
         {
-            parent.Childrens = dataList.Where(x => x.ParentId == parent.Id).ToList();
+            parent.Childrens = dataList.Where(x => x.ParentId == parent.Id).OrderBy(t => t.ShowOrder).ToList();
 
             if (parent.Childrens.Count != 0)
             {
@@ -525,9 +525,16 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpGet("{subjectVisitId:guid}")]
         public async Task<IResponseOutput<List<QAStudyInfoDTO>>> GetSubjectVisitUploadedStudyList(Guid subjectVisitId)
         {
+            var qcAuditState = await _subjectVisitRepository.Where(s => s.Id == subjectVisitId).Select(t => t.AuditState).FirstOrDefaultAsync();
+
+            //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+            var isNeedStat = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished;
 
             var visit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).FirstNotNullAsync();
-            var list = await _dicomStudyRepository.Where(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).OrderBy(t => t.StudyCode).ToListAsync();
+
+            var list = await _dicomStudyRepository.Where(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider,new { isNeedStat= isNeedStat }).OrderBy(t => t.StudyCode).ToListAsync();
 
 
             var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => t.Trial).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();

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

@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.Service
                 (arbitrationRule == ArbitrationRule.Reading ?
                 u.Subject.SubjectVisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && u.VisitTaskNum < t.VisitTaskNum) :
                 false)))
-               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory == ReadingCategory.Judge ? u.JudgeResultRemark : u.JudgeVisitTask.JudgeResultRemark))
+               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory == ReadingCategory.Judge ? u.JudgeResultRemark : ""))
                .ForMember(o => o.VisitNote, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.AdjustReason).FirstOrDefault()!.Answer))
                 //.ForMember(o => o.IsSubjectHaveReadingPeriod, t => t.MapFrom(u => arbitrationRule == ArbitrationRule.Reading ?
                 //u.Subject.ReadModuleList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading) : false))

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

@@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpPost]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput<string>> AddOrUpdateSV(SubjectVisitCommand svCommand)
@@ -161,7 +161,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{isUrgent:bool}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_IQC)]
         public async Task<IResponseOutput> SetSubjectVisitUrgent(Guid subjectVisitId, bool isUrgent)
         {
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpDelete, Route("{trialId:guid}/{id:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> DeleteSV(Guid id)
         {
@@ -212,6 +212,13 @@ namespace IRaCIS.Core.Application.Services
         [AllowAnonymous]
         public async Task<List<VisitStudyDTO>> GetVisitStudyList(Guid trialId, Guid sujectVisitId, int isReading, [FromQuery] Guid? visitTaskId)
         {
+
+            var qcAuditState = await _subjectVisitRepository.Where(s => s.Id == sujectVisitId).Select(t => t.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+
             var isImageFilter = false;
             var criterionModalitys = "";
             if (visitTaskId != null)
@@ -236,14 +243,17 @@ namespace IRaCIS.Core.Application.Services
                 }).ToListAsync();
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
-            var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId))
-                   .WhereIf(isReading == 1, s => s.IsReading)
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath,t.IsReading,t.IsDeleted }).ToListAsync();
+            var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()
+                   .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
+                   .WhereIf(isQCFinished, t => t.IsDeleted == false)
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();
 
             foreach (var t in studyList)
             {
-                t.SeriesList = await _dicomSeriesRepository.Where(s => s.StudyId == t.StudyId)
-               .WhereIf(isReading == 1, s => s.IsReading).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
+                t.SeriesList = await _dicomSeriesRepository.Where(s => s.StudyId == t.StudyId).IgnoreQueryFilters()
+               .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+               .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
                .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
 
@@ -258,9 +268,11 @@ namespace IRaCIS.Core.Application.Services
                         HtmlPath = k.HtmlPath,
                         Path = k.Path,
                         InstanceNumber = k.InstanceNumber,
-                        IsReading=k.IsReading,
-                        IsDeleted=k.IsDeleted,
+                        IsReading = k.IsReading,
+                        IsDeleted = k.IsDeleted,
                     }).ToList();
+
+                    series.InstanceCount = series.InstanceInfoList.Count();
                 }
                 );
 
@@ -501,7 +513,7 @@ namespace IRaCIS.Core.Application.Services
                 var studyIds = dicomStudyList.Select(t => t.StudyId).ToList();
 
                 var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId) && t.IsReading)
-                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath,t.IsReading }).ToListAsync();
+                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.IsReading }).ToListAsync();
 
                 List<DicomSeriesDTO> seriesLists = await _dicomSeriesRepository.Where(s => studyIds.Contains(s.StudyId))
                      .WhereIf(isManualGenerate == false, t => t.IsReading)
@@ -525,6 +537,9 @@ namespace IRaCIS.Core.Application.Services
 
                        }).ToList();
 
+                        // 设置阅片 不阅片，数字要要重新统计
+                        series.InstanceCount = series.InstanceInfoList.Count;
+
                         //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
                         //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
                     });
@@ -610,7 +625,7 @@ namespace IRaCIS.Core.Application.Services
                                 item.InstanceInfoList.ForEach(x =>
                                 {
 
-                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0&&y.NumberOfFrames!=null).Select(y => y.NumberOfFrames).Distinct().ToList();
+                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0 && y.NumberOfFrames != null).Select(y => y.NumberOfFrames).Distinct().ToList();
 
                                     if (keyFramesList.Count() > 0)
                                     {
@@ -724,9 +739,18 @@ namespace IRaCIS.Core.Application.Services
             #endregion
 
 
+            #region 过滤空序列得检查 过滤空instance得序列
+
+            foreach (var study in studyList)
+            {
+                study.SeriesList = study.SeriesList.Where(t => t.InstanceCount > 0).ToList();
+            }
 
             var result = studyList.Where(x => x.SeriesCount > 0).ToList();
 
+            #endregion
+
+
             return result;
 
 
@@ -741,7 +765,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="subjectVisitId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [Obsolete]
         public async Task<IResponseOutput> SetSVExecuted(Guid subjectVisitId)
         {

IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs

@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Domain.Share
         InSecondaryQC = 6,
 
 
-        //任何QC设置为QC Failed
+        //任何QC设置为QC Failed--去掉了
         QCFailed = 7,
 
         //2nd QC设置为QC Passed

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -10,6 +10,9 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
     [JsonIgnore]
     public List<DicomSeries> SeriesList { get; set; }
 
+    [JsonIgnore]
+    public List<DicomInstance> InstanceList { get; set; }
+
     [JsonIgnore]
     [ForeignKey("SubjectId")]
     public Subject Subject { get; set; }

IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs

@@ -13,7 +13,7 @@ public class DicomStudyConfigration : IEntityTypeConfiguration<DicomStudy>
     {
         builder.HasKey(e => e.SeqId);
 
-        //builder.HasMany(s => s.InstanceList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
+        builder.HasMany(s => s.InstanceList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
 
         builder.HasMany(s => s.SeriesList).WithOne(se => se.DicomStudy).HasForeignKey(se => se.StudyId).HasPrincipalKey(st => st.Id);
 
@@ -42,7 +42,7 @@ public class DicomInstanceConfigration : IEntityTypeConfiguration<DicomInstance>
     {
         builder.HasKey(e => e.SeqId);
 
-        builder.HasOne(e => e.DicomStudy).WithMany().HasForeignKey(t=>t.StudyId).HasPrincipalKey(st => st.Id);
+        builder.HasOne(e => e.DicomStudy).WithMany(c=>c.InstanceList).HasForeignKey(t=>t.StudyId).HasPrincipalKey(st => st.Id);
 
         builder.HasMany(s => s.ReadingTableAnswerRowInfoList).WithOne(di => di.Instance).HasForeignKey(t => t.InstanceId).HasPrincipalKey(se => se.Id);