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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -14217,6 +14217,11 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.PublishLogAddOrEdit">
             <summary> PublishLogAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.SysFileTypeAddOrEdit.ShowOrder">
+            <summary>
+            显示顺序    
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigView">
             <summary> TrialEmailNoticeConfigView  列表视图模型 </summary>
         </member>
@@ -15399,15 +15404,6 @@
         <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileView">
             <summary> NoneDicomStudyFileView  列表视图模型 </summary>
         </member>
-        <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileQuery">
-            <summary>NoneDicomStudyFileQuery  列表查询参数模型</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileQuery.Path">
-            <summary> Path</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileQuery.FileName">
-            <summary> FileName</summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileAddOrEdit">
             <summary> NoneDicomStudyFileAddOrEdit  列表查询参数模型</summary>
         </member>

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

@@ -33,7 +33,8 @@ namespace IRaCIS.Core.Application.Contracts
             [FromQuery, NotDefault] Guid subjectVisitId,
             [FromQuery] Guid? nonedicomStudyId,
             [FromQuery] bool isFilterZip,
-            [FromQuery] Guid? visitTaskId)
+            [FromQuery] Guid? visitTaskId,
+            [FromQuery] bool isReading)
         {
             var qcAuditState = await _subjectVisitRepository.Where(s => s.Id == subjectVisitId).Select(t => t.AuditState).FirstOrDefaultAsync();
 
@@ -47,9 +48,12 @@ namespace IRaCIS.Core.Application.Contracts
             if (visitTaskId == null)
             {
                 //质控过程中，需要忽略过滤质控设置删除的检查，以及设置删除的文件，质控通过后才
-                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete).WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
+                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete)
+                    .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
+                    .WhereIf(isReading, t => t.IsReading && t.IsDeleted==false)
 
-             .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip });
+
+             .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip, isReading= isReading });
             }
             else
             {
@@ -57,9 +61,10 @@ namespace IRaCIS.Core.Application.Contracts
 
 
                 noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == visitTaskId), ignoreQueryFilters: isIgnoreDelete)
+                .WhereIf(isReading, t => t.IsReading && t.IsDeleted == false)
                 .Where(t => taskinfo.IsImageFilter ? ("|" + taskinfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
                 .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
-                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip, visiTaskId = visitTaskId });
+                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip, visiTaskId = visitTaskId, isReading = isReading });
             }
 
 

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

@@ -6,6 +6,7 @@ using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.MassTransit.Command;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
+using NPOI.SS.Formula.Functions;
 using System.Linq;
 
 namespace IRaCIS.Core.Application.Service
@@ -403,6 +404,8 @@ namespace IRaCIS.Core.Application.Service
 
             bool isIgnoreDelete = false;
 
+            bool isReading = false;
+
 
             string token = string.Empty;
             //一致性核查
@@ -722,14 +725,16 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path));
 
             CreateMap<NoneDicomStudy, NoneDicomStudyView>()
-                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ? s.NoneDicomFileList.Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName) : s.NoneDicomFileList.OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
+                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ?
+                s.NoneDicomFileList.Where(t => !t.FileType.Contains(StaticData.FileType.Zip) && isReading ? t.IsReading && t.IsDeleted == false : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName) :
+                s.NoneDicomFileList.Where(t => isReading ? t.IsReading && t.IsDeleted==false : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
             Guid? visiTaskId = null;
             CreateMap<NoneDicomStudy, TaskDicomStudyView>()
                 .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ?
-                s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)
-                : s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
+                s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip) && isReading ? t.IsReading && t.IsDeleted == false : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)
+                : s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => isReading ? t.IsReading && t.IsDeleted == false : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
         }

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

@@ -135,17 +135,18 @@ namespace IRaCIS.Core.Application.Service
 
             IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
 
-            noneDicomStudyQueryable = _noneDicomStudyRepository
+            noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.IsReading)
                 .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 });
+                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true, isReading = true });
 
             if (inDto.VisistTaskId != null && _noneDicomStudyFileSystem.Any(t => t.VisitTaskId == inDto.VisistTaskId))
             {
-                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == inDto.VisistTaskId))
+                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.IsReading)
+                    .Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == inDto.VisistTaskId))
                 .Where(t => taskinfo.IsImageFilter ? ("|" + taskinfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
                 .Where(t => visitIds.Contains(t.SubjectVisitId))
-                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true, visiTaskId = inDto.VisistTaskId });
+                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true, isReading = true, visiTaskId = inDto.VisistTaskId });
             }
 
             List<NoneDicomStudyView> result = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();

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

@@ -231,8 +231,9 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-            var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId)
+            var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).IgnoreQueryFilters()
             .Where(t => isImageFilter ? ("|" + criterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
+            .WhereIf(isReading == 1 || isQCFinished, s=> s.IsDeleted == false)
                 .Select(k => new VisitStudyDTO()
                 {
                     InstanceCount = k.InstanceCount,
@@ -241,6 +242,7 @@ namespace IRaCIS.Core.Application.Services
                     StudyCode = k.StudyCode,
                     StudyId = k.Id
                 }).ToListAsync();
+
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
             var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()