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

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

@@ -1027,8 +1027,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
            //满足前序访视不存在 需要签署但是未签署  sql  相当复杂    同时想查询所有未读的统计数字 就无法统计   byzhouhang  
            //但是加字段 IsFrontTaskNeedSignButNotSign   那么签名临床数据的时候，要对该subject 该标准的有效的任务  这个字段需要在签名的时候维护   采取这种方式   统计数字灵活
            //.Where(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum))
-           .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate));
+           .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate))
-
+           ;
 
             var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 
@@ -1171,7 +1171,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             var visitQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect)
                 .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
-                .WhereIf(!string.IsNullOrEmpty(subjectCode), t => (t.Subject.Code.Contains(subjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(subjectCode!) && t.IsAnalysisCreate));
+                .WhereIf(!string.IsNullOrEmpty(subjectCode), t => (t.Subject.Code.Contains(subjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(subjectCode!) && t.IsAnalysisCreate))
+                .WhereIf(critrion.CriterionType == CriterionType.OCT, t => t.ReadingCategory == ReadingCategory.Visit ? t.SourceSubjectVisit.NoneDicomStudyList.SelectMany(t => t.ImageLabelNoneDicomFileList).Any() : true)
+                .WhereIf(critrion.CriterionType == CriterionType.IVUS, t => t.ReadingCategory == ReadingCategory.Visit ? t.SourceSubjectVisit.TaskStudyList.Any() : true);
 
             var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 

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

@@ -1027,7 +1027,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid? SourceSubjectVisitId => SubjectVisitId;
 
-
+        //防止前端null 故意返回
+        public Guid VisitTaskId { get; set; }
 
         public List<StudyBasicInfo> OrginalStudyList { get; set; }
 

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

@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             //要根据标准阅片顺序，确定是否查询单个任务的，还是查询所有的
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
-                 .Select(t => new { t.IsReadingTaskViewInOrder, t.Trial.Modalitys }).FirstNotNullAsync();
+                 .Select(t => new { t.IsReadingTaskViewInOrder, t.Trial.Modalitys, t.IsImageFilter, t.CriterionModalitys }).FirstNotNullAsync();
 
             var subjectCode = string.Empty;
             var subjectId = inQuery.SubjectId;
@@ -329,7 +329,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     foreach (var item in list)
                     {
-                        item.OrginalStudyList.AddRange(item.OriginalTaskStudyList);
+                        item.OrginalStudyList.AddRange(item.OriginalTaskStudyList.WhereIf(criterionInfo.IsImageFilter, t => ("|" + criterionInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|")));
                     }
                 }
 
@@ -824,39 +824,68 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
         [HttpDelete]
-        public async Task<IResponseOutput> DeleteTaskStudy(Guid visitTaskId, bool isDicom, Guid? dicomStudyId, Guid? noneDicomStudyId)
+        public async Task<IResponseOutput> DeleteTaskStudy(Guid visitTaskId, Guid? subjectVisitId, bool isDicom, Guid? dicomStudyId, Guid? noneDicomStudyId)
         {
             if (isDicom)
             {
-                if (dicomStudyId == null)
+                //靶段标注删除访视影像
+                if (visitTaskId == Guid.Empty && subjectVisitId != null && subjectVisitId != Guid.Empty)
                 {
-                    var deleteStudyPathList = await _taskInstanceRepository.Where(t => t.VisitTaskId == visitTaskId).GroupBy(t => t.StudyId).Select(g => g.First().Path).ToListAsync();
+                    var fisrtPath = await _taskInstanceRepository.Where(t => t.SubjectVisitId == subjectVisitId).Select(t => t.Path).FirstOrDefaultAsync();
-
-                    foreach (var fisrtPath in deleteStudyPathList)
-                    {
-                        var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
-                        await _oSSService.DeleteFromPrefix(prefix, true);
-                    }
-
-
-                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId);
-                    await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
-                    await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
-                }
-                else
-                {
-                    var fisrtPath = await _taskInstanceRepository.Where(t => t.VisitTaskId == visitTaskId && t.StudyId == dicomStudyId).Select(t => t.Path).FirstOrDefaultAsync();
                     var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
                     await _oSSService.DeleteFromPrefix(prefix, true);
 
-                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.SubjectVisitId == subjectVisitId);
-                    await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                    await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
-                    await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                    await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
                 }
+
+                if (visitTaskId != Guid.Empty)
+                {
+                    if (dicomStudyId == null)
+                    {
+                        var deleteStudyPathList = await _taskInstanceRepository.Where(t => t.VisitTaskId == visitTaskId).GroupBy(t => t.StudyId).Select(g => g.First().Path).ToListAsync();
+
+                        foreach (var fisrtPath in deleteStudyPathList)
+                        {
+                            var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
+                            await _oSSService.DeleteFromPrefix(prefix, true);
+                        }
+
+
+                        await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId);
+                        await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
+                        await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
+                    }
+                    else
+                    {
+                        var fisrtPath = await _taskInstanceRepository.Where(t => t.VisitTaskId == visitTaskId && t.StudyId == dicomStudyId).Select(t => t.Path).FirstOrDefaultAsync();
+                        var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
+                        await _oSSService.DeleteFromPrefix(prefix, true);
+
+                        await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                        await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                        await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                    }
+                }
+
             }
             else
             {
-                await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
+                if (visitTaskId == Guid.Empty)
+                {
+
+                    //删除靶段标注非dicom
+                    await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.ImageLabelNoneDicomStudyId == noneDicomStudyId);
+
+                }
+                else
+                {
+                    //删除后处理非dicom
+                    await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
+
+                }
+
             }
 
             await _noneDicomStudyFileReposiotry.SaveChangesAsync();
@@ -932,7 +961,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             Path = t.Path
                         }).ToList(),
 
