Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs

@@ -38,8 +38,8 @@ namespace IRaCIS.Core.Application.Contracts
     public class DicomTrialSiteSubjectInfo
     {
         public string TrialSiteCode { get; set; } = string.Empty;
-        public string SiteCode { get; set; } = string.Empty;
+        public string TrialSiteAliasName { get; set; } = string.Empty;
-        public string SiteName { get; set; } = string.Empty;
+
         public string SubjectCode { get; set; } = string.Empty;
         public int? SubjectAge { get; set; }
         public string SubjectSex { get; set; } = string.Empty;

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

@@ -35,7 +35,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<VisitStage, VisitStageDTO>();
 
             CreateMap<Subject, SubjectQueryView>()
-                .ForMember(d => d.SiteName, u => u.MapFrom(s => s.TrialSite.Site.SiteName))
+                .ForMember(d => d.SiteName, u => u.MapFrom(s => s.TrialSite.TrialSiteAliasName))
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
                 .ForMember(d => d.LatestBlindName, u => u.MapFrom(s => s.LatestSubjectVisit.BlindName))
                 .ForMember(d => d.LatestVisitName, u => u.MapFrom(s => s.LatestSubjectVisit.VisitName))
@@ -88,8 +88,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<SubjectVisit, DicomTrialSiteSubjectInfo>().IncludeMembers(t=>t.Trial)
-                .ForMember(d => d.SiteName, u => u.MapFrom(s => s.Site.SiteName))
+                .ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSite.TrialSiteAliasName))
-                 .ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode))
                  .ForMember(d => d.SubjectVisitId, u => u.MapFrom(s => s.Id))
                   .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
                   .ForMember(d => d.TrialCode, u => u.MapFrom(s => s.Trial.TrialCode))