diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 4e7dc89e5..3eebc5573 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -875,21 +875,23 @@
-
+
打包和匿名化影像 默认是匿名化打包,也可以不匿名化打包
+
-
+
后台任务调用,前端忽略该接口
+
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 8226693c0..6be7f1de5 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -44,6 +44,9 @@ namespace IRaCIS.Core.Application.Contracts
public string RecordPath { get; set; } = string.Empty;
public bool IsDicom { get; set; }
+
+
+
}
public class UnionStudyMonitorModel : UnionStudyBaseModel
@@ -124,7 +127,7 @@ namespace IRaCIS.Core.Application.Contracts
public Guid Id { get; set; }
-
+ public bool IsFromPACS { get; set; }
public int? Count { get; set; }
@@ -164,6 +167,8 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsSuccess { get; set; }
public string? StudyCode { get; set; }
+
+ public bool? IsFromPACS { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 50c2882a5..96051495f 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -372,6 +372,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
VisitNum = t.SubjectVisit.VisitNum,
IsDicom = true,
+ IsFromPACS=t.IsFromPACS,
SubjectCode = t.Subject.Code,
@@ -455,7 +456,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var unionQuery = dicomStudyQuery.Union(nodeDicomStudyQuery)
.WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId)
.WhereIf(studyQuery.SubjectVisitId != null, t => t.SubjectId == studyQuery.SubjectVisitId)
- .WhereIf(studyQuery.TrialSiteId != null, t => t.TrialSiteId == studyQuery.TrialSiteId);
+ .WhereIf(studyQuery.TrialSiteId != null, t => t.TrialSiteId == studyQuery.TrialSiteId)
+ .WhereIf(studyQuery.IsFromPACS != null, t => t.IsFromPACS == studyQuery.IsFromPACS);
return await unionQuery.ToPagedListAsync(studyQuery.PageIndex, studyQuery.PageSize, studyQuery.SortField, studyQuery.Asc);
}