-                        ReadingFileCount = u.FileCount,
+                        ReadingFileCount = u.NoneDicomFileList.Where(t => t.IsReading).Count(),
 
                     }).ToList();
 
@@ -984,7 +1013,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 ImageDate = ns.ImageDate,
                                 BodyPart = ns.BodyPart,
                                 BodyPartForEditOther = ns.BodyPartForEditOther,
-                                FileCount = ns.FileCount,
+
                                 Modality = ns.Modality,
                                 StudyCode = ns.StudyCode,
 
@@ -998,7 +1027,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                     Path = t.Path
                                 }).ToList(),
 
-                                ReadingFileCount = ns.FileCount,
+                                FileCount = (inQuery.IsImageSegmentLabel == false ? ns.ImageLabelNoneDicomFileList : ns.NoneDicomFileList).Count(),
+                                ReadingFileCount = (inQuery.IsImageSegmentLabel == false ? ns.ImageLabelNoneDicomFileList : ns.NoneDicomFileList).Where(t => t.IsReading).Count(),
 
                             };
 

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

@@ -502,7 +502,24 @@ namespace IRaCIS.Core.Application.Services
 
             var studyList = new List<VisitStudyDTO>();
 
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(t => new { t.TrialReadingCriterionId, t.TrialReadingCriterion.CriterionType, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys, t.ReadingTaskState, TaskStudyCount = t.TaskStudyList.Count }).FirstNotNullAsync();
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(t => new
+            {
+                t.TrialReadingCriterionId,
+                t.TrialReadingCriterion.CriterionType,
+                t.TrialReadingCriterion.IsImageFilter,
+                t.TrialReadingCriterion.CriterionModalitys,
+                t.ReadingTaskState,
+
+                //是否有了后处理的dicom检查
+                IsHaveTaskStudy = t.TaskStudyList.Any(),
+                //是否有了后处理的NoneDicom检查
+                IsHaveTaskNoneDicomStudyFile = t.SourceSubjectVisit.NoneDicomStudyList.SelectMany(c => c.TaskNoneDicomFileList.Where(t => t.VisitTaskId == indto.VisitTaskId)).Any(),
+                //是否有了标注的dicom检查
+                IsMarkDicomStudy = t.SourceSubjectVisit.TaskStudyList.Any(),
+                //是否有了标注的NoneDicom检查
+                IsMarkNoneDicomStudy = t.SourceSubjectVisit.NoneDicomStudyList.SelectMany(c => c.ImageLabelNoneDicomFileList).Any()
+
+            }).FirstNotNullAsync();
 
 
 
