后处理访视

2024-09-24 11:25:08 +08:00
parent 1fcb871de2
commit c71b58e0e9
4 changed files with 22 additions and 3 deletions
@@ -415,6 +415,8 @@ namespace IRaCIS.Core.Application.Contracts

        [NotDefault]
        public string SubjectCode { get; set; }
+
+        public Guid? VisitTaskId { get; set; }
    }

    public class IRTaskUploadedDicomStudyQuery
@@ -112,8 +112,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        {
            await SubejctRandomReadingTaskNameDeal(inQuery.SubjectId, inQuery.TrialReadingCriterionId);

+            //要根据标准阅片顺序，确定是否查询单个任务的，还是查询所有的
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
+                 .Select(t => new { t.IsReadingTaskViewInOrder }).FirstNotNullAsync();
+
            var query = _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SourceSubjectVisitId != null
            && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+                //满足 有序，或者随机只看到当前任务的dicom 非dicom检查
+                .WhereIf(criterionInfo.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom && inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)
                .Select(u => new SubjectImageUploadDTO()
                {
                    VisitTaskId = u.Id,
@@ -587,10 +593,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        public async Task<List<TaskNoneDicomStudyDTO>> GetIRUploadTaskNoneDicomStudyList(IRUploadStudyQuery inQuery)
        {
            var info = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
-                 .Select(t => new { t.IsImageFilter, t.CriterionModalitys }).FirstNotNullAsync();
+                 .Select(t => new { t.IsImageFilter, t.CriterionModalitys,t.IsReadingTaskViewInOrder }).FirstNotNullAsync();

            var query = from u in _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
                                                   && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+                         //满足 有序，或者随机只看到当前任务的dicom 非dicom检查
+                         .WhereIf(info.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom && inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)
                        join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId).WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
                        on u.SourceSubjectVisitId equals ns.SubjectVisitId

@@ -745,7 +753,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        public async Task<List<SubjectCRCImageUploadedStudyDto>> GetSubjectImageDownloadSelectList(IRReadingDownloadQuery inQuery)
        {
            //要根据标准阅片顺序，确定是否查询单个任务的，还是查询所有的
-
            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
                 .Select(t => new { t.IsReadingTaskViewInOrder }).FirstNotNullAsync();