XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-04-26 18:27:10 +08:00
parent 8c43bcf030 482a91a08c
commit a86c43d8d9
6 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -1224,6 +1224,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 问题类型
/// </summary>

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

@ -809,6 +809,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 转化显示类型
/// </summary>
public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
/// <summary>
/// 默认值
/// </summary>
@ -1092,6 +1097,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 转化显示类型
/// </summary>
public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
/// <summary>
/// 默认值
@ -1576,6 +1586,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 转化显示类型
/// </summary>
public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
/// <summary>
/// 默认值
/// </summary>
@ -1739,7 +1754,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// <summary>
/// 转化显示类型
/// </summary>
public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
/// <summary>
/// 默认值
/// </summary>
public string DefaultValue { get; set; } =string.Empty;

11
IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
View File

@ -109,7 +109,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
result.ReadingTaskState = visitTaskInfo.ReadingTaskState;
var isConvertTask= await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(x=>x.IsConvertedTask).FirstNotNullAsync();
result.ReadingTaskState = visitTaskInfo.ReadingTaskState;
var taskInfoList = await _generalCalculateService.GetReadingReportTaskList(indto.VisitTaskId);
result.VisitTaskList = taskInfoList;
@ -117,7 +121,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var visitTaskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();
var criterionId = visitTaskInfo.TrialReadingCriterionId;
var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId&&x.ShowQuestion!= ShowQuestion.Hide).ToListAsync();
var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId&&x.ShowQuestion!= ShowQuestion.Hide)
.WhereIf(isConvertTask,x=>x.ConvertShowType==ConvertShowType.All||x.ConvertShowType==ConvertShowType.AfterShow)
.WhereIf(!isConvertTask, x => x.ConvertShowType == ConvertShowType.All || x.ConvertShowType == ConvertShowType.BeforeShow)
.ToListAsync();
var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();

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

@ -905,7 +905,29 @@ namespace IRaCIS.Core.Domain.Share
}
public enum ReadingSetType
/// <summary>
/// 转化显示类型
/// </summary>
public enum ConvertShowType
{
/// <summary>
/// 全都显示
/// </summary>
All = 0,
/// <summary>
/// 转化前显示
/// </summary>
BeforeShow = 1,
/// <summary>
/// 转化后显示
/// </summary>
AfterShow = 2
}
public enum ReadingSetType
{
/// <summary>
/// 影像阅片

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

@ -145,6 +145,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 转化显示类型
/// </summary>
public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
/// <summary>
/// 默认值
/// </summary>

6
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -88,6 +88,12 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 转化显示类型
/// </summary>
public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
/// <summary>
/// 备注
/// </summary>