From 80906686506c2c3d7021c75c5b9ff6aa6e45f1fb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 24 Sep 2024 14:31:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E9=98=85=E4=BB=BB=E5=8A=A1=E6=8E=92?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 5741a886c..d29387c05 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -253,8 +253,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc public async Task> VerifyIRStudyAllowUpload(TaskStudyAchivePreConfirmCommand inCommand, [FromServices] IRepository _dicomStudyRepository) { - - var notAllowedUidList1 = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new + //重阅任务排除 + var notAllowedUidList1 = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && t.VisitTask.TaskState==TaskState.Effect && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new { t.StudyInstanceUid, t.SubjectId, @@ -283,7 +283,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc //同一个subject 同一份影响 if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId) { - if (inCommand.VisitTaskId != null && findStudy.VisitTaskId!=Guid.Empty && findStudy.VisitTaskId!=inCommand.VisitTaskId) + if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != Guid.Empty && findStudy.VisitTaskId != inCommand.VisitTaskId) { result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false }); }