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

修改一版

Test.EIImageViewer
he 2022-06-16 14:29:23 +08:00
parent e96bed8073
commit d9a44f1953
6 changed files with 138 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1629,6 +1629,11 @@
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.GroupName">
<summary>
分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ReadingQuestionCriterionTrialId">
<summary>
系统标准Id
@ -1664,6 +1669,11 @@
父问题ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.Remark">
<summary>
备注
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.TypeValue">
<summary>
类型值
@ -1679,6 +1689,16 @@
Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.GroupName">
<summary>
分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Remark">
<summary>
备注
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ReadingQuestionCriterionSystemId">
<summary>
系统标准Id
@ -1759,6 +1779,11 @@
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto.CriterionId">
<summary>
标准ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionOtherQuestionInDto.Id">
<summary>
当前ID
@ -1784,6 +1809,11 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.GroupName">
<summary>
分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Id">
<summary>
Id
@ -1829,6 +1859,11 @@
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Remark">
<summary>
备注
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.TypeValue">
<summary>
类型值
@ -1849,6 +1884,16 @@
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Remark">
<summary>
备注
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.GroupName">
<summary>
分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Type">
<summary>
类型
@ -4404,6 +4449,20 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetTrialGroupNameList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto)">
<summary>
获取项目问题分组
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetSystemGroupNameList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto)">
<summary>
获取系统问题分组
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ReadModuleService">
<summary>
生成的阅片模块(在大列表上展示的) 阅片期

34
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -107,6 +107,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid Id { get; set; }
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 系统标准Id
/// </summary>
@ -172,6 +177,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid Id { get; set; }
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 备注
/// </summary>
@ -278,6 +288,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsJudgeQuestion { get; set; }
}
public class GetTrialGroupNameListInDto
{
/// <summary>
/// 标准ID
/// </summary>
public Guid CriterionId { get; set; }
}
public class GetTrialCriterionOtherQuestionInDto
{
[NotDefault]
@ -313,7 +334,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string Type { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
@ -322,6 +342,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class AddOrUpdateReadingQuestionSystemInDto
{
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// Id
/// </summary>
@ -408,6 +434,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string Remark { get; set; } = string.Empty;
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 类型
/// </summary>

9
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -28,12 +28,14 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
private readonly IRepository<ReadingClinicalDataView> _readingClinicalDataViewRepository;
private readonly IRepository<PreviousPDF> _previousPDFRepository;
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ReadingClinicalDataPDF> _readingClinicalDataPDFRepository;
public ReadingClinicalDataService(IRepository<ReadingClinicalData> readingClinicalDataRepository,
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
IRepository<ReadingClinicalDataView> readingClinicalDataViewRepository,
IRepository<PreviousPDF> previousPDFRepository,
IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ReadingClinicalDataPDF> readingClinicalDataPDFRepository
)
{
@ -41,6 +43,7 @@ namespace IRaCIS.Application.Services
this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
this._readingClinicalDataViewRepository = readingClinicalDataViewRepository;
this._previousPDFRepository = previousPDFRepository;
this._subjectVisitRepository = subjectVisitRepository;
this._readingClinicalDataPDFRepository = readingClinicalDataPDFRepository;
}
@ -191,11 +194,11 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<PageOutput<GetReadingClinicalDataListOutDto>> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
{
var isBaseLine = await _subjectVisitRepository.AnyAsync(x => x.Id == inDto.ReadingId && x.VisitNum == 0);
var result = await _readingClinicalDataViewRepository.Where(x=>x.SubjectId==inDto.SubjectId)
.Where(x=>x.ReadingId==inDto.ReadingId||x.ReadingId==null).ProjectTo<GetReadingClinicalDataListOutDto>(_mapper.ConfigurationProvider).ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField,
.Where(x=>x.ReadingId==inDto.ReadingId||x.ReadingId==null)
.WhereIf(!isBaseLine,x=>x.IsCRCUpload==false).ProjectTo<GetReadingClinicalDataListOutDto>(_mapper.ConfigurationProvider).ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField,
inDto.Asc);
foreach (var item in result.CurrentPageData)
{
item.ClinicalDataLevelName = item.ClinicalDataLevel.GetDisplayName();

30
IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
View File

@ -510,5 +510,35 @@ namespace IRaCIS.Application.Services
return ResponseOutput.Result(success);
}
/// <summary>
/// 获取项目问题分组
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<string>> GetTrialGroupNameList(GetTrialGroupNameListInDto inDto)
{
var result = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.CriterionId && x.Type == "group")
.Select(x => x.GroupName).ToListAsync();
return result;
}
/// <summary>
/// 获取系统问题分组
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<string>> GetSystemGroupNameList(GetTrialGroupNameListInDto inDto)
{
var result = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == inDto.CriterionId && x.Type == "group")
.Select(x => x.GroupName).ToListAsync();
return result;
}
}
}

5
IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
View File

@ -75,6 +75,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 创建人
/// </summary>

5
IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
View File

@ -73,6 +73,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 创建时间
/// </summary>