修改一版

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

@@ -1035,6 +1035,21 @@
             计划条数
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto.TrialId">
+            <summary>
+            项目ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto.ReadingPeriodSetId">
+            <summary>
+            配置ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto.ReadingSetType">
+            <summary>
+            阅片配置的类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect.Id">
             <summary>
             项目ID
@@ -3294,6 +3309,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.GetReadingVisitList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto)">
+            <summary>
+            获取阅片期配置的截至访视的下拉框
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.SetReadingPeriodSetEffect(IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect)">
             <summary>
             设置阅片期配置是否生效

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

@@ -68,16 +68,23 @@ namespace IRaCIS.Application.Services
         }
 
 
+        //public List<ClinicalDataSetView> GetClinicalDataSetList()
+        //{
+            
+        //}
+
+
         /// <summary>
         /// 将系统配置添加到项目配置
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [HttpPost]
+      
-        public async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
+        private async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
         {
+            var systemIds = await _clinicalDataSetRepository.Where(x => x.TrialId == null).Select(x => x.Id).ToListAsync();
             var trialSystemIds =await _clinicalDataSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
-            var needAddids  = inDto.Ids.Except(trialSystemIds).ToList();
+            var needAddids  = systemIds.Except(trialSystemIds).ToList();
             var systemDataList =await _clinicalDataSetRepository.Where(x => needAddids.Contains(x.Id)).ToListAsync();
             List<ClinicalDataSet> dataSets = systemDataList.Select(x => new ClinicalDataSet()
             {

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

@@ -122,8 +122,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class AddTrialClinicalDataSetInDto
     {
-        public List<Guid> Ids { get; set; } = new List<Guid>();
-
         public Guid TrialId { get; set; }
     }
 }

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

@@ -264,6 +264,33 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+    public class GetReadingVisitListOutDto
+    {
+        public Guid VisitStageId { get; set; }
+        public decimal VisitNum { get; set; }
+        public string VisitName { get; set; } = string.Empty;
+    }
+
+    public class GetReadingVisitListInDto
+    {
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public Guid TrialId { get; set; }
+
+        /// <summary>
+        /// 配置ID
+        /// </summary>
+        public Guid? ReadingPeriodSetId { get; set; }
+
+
+        /// <summary>
+        /// 阅片配置的类型
+        /// </summary>
+        public ReadingSetType ReadingSetType { get; set; }
+    }
+
+
     public class SetReadingPeriodSetEffect
     {
         /// <summary>

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

@@ -23,12 +23,14 @@ namespace IRaCIS.Application.Services
         public IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
         private readonly IRepository<ReadModule> _readModuleRepository;
+        private readonly IRepository<VisitStage> _visitStageRepository;
         private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
         private readonly IRepository<Site> _siteSetRepository;
 
         public ReadingPeriodSetService(IRepository<SubjectVisit> subjectVisitRepository,
              IRepository<ReadingPeriodSet> ReadingPeriodSetRepository,
              IRepository<ReadModule> readModuleRepository,
+               IRepository<VisitStage> visitStageRepository,
              IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
              IRepository<Site> SiteSetRepository
           )
@@ -36,6 +38,7 @@ namespace IRaCIS.Application.Services
             _subjectVisitRepository = subjectVisitRepository;
             _readingPeriodSetRepository = ReadingPeriodSetRepository;
             this._readModuleRepository = readModuleRepository;
+            this._visitStageRepository = visitStageRepository;
             this._readingPeriodPlanRepository = readingPeriodPlanRepository;
             _siteSetRepository = SiteSetRepository;
         }
@@ -126,7 +129,7 @@ namespace IRaCIS.Application.Services
 
             //var 
             var existsBubjectVisits = await _readModuleRepository.Where(y => y.ReadingSetType == inDto.ReadingSetType && y.TrialId == inDto.TrialId).Select(x => x.SubjectVisitId).ToListAsync();
-            visitQuery = visitQuery.Where(x => existsBubjectVisits.Where(y =>x.Id == y).Count() == 0)
+            visitQuery = visitQuery.Where(x => !existsBubjectVisits.Contains(x.Id))
                 .WhereIf(inDto.ExpirationDate != null, x => x.LatestScanDate <= inDto.ExpirationDate.Value)
                 .WhereIf(inDto.ExpirationVisitNum != null, x => x.VisitNum == inDto.ExpirationVisitNum);
 
@@ -277,6 +280,25 @@ namespace IRaCIS.Application.Services
 
         }
 
+        /// <summary>
+        /// 获取阅片期配置的截至访视的下拉框
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<GetReadingVisitListOutDto>> GetReadingVisitList(GetReadingVisitListInDto inDto)
+        {
+            var visitStageIdList = await _readingPeriodSetRepository.Where(x => x.TrialId == inDto.TrialId && x.Id != inDto.ReadingPeriodSetId&&x.VisitStageId!=null&&x.ReadingSetType==inDto.ReadingSetType).Select(x => x.VisitStageId).ToListAsync();
+            List<GetReadingVisitListOutDto> result = await _visitStageRepository.Where(x => x.TrialId == inDto.TrialId && !visitStageIdList.Contains(x.Id)).Select(x => new GetReadingVisitListOutDto()
+            {
+
+                VisitName = x.VisitName,
+                VisitNum = x.VisitNum,
+                VisitStageId = x.Id,
+            }).ToListAsync();
+
+            return result;
+        }
 
         /// <summary>
         /// 设置阅片期配置是否生效

IRaCIS.Core.Domain/Reading/ClinicalDataSet.cs

@@ -53,6 +53,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
+		/// <summary>
+		/// 是否启用
+		/// </summary>
+		public bool IsEnable { get; set; }
+
+		/// <summary>
+		/// 是否勾选
+		/// </summary>
+		public bool IsCheck { get; set; }
+
 	}