From 8c03167f7eda1b85a7e72059bee060ee32eb451f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 24 Nov 2025 14:28:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=83=A8=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 2990696aa..56c35f245 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO public string BodyPart { get; set; } = String.Empty; public string ModifyReason { get; set; } + + public string BodyPartForEditOther { get; set; } } From 680a6cb437233b5ed3f574c1078acc29022727ad Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 24 Nov 2025 15:24:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=9D=9Edicom=20=20bodyPart=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/NoneDicomStudyViewModel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index bce0b65c3..7162e8c3e 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -55,6 +55,8 @@ namespace IRaCIS.Core.Application.Contracts public string Modality { get; set; } = string.Empty; public DateTime ImageDate { get; set; } public string ModifyReason { get; set; } + + public string BodyPartForEditOther { get; set; } } /// NoneDicomStudyAddOrEdit 列表查询参数模型 From 33a2b7f373c2615263b78de28618db5109cb8a80 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 25 Nov 2025 10:47:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E8=A7=86Id-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs | 2 ++ IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index d156eedd9..19226cbe3 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -1005,6 +1005,8 @@ namespace IRaCIS.Core.Application.Contracts public string VisitName { get; set; } + public Guid SourceSubjectVisitId { get; set; } + public List DicomStudyList { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs index 08b0f4c16..4b271380f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs @@ -166,6 +166,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() + .ForMember(d => d.SourceSubjectVisitId, u => u.MapFrom(u => u.Id)) .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.Subject.Code)) .ForMember(d => d.DicomStudyList, u => u.MapFrom(s => s.StudyList)) .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.NoneDicomStudyList.Where(t => t.IsReading))); From ab90591e7cb6d371a392c3ce4d5ae6794920b8ff Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 25 Nov 2025 11:02:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E8=A7=86Id-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index e96136e4d..f91b34941 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1248,6 +1248,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0) .Select(item => new SubjectVisitMarkStudyDto { + SourceSubjectVisitId=item.SourceSubjectVisitId, VisitTaskId = item.VisitTaskId, SubjectId = item.SubjectId, SubjectCode = item.SubjectCode, @@ -1260,6 +1261,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var noneStudyList = list.Where(item => item.NoneDicomStudyList.Count > 0) .Select(item => new SubjectVisitMarkStudyDto { + SourceSubjectVisitId = item.SourceSubjectVisitId, VisitTaskId = item.VisitTaskId, SubjectId = item.SubjectId, SubjectCode = item.SubjectCode, From 2c407c6e4e0a47a77fa8aaedad376ea1fb123e0a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 25 Nov 2025 13:38:38 +0800 Subject: [PATCH 5/8] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E8=A7=86Id-3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index f91b34941..e920c8ae4 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1435,7 +1435,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var dirInfolist = _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id))).SelectMany(t => t.StudyList) .Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false) .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true) - .Where(t => inQuery.IsImageSegmentLabel == true ? t.ModalityForEdit == "XA" : true) + .Where(t => inQuery.IsImageSegmentLabel == false ? t.ModalityForEdit == "XA" : true) .SelectMany(t => t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading)) .Select(t => new StudyDIRInfo() { @@ -1542,6 +1542,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc from leftVisitTask in cc.DefaultIfEmpty() select new ImageDownloadDto() { + TrialId=sv.TrialId, + SubjectId=sv.SubjectId, + TrialSiteCode=sv.TrialSite.TrialSiteCode, + VisitId=sv.Id, + SubjectCode = inQuery.SubjectCode, VisitName = sv.VisitName, TaskBlindName = leftVisitTask.TaskBlindName, From 3eea6cf8b71455b7e34a1afb01f1ca70abc19099 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 25 Nov 2025 15:59:20 +0800 Subject: [PATCH 6/8] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E8=A7=86Id-4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index fb53fe6ab..819c5878e 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -224,7 +224,7 @@ namespace IRaCIS.Core.Application.Services var isImageFilter = false; var criterionModalitys = ""; - if (visitTaskId != null) + if (visitTaskId != null && visitTaskId != Guid.Empty) { var info = await _visitTaskRepository.Where(t => t.Id == visitTaskId) .Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync(); From 3419015542ed23ca94827c1a85a5044ce63387b0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 25 Nov 2025 16:19:45 +0800 Subject: [PATCH 7/8] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E8=A7=86Id-5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index e920c8ae4..bf4b89716 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1603,7 +1603,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc }).ToList() , - NoneDicomStudyList = inQuery.IsImageSegmentLabel == null ? sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false) + NoneDicomStudyList = inQuery.IsImageSegmentLabel != false ? sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false) .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true) .Where(t => t.IsReading) .Select(nd => new DownloadNoneDicomStudyDto() From 671c071a45bf3894cfcf12725869a984bf40fc09 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 25 Nov 2025 17:56:17 +0800 Subject: [PATCH 8/8] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BF=E8=A7=86Id-6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index bf4b89716..2ae8d7279 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc if (inQuery.IsImageSegmentLabel == true) { - var querySV = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId) + var querySV = _subjectVisitRepository.WhereIf(inQuery.SubjectVisitId != null, t => t.Id == inQuery.SubjectVisitId) .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId) .Select(u => new SubjectVisitMarkUploadDto() {