site dicomAE 提交

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteDicomAEViewModel.cs

@@ -6,6 +6,7 @@
 using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> TrialSiteDicomAEView  列表视图模型 </summary>
@@ -21,8 +22,12 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
     ///<summary>TrialSiteDicomAEQuery  列表查询参数模型</summary>
-    public class TrialSiteDicomAEQuery : PageInput
+    public class TrialSiteDicomAEQuery /*: PageInput*/
     {
+        [NotDefault]
+
+        public Guid TrialSiteId { get; set; }
+
         public string? CallingAE { get; set; }
 
         public string? IP { get; set; }

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -259,7 +259,7 @@ namespace IRaCIS.Application.Contracts
         //public string ContactPhone { get; set; } = String.Empty;
         //public string Address { get; set; } = String.Empty;
 
-
+        public List<string> CallingAEList { get; set; }
         public List<string> UserNameList { get; set; } = new List<string>();
 
         public int? VisitCount { get; set; }

IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteDicomAEService.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Interfaces
 	public interface ITrialSiteDicomAEService
     {
 
-	   	    Task<PageOutput<TrialSiteDicomAEView>>  GetTrialSiteDicomAEList(TrialSiteDicomAEQuery inQuery);
+	   	    Task<List<TrialSiteDicomAEView>>  GetTrialSiteDicomAEList(TrialSiteDicomAEQuery inQuery);
 	    
          Task<IResponseOutput> AddOrUpdateTrialSiteDicomAE(TrialSiteDicomAEAddOrEdit addOrEditTrialSiteDicomAE);
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs

@@ -57,7 +57,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="trialId"></param>
         /// <returns></returns>
-        public async Task<IResponseOutput<DicomAEView>> GetTrialDicomAEList(Guid trialId)
+        public async Task<IResponseOutput<DicomAEView>> GetTrialDicomAE(Guid trialId)
         {
             var dicomAE = _dicomAERepository.Where(t => t.TrialId == trialId).ProjectTo<DicomAEView>(_mapper.ConfigurationProvider).FirstOrDefault();
             var trialConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed });

IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteDicomAEService.cs

@@ -25,23 +25,25 @@ namespace IRaCIS.Core.Application.Service
         }
 
         [HttpPost]
-        public async Task<PageOutput<TrialSiteDicomAEView>> GetTrialSiteDicomAEList(TrialSiteDicomAEQuery inQuery)
+        public async Task<List<TrialSiteDicomAEView>> GetTrialSiteDicomAEList(TrialSiteDicomAEQuery inQuery)
         {
 
             var trialSiteDicomAEQueryable =
 
-               _trialSiteDicomAERepository
+               _trialSiteDicomAERepository.Where(t=>t.TrialSiteId==inQuery.TrialSiteId)
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.IP), t => t.IP.Contains(inQuery.IP))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Port), t => t.Port.Contains(inQuery.Port))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Description), t => t.Description.Contains(inQuery.Description))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE.Contains(inQuery.CallingAE))
              .ProjectTo<TrialSiteDicomAEView>(_mapper.ConfigurationProvider);
 
-            var pageList = await trialSiteDicomAEQueryable
-            .ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialSiteDicomAEView.Id) : inQuery.SortField,
-            inQuery.Asc);
+            //var pageList = await trialSiteDicomAEQueryable
+            //.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialSiteDicomAEView.Id) : inQuery.SortField,
+            //inQuery.Asc);
 
-            return pageList;
+            var list = await trialSiteDicomAEQueryable.ToListAsync();
+
+            return list;
         }
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs

@@ -141,7 +141,8 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count()))
               .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count()))
               .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count()))
-              .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.User.FullName)));
+              .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.User.FullName)))
+              .ForMember(d => d.CallingAEList, u => u.MapFrom(s => s.TrialSiteDicomAEList.Select(u => u.CallingAE)));
             //CreateMap<Site, SiteStatSimpleDTO>();
 
 

IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs

@@ -55,7 +55,9 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public List<Subject> SubjectList { get; set; }
 
+        [JsonIgnore]
 
+        public List<TrialSiteDicomAE> TrialSiteDicomAEList { get; set; }
 
     }
 }

IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs

@@ -53,6 +53,10 @@ namespace IRaCIS.Core.Domain.Models
 	
 
 		public string Description { get; set; }
+
+
+
+		public TrialSite TrialSite { get; set; }
 	 
 	 }