修改site关联

IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs

@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid TrialId { get; set; }
         public Guid SubjectId { get; set; }
 
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public string SubjectCode { get; set; }
         public Guid TrialReadingCriterionId { get; set; }

IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs

@@ -457,7 +457,7 @@ namespace IRaCIS.Core.Application.Service
                                                                     TrialId = subjectVisit.TrialId,
                                                                     SubjectId = subjectVisit.SubjectId,
                                                                     SubjectCode = subjectVisit.Subject.Code,
-                                                                    SiteId = subjectVisit.SiteId,
+                                                                    TrialSiteId = subjectVisit.TrialSiteId,
                                                                     TrialReadingCriterionId = inQuery.TrialReadingCriterionId,
                                                                     LatestScanDate = subjectVisit.LatestScanDate,
                                                                     EarliestScanDate = subjectVisit.LatestScanDate,

IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs

@@ -265,7 +265,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string? SiteCode { get; set; }
 
-        public Guid? SiteId { get; set; }
+        public Guid? TrialSiteId { get; set; }
 
         public Guid? SubjectId { get; set; }
 
@@ -283,7 +283,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string SiteCode { get; set; }
 
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public Guid SubjectId { get; set; }
 
@@ -359,7 +359,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string OutPlanPreviousVisitName { get; set; }
 
-        public Guid? SiteId { get; set; }
+        public Guid? TrialSiteId { get; set; }
 
         public bool IsVisit { get; set; } = true;
 

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -166,11 +166,11 @@ namespace IRaCIS.Application.Services
             var subjectIds = await subjectQuery.OrderBy(dto.SortField).Select(x => x.SubjectId).Distinct().Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
 
             List<ReadModuleView> ReadModuleViewList = await subjectQuery.Where(x => subjectIds.Contains(x.SubjectId)).OrderBy(dto.SortField).ToListAsync();
-            List<GetReadModuleDtoOut> getReadList = ReadModuleViewList.GroupBy(x => new { x.SubjectId, x.SiteId, x.TrialSiteCode, x.SubjectCode })
+            List<GetReadModuleDtoOut> getReadList = ReadModuleViewList.GroupBy(x => new { x.SubjectId, x.TrialSiteId, x.TrialSiteCode, x.SubjectCode })
                 .Select(x => new GetReadModuleDtoOut()
                 {
                     TrialSiteCode = x.Key.TrialSiteCode,
-                    SiteId = x.Key.SiteId,
+                    TrialSiteId = x.Key.TrialSiteId,
                     SubjectCode = x.Key.SubjectCode,
                     SubjectId = x.Key.SubjectId,
                     Data = x.OrderBy(x=>x.ModuleType).ThenBy(x=>x.VisitNum).ToList(),

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -87,7 +87,7 @@ namespace IRaCIS.Application.Services
                 {
                     ReadingPeriodSetId = entity.Id,
                     TrialId = entity.TrialId,
-                    SiteId = x,
+                    TrialSiteId = x,
                 }).ToList();
 
                 entity.ReadingPeriodPlanList = addOrEditReadingPeriodSet.SubjectVisitIds.Select(x => new ReadingPeriodPlan
@@ -107,7 +107,7 @@ namespace IRaCIS.Application.Services
                 {
                     ReadingPeriodSetId = entity.Id,
                     TrialId = entity.TrialId,
-                    SiteId = x,
+                    TrialSiteId = x,
                 }).ToList();
 
                 entity.ReadingPeriodPlanList = addOrEditReadingPeriodSet.SubjectVisitIds.Select(x => new ReadingPeriodPlan
@@ -493,7 +493,7 @@ namespace IRaCIS.Application.Services
 
             // 当前项目 最晚拍片日期不为null  中心筛选
             var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && x.LatestScanDate != null && !x.IsLostVisit)
-                .WhereIf(inDto.ReadingScope == ReadingScopeEnum.Site, x => inDto.SiteIds.Contains(x.SiteId))
+                .WhereIf(inDto.ReadingScope == ReadingScopeEnum.Site, x => inDto.SiteIds.Contains(x.TrialSiteId))
                 .Where(x=>!x.IsBaseLine);// 排除基线
 
             // 已经存在的访视 需要排除

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

@@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<ReadingPeriodSet, ReadingPeriodSetView>()
                 .ForMember(d => d.SubjectVisitName, u => u.MapFrom(s => s.VisitStage==null?string.Empty: s.VisitStage.VisitName))
-                .ForMember(d => d.SiteIds, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.SiteId)))
+                .ForMember(d => d.SiteIds, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSiteId)))
                 .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode)))
                 .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count));