diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 7ae40979d..4de64a847 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/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;
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
index fe74c955b..3e81ce68f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
@@ -148,7 +148,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 访视名称
///
- public string SubjectVisitName { get; set; }
+ public string? SubjectVisitName { get; set; }
///
@@ -160,7 +160,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 截止访视名称
///
- public string CutOffVisitName { get; set; }
+ public string? CutOffVisitName { get; set; }
///
/// 对应阅片期
@@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 对应Name
///
- public string ReadModuleName { get; set; }
+ public string? ReadModuleName { get; set; }
///
/// 状态
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
index 0705ca4ec..f9f11643b 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+++ b/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
{
///
- /// 生成的阅片模块(在大列表上展示的)
+ /// 生成的阅片模块(在大列表上展示的) 阅片期
///
[ApiExplorerSettings(GroupName = "Reading")]
public class ReadModuleService : BaseService
@@ -42,7 +43,7 @@ namespace IRaCIS.Application.Services
///
- /// 获取读片模块
+ /// 获取读片模块
///
[HttpPost]
public async Task<(PageOutput,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)
});
}
+ /////
+ ///// 获取访视的状态
+ /////
+ /////
+ /////
+ //[NonDynamicWebApi]
+ //public async Task GetVisitSubmitStateEnum(SubjectVisit visit)
+ //{
+ // if(visit.SubmitState == SubmitStateEnum.None||)
+ //}
+
+
/////
///// 访视阅片完成添加阅片期模块
/////
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
index c216806c8..1ace23010 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
+++ b/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();
diff --git a/IRaCIS.Core.Domain/Reading/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadModule.cs
index 5df31f53b..88606795c 100644
--- a/IRaCIS.Core.Domain/Reading/ReadModule.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadModule.cs
@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// 受试者ID
///
- public Guid? SubjectId { get; set; }
+ public Guid SubjectId { get; set; }
///
/// 模块类型
@@ -38,12 +38,12 @@ namespace IRaCIS.Core.Domain.Models
///
/// 访视ID
///
- public Guid? SubjectVisitId { get; set; }
+ public Guid SubjectVisitId { get; set; }
///
/// 状态
///
- public ReadModuleEnum? Status { get; set; }
+ public ReadModuleEnum Status { get; set; }
///
/// 创建时间
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs
index dca29997b..2d7f145a2 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs
@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// 项目ID
///
- public Guid? TrialId { get; set; }
+ public Guid TrialId { get; set; }
///
/// 阅片期名称
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// 阅片范围
///
- public ReadingScopeEnum? ReadingScope { get; set; }
+ public ReadingScopeEnum ReadingScope { get; set; }
///
/// 截止日期
@@ -65,7 +65,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// 备注
///
- public string Remark { get; set; }
+ public string? Remark { get; set; }
public List ReadingPeriodSites { get; set; } = new List();
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs
index a0ef641d8..8195ec03c 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs
@@ -19,12 +19,17 @@ namespace IRaCIS.Core.Domain.Models
///阅片期配置ID
///
- public Guid? ReadingPeriodSetId { get; set; }
+ public Guid ReadingPeriodSetId { get; set; }
+
+ ///
+ /// 项目ID
+ ///
+ public Guid TrialId { get; set; }
///
/// 中心ID
///
- public Guid? SiteId { get; set; }
+ public Guid SiteId { get; set; }