修改一版

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -431,7 +431,7 @@ namespace IRaCIS.Core.API.Controllers
                 }).FirstOrDefaultAsync();
                 await FileUploadAsync(async (fileName) =>
                 {
-                    var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetClinicalDataPath(_hostEnvironment, fileName, subject.TrialId, subject.SiteId, subjectId.Value, id);
+                    var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetClinicalDataPath(_hostEnvironment, fileName, subject.TrialId, subject.SiteId, subjectId, id);
                     //插入临床pdf 路径
                     filerelativePath = relativePath;
                     return serverFilePath;

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

@@ -148,7 +148,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 访视名称
         /// </summary>
-        public string SubjectVisitName { get; set; }
+        public string? SubjectVisitName { get; set; }
 
 
         /// <summary>
@@ -160,7 +160,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 截止访视名称
         /// </summary>
-        public string CutOffVisitName { get; set; }
+        public string? CutOffVisitName { get; set; }
 
         /// <summary>
         /// 对应阅片期
@@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 对应Name
         /// </summary>
-        public string ReadModuleName { get; set; }
+        public string? ReadModuleName { get; set; }
 
         /// <summary>
         /// 状态

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

@@ -9,11 +9,12 @@ using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Share.Reading;
 using MassTransit;
+using Panda.DynamicWebApi.Attributes;
 
 namespace IRaCIS.Application.Services
 {
     /// <summary>
-    /// 生成的阅片模块(在大列表上展示的)
+    /// 生成的阅片模块(在大列表上展示的) 阅片期
     /// </summary>
     [ApiExplorerSettings(GroupName = "Reading")]
     public class ReadModuleService : BaseService
@@ -42,7 +43,7 @@ namespace IRaCIS.Application.Services
 
 
         /// <summary>
-        ///  获取读片模块
+        /// 获取读片模块
         /// </summary>
         [HttpPost]
         public async Task<(PageOutput<GetReadModuleDtoOut>,object)> GetReadModule(GetReadModuleDto dto)
@@ -80,6 +81,9 @@ namespace IRaCIS.Application.Services
                    }).ToList()
                });
 
+
+
+
             var pageList = await subjectquery.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField == null|| dto.SortField==string.Empty ? "SiteCode" : dto.SortField,
                 dto.Asc);
 
@@ -113,13 +117,26 @@ namespace IRaCIS.Application.Services
                x.Data.OrderBy(y => y.ModuleType);
             });
 
-        
+           
+
             return (pageList, new
             {
                 MaxLength = pageList.CurrentPageData.ToList().Max(x => x.Data.Count)
             });
         }
 
+        ///// <summary>
+        ///// 获取访视的状态
+        ///// </summary>
+        ///// <param name="visit"></param>
+        ///// <returns></returns>
+        //[NonDynamicWebApi]
+        //public async Task<SubmitStateEnum> GetVisitSubmitStateEnum(SubjectVisit visit)
+        //{
+        //    if(visit.SubmitState == SubmitStateEnum.None||)
+        //}
+
+
         ///// <summary>
         ///// 访视阅片完成添加阅片期模块
         ///// </summary>

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

@@ -47,6 +47,7 @@ namespace IRaCIS.Application.Services
                 entity.ReadingPeriodSites = addOrEditReadingPeriodSet.SiteIds.Select(x => new ReadingPeriodSite()
                 {
                     ReadingPeriodSetId = entity.Id,
+                    TrialId =entity.TrialId,
                     SiteId = x,
                 }).ToList();
 
@@ -60,6 +61,7 @@ namespace IRaCIS.Application.Services
                 entity.ReadingPeriodSites = addOrEditReadingPeriodSet.SiteIds.Select(x => new ReadingPeriodSite()
                 {
                     ReadingPeriodSetId = entity.Id,
+                    TrialId = entity.TrialId,
                     SiteId = x,
                 }).ToList();
                 var success = await _readingPeriodSetRepository.SaveChangesAsync();

IRaCIS.Core.Domain/Reading/ReadModule.cs

@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 受试者ID
 		/// </summary>
-		public Guid? SubjectId { get; set; }
+		public Guid SubjectId { get; set; }
 
 		/// <summary>
 		/// 模块类型
@@ -38,12 +38,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 访视ID
 		/// </summary>
-		public Guid? SubjectVisitId { get; set; }
+		public Guid SubjectVisitId { get; set; }
 
 		/// <summary>
 		/// 状态
 		/// </summary>
-        public ReadModuleEnum? Status { get; set; }
+        public ReadModuleEnum Status { get; set; }
 
 		/// <summary>
 		/// 创建时间

IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 项目ID
 		/// </summary>
-		public Guid? TrialId { get; set; }
+		public Guid TrialId { get; set; }
 
 		/// <summary>
 		/// 阅片期名称
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 阅片范围
 		/// </summary>
-		public ReadingScopeEnum? ReadingScope { get; set; }
+		public ReadingScopeEnum ReadingScope { get; set; }
 
 		/// <summary>
 		/// 截止日期
@@ -65,7 +65,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 备注
 		/// </summary>
-		public string Remark { get; set; }
+		public string? Remark { get; set; }
 
 
 		public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();

IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs

@@ -19,12 +19,17 @@ namespace IRaCIS.Core.Domain.Models
 		///阅片期配置ID
 		/// </summary>
 		
-		public Guid? ReadingPeriodSetId { get; set; }
+		public Guid ReadingPeriodSetId { get; set; }
+
+		/// <summary>
+		/// 项目ID
+		/// </summary>
+		public Guid TrialId { get; set; }
 
 		/// <summary>
 		/// 中心ID
 		/// </summary>
-		public Guid? SiteId { get; set; }
+		public Guid SiteId { get; set; }