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

修改

Uat_Study
he 2022-09-20 14:07:57 +08:00
parent 2b9ab0bf68
commit a92a8c8c9a
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1104,6 +1104,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid ReadingQuestionId { get; set; } public Guid ReadingQuestionId { get; set; }
/// <summary>
/// 字典code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary> /// <summary>
/// Type /// Type
/// </summary> /// </summary>

1
IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
View File

@ -594,7 +594,6 @@ namespace IRaCIS.Core.Application.Service
var questionIds = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).Select(x => x.QuestionId).ToList(); var questionIds = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).Select(x => x.QuestionId).ToList();
var lastQuestionAsnwer = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && questionIds.Contains(x.QuestionId)).Include(x=>x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync(); var lastQuestionAsnwer = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && questionIds.Contains(x.QuestionId)).Include(x=>x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync();
var rowIndexs = lastQuestionAsnwer.Where(x=>x.ReadingTableQuestionTrial.QuestionMark==QuestionMark.IsLymph&& (x.Answer == "是" || x.Answer.ToLower() == "true".ToLower())).Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList(); var rowIndexs = lastQuestionAsnwer.Where(x=>x.ReadingTableQuestionTrial.QuestionMark==QuestionMark.IsLymph&& (x.Answer == "是" || x.Answer.ToLower() == "true".ToLower())).Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList();
var thisQuestionAsnwer = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList(); var thisQuestionAsnwer = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
var isExists = false; var isExists = false;

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -1460,6 +1460,7 @@ namespace IRaCIS.Application.Services
GroupName = string.Empty, GroupName = string.Empty,
Id = x.Id, Id = x.Id,
Type = x.Type, Type = x.Type,
DictionaryCode=x.DictionaryCode,
TableQuestionType = x.TableQuestionType, TableQuestionType = x.TableQuestionType,
DependParentId = x.DependParentId, DependParentId = x.DependParentId,
IsDepend = x.IsDepend, IsDepend = x.IsDepend,
@ -1479,6 +1480,7 @@ namespace IRaCIS.Application.Services
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
GroupName = string.Empty, GroupName = string.Empty,
Id = x.Id, Id = x.Id,
DictionaryCode = x.DictionaryCode,
Type = x.Type, Type = x.Type,
TableQuestionType = x.TableQuestionType, TableQuestionType = x.TableQuestionType,
DependParentId = x.DependParentId, DependParentId = x.DependParentId,