From 948c0d32abfbb5fbd1b3017c930cd5917d35c8f0 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 2 Dec 2024 17:16:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/ClinicalData/ReadingClinicalDataService.cs | 3 +-- .../Service/Reading/Dto/ReadingClinicalDataDto.cs | 5 ----- .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 1 - .../Reading/ReadingImageTask/ReadingNoDicomTaskService.cs | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index c270d09d0..5ffb2b896 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -702,7 +702,6 @@ namespace IRaCIS.Core.Application.Service { var readingNameOrTaskBlindName = string.Empty; var subjectCode = string.Empty; - inDto.IsGetTaskClinicalData = true; if (inDto.ReadingId == null) { var visitTask = await _visitTaskRepository.AsQueryable().Include(x => x.Subject) @@ -817,7 +816,7 @@ namespace IRaCIS.Core.Application.Service //下面改用readingIdList筛选 不然 List readingIdList = new List() {}; - if (inDto.IsGetTaskClinicalData) + if (inDto.VisitTaskId!=null) { var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync(); if (subjectVisit != null && !subjectVisit.IsBaseLine) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 03bf3ca92..f325cad1b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -259,11 +259,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public bool IsGetAllConsistencyAnalysis { get; set; } = true; - /// - /// 是否是阅片页面获取临床数据 (阅片其他访视任务需要获取受试者级别的) - /// - public bool IsGetTaskClinicalData { get; set; } = false; - } public class GetConsistencyAnalysisReadingClinicalDataListInDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 3e4257bc0..ffda142c6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2981,7 +2981,6 @@ namespace IRaCIS.Core.Application.Service SubjectId = task.SubjectId, TrialId = inDto.TrialId, VisitTaskId = task.VisitTaskId, - IsGetTaskClinicalData=true, }); task.IsExistsClinicalData = clinicalDataList.Count > 0; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs index 120d92c67..fce2b2294 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs @@ -132,7 +132,6 @@ namespace IRaCIS.Core.Application.Service SubjectId = task.SubjectId, TrialId = inDto.TrialId, VisitTaskId = task.VisitTaskId, - IsGetTaskClinicalData=true, })).Count() > 0; }