修改一版

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -467,6 +467,16 @@
             排序字段
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSubjectReadVisitsInDto.ReadingSetType">
+            <summary>
+            阅片配置的类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSubjectReadVisitsInDto.SubjectId">
+            <summary>
+            受试者ID
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.ExpirationDate">
             <summary>
             截止日期
@@ -492,6 +502,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.ReadingSetType">
+            <summary>
+            阅片配置的类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitFinishReadingAddReadModuleInDto.TrialId">
             <summary>
             项目ID
@@ -3108,6 +3123,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadModuleService.GetSubjectReadVisits(IRaCIS.Core.Application.Service.Reading.Dto.GetSubjectReadVisitsInDto)">
+            <summary>
+            添加阅片的时候 获取访视
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadModuleService.AddReadModule(IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto)">
             <summary>
             添加阅片期

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

@@ -128,6 +128,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ReadingPeriodName { get; set; }
 
+        public string SubjectVisitName { get; set; }
+
     }
 
     public class ReadingPeriodSetView
@@ -183,11 +185,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid CreateUserId { get; set; }
 
+        public string? SubjectVisitName { get; set; }
 
         /// <summary>
-        /// 备注
+        /// 阅片配置的类型
         /// </summary>
-        public string Remark { get; set; } = String.Empty;
+        public ReadingSetType ReadingSetType { get; set; }
 
         /// <summary>
         /// 中心Id

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

@@ -176,24 +176,27 @@ namespace IRaCIS.Application.Services
         }
 
         /// <summary>
-        /// 
+        /// 添加阅片的时候 获取访视
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        //public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisits(GetSubjectReadVisitsInDto inDto)
+        public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisits(GetSubjectReadVisitsInDto inDto)
-        //{
+        {
-        //    var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
+            var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
 
-        //    var finalVisitNum = await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
+            var finalVisitNum = await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
 
 
-        //    var readModulequery = _readModuleRepository.AsQueryable();
+            var readModulequery = _readModuleRepository.AsQueryable();
-        //    //visitquery = visitquery.WhereIf(finalVisitNum != null, x => x.VisitNum < finalVisitNum)
+           return await  visitquery.WhereIf(finalVisitNum != null, x => x.VisitNum < finalVisitNum)
-        //    //    .Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum)
+                .Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum)
-        //    //    .Select(x=>new GetSubjectReadVisitsOutDto() { 
+                .Select(x => new GetSubjectReadVisitsOutDto()
-                
+                {
-        //    //    } )
+                    SubjectVisitId = x.Id,
-        //}
+                    VisitName = x.VisitName,
+                    VisitNum = x.VisitNum,
+                }).ToListAsync();
+        }
 
         /// <summary>
         /// 添加阅片期

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

@@ -109,6 +109,7 @@ namespace IRaCIS.Application.Services
                      ReadingPeriodSetId=readset.Id,
                      SubjectCode=x.Subject.Code,
                      SubjectId=x.SubjectId,
+                     SubjectVisitName=x.VisitName,
                      //Remark= readset.Remark
                 }).ToList();
         }

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

@@ -15,6 +15,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.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode)));
 

IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs

@@ -47,9 +47,15 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid? VisitStageId { get; set; }
 
 		/// <summary>
-		/// 是否生效
+		/// 访视模板
 		/// </summary>
-		public int? IsTakeEffect { get; set; }
+		[ForeignKey("VisitStageId")]
+		public VisitStage? VisitStage { get; set; }
+    
+	 /// <summary>
+	 /// 是否生效
+	 /// </summary>
+	   public int? IsTakeEffect { get; set; }
 
 		/// <summary>
 		/// 创建时间