@@ -516,8 +533,22 @@ namespace IRaCIS.Core.Application.Services
                 .WhereIf(taskInfo.IsImageFilter == true, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|"))
                 .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
                 //影像后处理  上传了新的影像 还要原始dsa
-                .WhereIf(taskInfo.TaskStudyCount > 0 && (taskInfo.CriterionType == CriterionType.OCT || taskInfo.CriterionType == CriterionType.IVUS), t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "OCT")
+                .WhereIf(taskInfo.IsHaveTaskStudy 
-                .WhereIf(taskInfo.TaskStudyCount > 0 && (taskInfo.CriterionType != CriterionType.OCT || taskInfo.CriterionType != CriterionType.IVUS), t => false)
+                && (taskInfo.CriterionType == CriterionType.OCT || taskInfo.CriterionType == CriterionType.IVUS),
+                t => t.ModalityForEdit == "XA")
+
+                 .WhereIf(taskInfo.IsHaveTaskStudy == false && taskInfo.IsMarkDicomStudy && taskInfo.CriterionType == CriterionType.IVUS,
+                t => t.ModalityForEdit == "XA" )
+ 
+                  .WhereIf(taskInfo.IsHaveTaskStudy == false && taskInfo.IsMarkDicomStudy && taskInfo.CriterionType == CriterionType.OCT,
+                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "OCT")
+
+                  .WhereIf(taskInfo.IsHaveTaskStudy == false && taskInfo.IsMarkDicomStudy == false
+                        && (taskInfo.CriterionType == CriterionType.OCT || taskInfo.CriterionType == CriterionType.IVUS),
+                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "OCT" || t.ModalityForEdit == "IVUS")
+
+                //其他 不应该看原始影像
+                .WhereIf(taskInfo.IsHaveTaskStudy && (taskInfo.CriterionType != CriterionType.OCT && taskInfo.CriterionType != CriterionType.IVUS), t => false)
                 .Select(k => new VisitStudyDTO()
                 {
                     InstanceCount = k.InstanceCount,
@@ -580,10 +611,12 @@ namespace IRaCIS.Core.Application.Services
             }
 
             //影像后处理  上传了新的影像
-            if (taskInfo.TaskStudyCount > 0)
+            if (taskInfo.IsHaveTaskStudy || taskInfo.IsMarkDicomStudy || taskInfo.IsMarkNoneDicomStudy)
             {
 
-                var taskStudyList = await _taskStudyRepository.Where(t => t.TrialId == indto.TrialId && t.VisitTaskId == indto.VisitTaskId)
+                var taskStudyList = await _taskStudyRepository.Where(t => t.TrialId == indto.TrialId)
+                    .WhereIf(taskInfo.IsHaveTaskStudy, t => t.VisitTaskId == indto.VisitTaskId)
+                    .WhereIf(taskInfo.IsHaveTaskStudy == false && (taskInfo.IsMarkDicomStudy || taskInfo.IsMarkNoneDicomStudy), t => t.SubjectVisitId == indto.SujectVisitId)
                     .WhereIf(taskInfo.IsImageFilter == true, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|"))
                     .ProjectTo<VisitStudyDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
@@ -742,8 +775,9 @@ 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)))
-                 .Where(t => t.IsReading)
+                .Where(t => t.IsReading)
-                .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality)).ToListAsync();
+                .WhereIf(taskInfo.IsImageFilter, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
+                .ToListAsync();
 
 
             List<VisitStudyDTO> noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()
@@ -761,15 +795,17 @@ namespace IRaCIS.Core.Application.Services
 
             }).ToList();
 
-            var isExistTaskNoneDicomFile = _noneDicomStudyFileRepository.Any(t => t.VisitTaskId == indto.VisitTaskId);
+            //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(t => t.IsReading)
-                    .WhereIf(isExistTaskNoneDicomFile, x => x.OriginNoneDicomStudyId == item.StudyId)
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile == false && taskInfo.IsMarkNoneDicomStudy == true, x => x.ImageLabelNoneDicomStudyId == item.StudyId)
-                    .WhereIf(isExistTaskNoneDicomFile == false, x => x.NoneDicomStudyId == item.StudyId).CountAsync();
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile && taskInfo.IsMarkNoneDicomStudy, x => x.OriginNoneDicomStudyId == item.StudyId)
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile == false && taskInfo.IsMarkNoneDicomStudy == false, x => x.NoneDicomStudyId == item.StudyId)
+                    .CountAsync();
 
                 if (instanceCount == 0)
                 {
@@ -790,8 +826,10 @@ namespace IRaCIS.Core.Application.Services
                     SubjectVisitId=nodicom.SubjectVisitId,
                     SubjectId=nodicom.SubjectId,
                     SeriesNumber=1,
-                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile,x=>x.OriginNoneDicomStudyId== item.StudyId)
+                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository
-                    .WhereIf(isExistTaskNoneDicomFile==false, x=>x.NoneDicomStudyId == item.StudyId)
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile == false && taskInfo.IsMarkNoneDicomStudy == true, x => x.ImageLabelNoneDicomStudyId == item.StudyId)
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile && taskInfo.IsMarkNoneDicomStudy, x => x.OriginNoneDicomStudyId == item.StudyId)
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile == false && taskInfo.IsMarkNoneDicomStudy == false, x => x.NoneDicomStudyId == item.StudyId)
                     .Where(x=> !x.FileType.Contains(StaticData.FileType.Zip)).Select(x=>x.Path).FirstOrDefaultAsync(),
                     }