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

修改

Uat_Study
he 2023-03-22 14:49:41 +08:00
parent 3ab00c54bf
commit e5f92c198c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -836,10 +836,10 @@ namespace IRaCIS.Application.Services
isEn_Us=_userInfo.IsEn_Us isEn_Us=_userInfo.IsEn_Us
}).OrderBy(x => x.ShowOrder).ToListAsync(); }).OrderBy(x => x.ShowOrder).ToListAsync();
var taskInfo = new VisitTask();
if (inDto.TaskId != null) if (inDto.TaskId != null)
{ {
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync(); taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync();
qusetionList.ForEach(x => qusetionList.ForEach(x =>
{ {
@ -857,7 +857,7 @@ namespace IRaCIS.Application.Services
} }
//是否是预览 //是否是预览
if (inDto.IsGetPreview == false) if (inDto.IsGetPreview == false)
{ {
// 是否获取所有问题 // 是否获取所有问题
if (inDto.IsGetallQuestion) if (inDto.IsGetallQuestion)
@ -873,6 +873,13 @@ namespace IRaCIS.Application.Services
{ {
qusetionList = qusetionList.Where(x => x.IsShowInDicom && (x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.Group)).OrderBy(x => x.ShowOrder).ToList(); qusetionList = qusetionList.Where(x => x.IsShowInDicom && (x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.Group)).OrderBy(x => x.ShowOrder).ToList();
} }
if (inDto.TaskId != null&& !taskInfo.IsConvertedTask)
{
qusetionList= qusetionList.Where(x=>x.QuestionType!=QuestionType.IsConverted).OrderBy(x => x.ShowOrder).ToList();
}
var usedGuropIds = qusetionList.Where(x => x.Type == ReadingQestionType.Table).Select(x => x.GroupId).ToList(); var usedGuropIds = qusetionList.Where(x => x.Type == ReadingQestionType.Table).Select(x => x.GroupId).ToList();
qusetionList = qusetionList.Where(x => usedGuropIds.Contains(x.Id)|| usedGuropIds.Contains(x.GroupId)).ToList(); qusetionList = qusetionList.Where(x => usedGuropIds.Contains(x.Id)|| usedGuropIds.Contains(x.GroupId)).ToList();
} }
@ -906,7 +913,7 @@ namespace IRaCIS.Application.Services
if(inDto.TaskId!=null) if(inDto.TaskId!=null)
{ {
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync(); taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync();
// 取基线 // 取基线
var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstNotNullAsync(); var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstNotNullAsync();

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

@ -1168,6 +1168,11 @@ namespace IRaCIS.Core.Domain.Share
/// 是否脑转移 /// 是否脑转移
/// </summary> /// </summary>
IsBrainMetastasis=43, IsBrainMetastasis=43,
/// <summary>
/// 是否转变之后表格问题
/// </summary>
IsConverted = 44,
} }
/// <summary> /// <summary>