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

修改

Test.EIImageViewer
he 2023-01-16 12:08:11 +08:00
parent 8e22284833
commit c1db506baf
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1291,16 +1291,18 @@ namespace IRaCIS.Application.Services
}; };
string msg = string.Empty;
foreach (var item in tableQuestions)
{
var answer = inDto.AnswerList.Where(x => x.TableQuestionId == item.Id).Select(x => x.Answer).FirstOrDefault();
if (!answer.IsNullOrEmpty())
{
Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>() Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>()
{ {
{CriterionType.RECIST1Pointt1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]}, {CriterionType.RECIST1Pointt1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]},
}; };
string msg = string.Empty;
foreach (var item in tableQuestions)
{
var answer = inDto.AnswerList.Where(x => x.TableQuestionId == item.Id).Select(x => x.Answer).FirstOrDefault();
if (!answer.IsNullOrEmpty())
{
var rowCount = 0; var rowCount = 0;
if ((item.QuestionMark == QuestionMark.Part|| item.QuestionMark == QuestionMark.Organ) &&inDto.OrganInfoId!=null) if ((item.QuestionMark == QuestionMark.Part|| item.QuestionMark == QuestionMark.Organ) &&inDto.OrganInfoId!=null)
{ {
@ -1309,13 +1311,21 @@ namespace IRaCIS.Application.Services
var orginInfos = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync(); var orginInfos = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
List<OrganInfo?> orginInfoList = new List<OrganInfo?>();
foreach (var organId in organIds)
{
orginInfoList.Add(orginInfos.Where(x=>x.Id==organId).FirstOrDefault());
}
var currentOrginInfo = orginInfos.Where(x => x.Id == inDto.OrganInfoId).FirstOrDefault()??new OrganInfo ();
if (item.QuestionMark == QuestionMark.Part) if (item.QuestionMark == QuestionMark.Part)
{ {
rowCount = orginInfos.Select(x => x.Part).Distinct().Count(); rowCount = orginInfoList.Where(x=>x.Part== currentOrginInfo.Part).Count();
} }
else else
{ {
rowCount = orginInfos.Select(x => x.TULOC).Distinct().Count(); rowCount = orginInfoList.Where(x => x.TULOC == currentOrginInfo.TULOC).Count();
} }
if (rowCount > item.MaxRowCount.Value) if (rowCount > item.MaxRowCount.Value)