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

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 isFilterReading = false;
+
 
             string token = string.Empty;
             //一致性核查
@@ -722,7 +725,9 @@ 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) && isFilterReading ? t.IsReading : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName) :
+                s.NoneDicomFileList.Where(t => isFilterReading ? t.IsReading : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
             Guid? visiTaskId = null;

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

@@ -53,10 +53,10 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<GetNoneDicomMarkListOutDto> GetNoneDicomMarkListOutDto(GetNoneDicomMarkListInDtoDto inDto)
         {
-           var result=  await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
+            var result = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
 
-               .ProjectTo<AddNoneDicomMarkInDto>(_mapper.ConfigurationProvider)
+                .ProjectTo<AddNoneDicomMarkInDto>(_mapper.ConfigurationProvider)
-               .ToListAsync();
+                .ToListAsync();
 
             return new GetNoneDicomMarkListOutDto()
             {
@@ -82,7 +82,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> SaveVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -135,29 +135,30 @@ 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, isFilterReading = 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, isFilterReading = true, visiTaskId = inDto.VisistTaskId });
             }
 
-            List<NoneDicomStudyView> result = await noneDicomStudyQueryable.OrderBy(x=>x.ImageDate).ThenBy(x=>x.CreateTime).ToListAsync();
+            List<NoneDicomStudyView> result = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();
 
 
-            var nonoDicomStudyFileIds=await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisistTaskId).ToListAsync();
+            var nonoDicomStudyFileIds = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisistTaskId).ToListAsync();
-            if (nonoDicomStudyFileIds.Count > 0&& taskinfo.ReadingTaskState== ReadingTaskState.HaveSigned)
+            if (nonoDicomStudyFileIds.Count > 0 && taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
             {
                 var studyId = nonoDicomStudyFileIds.Select(x => x.StudyId).FirstOrDefault();
 
-                var noneDicomids= nonoDicomStudyFileIds.Select(x=>x.NoneDicomFileId).ToList();
+                var noneDicomids = nonoDicomStudyFileIds.Select(x => x.NoneDicomFileId).ToList();
-                var noneDicomStudyViewMark =new NoneDicomStudyView() { Id = Guid.NewGuid() };
+                var noneDicomStudyViewMark = new NoneDicomStudyView() { Id = Guid.NewGuid() };
                 noneDicomStudyViewMark.IsCriticalSequence = true;
                 noneDicomStudyViewMark.NoneDicomStudyFileList = await _noneDicomStudyFileRepository.Where(x => noneDicomids.Contains(x.Id)).ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();
                 result.Insert(0, noneDicomStudyViewMark);