与提交

2023-06-21 11:24:46 +08:00
parent cda334487d
commit adbf89d451
15 changed files with 70 additions and 48 deletions
@@ -30,6 +30,8 @@ namespace IRaCIS.Core.Application.ViewModel

        public string TagDescription { get; set; } = string.Empty;

+        public string TagDescriptionCN { get; set; } = string.Empty;
+
        public string ValueRepresentation { get; set; } = string.Empty;


@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using IRaCIS.Core.Application.Helper;
+using Org.BouncyCastle.Utilities;

 namespace IRaCIS.Core.Application.Services
 {
@@ -148,13 +149,21 @@ namespace IRaCIS.Core.Application.Services

            //var (physicalPath, relativePath)  = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);

-            using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath))
+            if (File.Exists(physicalPath))
            {
-                var bytes = new byte[sw.Length];
-                sw.Read(bytes, 0, bytes.Length);
-                sw.Close();
-                return new FileContentResult(bytes, "image/jpeg");
+                using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath))
+                {
+                    var bytes = new byte[sw.Length];
+                    sw.Read(bytes, 0, bytes.Length);
+                    sw.Close();
+                    return new FileContentResult(bytes, "image/jpeg");
+                }
            }
+            else
+            {
+                return new FileContentResult(new byte[0], "image/jpeg");
+            }
+           
        }


@@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.Service
            var systemAnonymizationQueryable = systemAnonymizationRepository
                .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.Group), t => t.Group.Contains(querySystemAnonymization.Group))
                .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.Element), t => t.Element.Contains(querySystemAnonymization.Element))
+                 .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.TagDescription), t => t.TagDescription.Contains(querySystemAnonymization.TagDescription))
+                  .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.TagDescriptionCN), t => t.TagDescriptionCN.Contains(querySystemAnonymization.TagDescriptionCN))
                .WhereIf(querySystemAnonymization.IsAdd != null, t => t.IsAdd == querySystemAnonymization.IsAdd)
                .WhereIf(!string.IsNullOrEmpty(querySystemAnonymization.ValueRepresentation), t => t.ValueRepresentation.Contains(querySystemAnonymization.ValueRepresentation))
            .ProjectTo<SystemAnonymizationView>(_mapper.ConfigurationProvider);