XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2022-06-06 19:35:10 +08:00
parent 46b5846d0c
commit f4d666b316
4 changed files with 100 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -467,6 +467,31 @@
排序字段
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.TrialSiteCode">
<summary>
项目中心Code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.SubjectCode">
<summary>
受试者Code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.ModuleType">
<summary>
模块类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.Status">
<summary>
状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.Name">
<summary>
任务名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSubjectReadVisitsInDto.ReadingSetType">
<summary>
阅片配置的类型
@ -627,6 +652,11 @@
中心Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.TrialSiteCode">
<summary>
项目中心Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.IsFinalVisit">
<summary>
是否为末次访视

35
IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
View File

@ -14,7 +14,31 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? SubjectId { get; set; }
/// <summary>
/// 项目中心Code
/// </summary>
public string? TrialSiteCode { get; set; }
/// <summary>
/// 受试者Code
/// </summary>
public string? SubjectCode { get; set; }
/// <summary>
/// 模块类型
/// </summary>
public ModuleTypeEnum? ModuleType { get; set; }
/// <summary>
/// 状态
/// </summary>
public ReadModuleEnum? Status { get; set; }
/// <summary>
/// 任务名称
/// </summary>
public string? Name { get; set; }
}
public class GetSubjectReadVisitsOutDto
@ -229,6 +253,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string SiteCode { get; set; }
/// <summary>
/// 项目中心Id
/// </summary>
public string TrialSiteCode { get; set; }
/// <summary>
/// 是否为末次访视
/// </summary>
@ -306,7 +335,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public string SubjectCode { get; set; }
public string SiteCode { get; set; }
public string TrialSiteCode { get; set; }
public Guid SiteId { get; set; }

34
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
View File

@ -61,10 +61,13 @@ namespace IRaCIS.Application.Services
{
var subjectQuery = _subjectRepository.WhereIf(dto.TrialId!=null, x => x.TrialId == dto.TrialId)
.WhereIf(dto.SubjectId != null, x => x.Id == dto.SubjectId)
.Include(x => x.SubjectVisitList).Include(x=>x.Site).Include(x => x.TrialSite)
.Include(x => x.SubjectVisitList).Include(x => x.Site).Include(x => x.TrialSite)
//.WhereIf(dto.TrialSiteCode != null, x => x.TrialSite.TrialSiteCode == dto.TrialSiteCode)
// .WhereIf(dto.SubjectCode != null, x => x.Code == dto.SubjectCode)
.Select(x => new GetReadModuleDtoOut
{
SiteCode = x.TrialSite.TrialSiteCode,
TrialSiteCode = x.TrialSite.TrialSiteCode,
SiteId = x.SiteId,
SubjectCode = x.Code,
SubjectId = x.Id,
@ -79,7 +82,7 @@ namespace IRaCIS.Application.Services
Status= ReadingCommon.GetVisitSubmitStateEnum(y), // 状态
CreateTime = y.CreateTime, // 创建时间
SubjectCode = y.Subject.Code, // 受试者code
SiteCode = x.TrialSite.TrialSiteCode, // 中心Code
TrialSiteCode = x.TrialSite.TrialSiteCode, // 中心Code
VisitNum=y.VisitNum,
IsFinalVisit=y.IsFinalVisit, // 是否为末次评估
@ -94,6 +97,7 @@ namespace IRaCIS.Application.Services
});
var pageList = await subjectQuery.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField == null|| dto.SortField==string.Empty ? "SiteCode" : dto.SortField,
@ -125,7 +129,7 @@ namespace IRaCIS.Application.Services
ModuleType=y.ModuleType,
Status= ReadingCommon.GetVisitSubmitStateEnum(y.SubjectVisit),
SubjectCode= x.SubjectCode,
SiteCode=x.SiteCode,
TrialSiteCode = x.TrialSiteCode,
SubjectVisitId= y.SubjectVisitId,
SubjectVisitName=y.SubjectVisit?.VisitName, // 截止访视名称
CutOffVisitId = y.SubjectVisitId, // 截止访视
@ -136,9 +140,29 @@ namespace IRaCIS.Application.Services
}));
x.Data.OrderBy(y => y.ModuleType);
x.Data= x.Data.OrderBy(y => y.ModuleType).ThenBy(x=>x.VisitNum).ToList();
});
pageList.CurrentPageData.ForEach(x => {
if (dto.ModuleType != null)
{
x.Data = x.Data.Where(y => y.ModuleType == dto.ModuleType).ToList();
}
if (dto.Status != null)
{
x.Data = x.Data.Where(y => y.Status == dto.Status).ToList();
}
if (dto.Name != null)
{
x.Data = x.Data.Where(y => y.Name.Contains(y.Name)).ToList();
}
});
return (pageList, new
{
MaxLength = pageList.CurrentPageData.ToList().Max(x => x.Data.Count)

14
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -26,20 +26,22 @@ namespace IRaCIS.Core.Domain.Share.Reading
/// </summary>
Read = 2,
/// <summary>
/// 全局阅片
/// </summary>
Global = 3,
/// <summary>
/// 裁判
/// </summary>
Referee = 3,
Referee = 4,
/// <summary>
/// 肿瘤学
/// </summary>
Oncology = 4,
Oncology = 5,
/// <summary>
/// 全局阅片
/// </summary>
Global = 5,
}
public enum ReadingSetType