From 84b65ee122e61fd5f090869310239c2366464cd5 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 16 Jun 2026 11:31:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=9B=BE=E9=87=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E5=89=B2=E8=B7=AF=E5=BE=84=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs | 4 ++++ .../Service/ImageAndDoc/DownloadAndUploadService.cs | 6 ++++-- IRaCIS.Core.Domain/Allocation/VisitTask.cs | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index 26fbd7752..357dc2033 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -849,9 +849,13 @@ namespace IRaCIS.Core.Application.Contracts public List QuestionMarkPictureList { get; set; } public List TableQuestionRowPictureList { get; set; } + + public List SegmentationFileList { get; set; } } public class TrialKeyPicturePath { + public string SegmentationName { get; set; } + public string PicturePath { get; set; } public string OtherPicturePath { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 5ac31c75b..997a2366e 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1650,7 +1650,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc #endregion var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id) && t.CheckState == CheckStateEnum.CVPassed)) - //一致性分析，导致查询出来两条数据 + //一致性分析，导致查询出来两条数据 join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id)) on sv.Id equals visitTask.SourceSubjectVisitId into cc from leftVisitTask in cc.DefaultIfEmpty() select new ImageDownloadDto() @@ -2004,7 +2004,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc public async Task> GetTrialUnreadVisitList(Guid trialId) { - var subjectVisitList = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId!=null).Select(t => t.SourceSubjectVisitId) + var subjectVisitList = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId != null).Select(t => t.SourceSubjectVisitId) .Distinct().ToListAsync(); return subjectVisitList; @@ -2054,6 +2054,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc TableQuestionRowPictureList = t.LesionList.Select(c => new TrialKeyPicturePath { PicturePath = c.PicturePath, OtherPicturePath = c.OtherPicturePath }).ToList(), + SegmentationFileList = t.SegmentationList.Select(c => new TrialKeyPicturePath { PicturePath = c.SEGUrl, SegmentationName=c.SegmentationName, OtherPicturePath = string.Empty }).ToList(), + Id = t.Id, //裁判选择结果 JudgeResultTaskId = t.JudgeVisitTask.JudgeResultTaskId, diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 6ef559253..c1a2524de 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -10,6 +10,9 @@ public class VisitTask : BaseFullAuditEntity { #region 导航属性 + [JsonIgnore] + public List SegmentationList { get; set; } = new List(); + //针对肿瘤学任务的 导航属性，关联肿瘤学结果 [JsonIgnore] public List OncologyResultList { get; set; } From 2b29ebc29b7f20a74c1902970424cc00979a22a7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 16 Jun 2026 13:31:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=B9=E8=AE=AD=E7=B1=BB=E5=9E=8B=E5=91=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialViewModel.cs | 2 ++ .../Service/TrialSiteUser/TrialConfigService.cs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs index 9fc0f15d2..73a48a4b1 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs @@ -296,6 +296,8 @@ namespace IRaCIS.Application.Contracts #endregion public TrialDataStore TrialDataStoreType { get; set; } + + public TrialType TrialType { get; set; } } public class TrialPacsInfo diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index c7c2610b7..cce6be705 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -1566,7 +1566,7 @@ namespace IRaCIS.Core.Application [AllowAnonymous] public async Task GetTrialExtralConfig(Guid trialId) { - var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialDataStoreType, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask, t.IsImageQualityControl }).FirstOrDefault(); + var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialDataStoreType, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask, t.IsImageQualityControl, t.TrialType }).FirstOrDefault(); var extralConfig = JsonConvert.DeserializeObject(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig(); @@ -1578,6 +1578,7 @@ namespace IRaCIS.Core.Application trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum; trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask; trialConfig.TrialDataStoreType = extralObj.TrialDataStoreType; + trialConfig.TrialType = extralObj.TrialType; return trialConfig; }