修改一版

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

@@ -494,7 +494,7 @@
             项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsCheck">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsConfirm">
             <summary>
             是否勾选
             </summary>
@@ -559,7 +559,7 @@
             系统的ClinicalDataSetId
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.IsCheck">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.IsConfirm">
             <summary>
             是否勾选
             </summary>
@@ -1099,11 +1099,6 @@
             下拉ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataTrialSetId">
-            <summary>
-            下拉ID
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataLevel">
             <summary>
             临床级别

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

@@ -45,7 +45,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否勾选
         /// </summary>
-        public bool IsCheck { get; set; }
+        public bool IsConfirm { get; set; }
     }
 
     public class ClinicalDataSystemSetAddOrEdit
@@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否勾选
         /// </summary>
-        public bool IsCheck { get; set; }
+        public bool IsConfirm { get; set; }
 
         /// <summary>
         /// 是否来自于系统数据

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

@@ -79,6 +79,7 @@ namespace IRaCIS.Application.Services
 
             
                 await _readingClinicalDataRepository.AddAsync(entity, true);
+                var success = await _readingClinicalDataRepository.SaveChangesAsync();
                 return ResponseOutput.Ok(entity.Id);
             }
             else
@@ -131,6 +132,8 @@ namespace IRaCIS.Application.Services
         {
 
             List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm&&x.ClinicalDataSetName!= "既往局部治疗史")
+                .WhereIf(inDto.IsVisit,x=>x.ClinicalDataLevel == ClinicalLevel.Subject||x.ClinicalDataLevel== ClinicalLevel.SubjectVisit)
+                .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataLevel == ClinicalLevel.Read)
 
                 //.WhereIf(inDto.ReadingClinicalDataId==null, x=> _readingClinicalDataPDFRepository.Where(y=>y.ObjectId==inDto.ObjectId&&))
 
@@ -141,7 +144,6 @@ namespace IRaCIS.Application.Services
                 ClinicalUploadType = x.ClinicalUploadType,
                 ClinicalDataLevelName = x.ClinicalDataLevel.GetDisplayName(),
                 ClinicalUploadTypeName = x.ClinicalUploadType.GetDisplayName(),
-               
                 Id = x.Id
             }).ToListAsync() ;
             return clinicalList;

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

@@ -118,16 +118,23 @@ namespace IRaCIS.Application.Services
         {
 
 
-            var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && x.InPlan&&x.LatestScanDate!=null)
+            // 当前项目 最晚拍片日期不为null  中心筛选
+            var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId &&x.LatestScanDate!=null&&!x.IsLostVisit)
                 .WhereIf(inDto.SiteIds.Count != 0, x => inDto.SiteIds.Contains(x.SiteId));
+
+            // 已经存在的访视 需要排除
             var existsBubjectVisitsQuery=  _readModuleRepository.Where(y => y.ReadingSetType == inDto.ReadingSetType && y.TrialId == inDto.TrialId).Select(x => x.SubjectVisitId);
             visitQuery = visitQuery.Where(x => !existsBubjectVisitsQuery.Contains(x.Id))
                 .WhereIf(inDto.ExpirationDate != null, x => x.LatestScanDate <= inDto.ExpirationDate.Value)
                 .WhereIf(inDto.ExpirationVisitNum != null, x => x.VisitNum == inDto.ExpirationVisitNum);
 
             var subjectIdlist = await visitQuery.OrderBy(x => x.SubjectId).Select(x => x.SubjectId).Distinct().Skip((inDto.PageIndex - 1) * inDto.PageSize).Take(inDto.PageSize).ToListAsync();
+          
+            
             var totalCount = visitQuery.Select(x => x.SubjectId).Distinct().Count();
+
             var visitlist = await visitQuery.Include(x => x.Subject).Include(x => x.TrialSite).Where(x => subjectIdlist.Contains(x.SubjectId)).ToListAsync();
+
             var subjectVisits = visitlist.GroupBy(x => x.SubjectId).Select(x => new
             {
                 SubjectId = x.Key,