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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
hang 2024-03-18 13:06:12 +08:00
parent efda4e0fdd 968264fe9a
commit 259ab2c569
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
View File

@ -29,6 +29,10 @@ namespace IRaCIS.Core.Application.ViewModel
public string RowIndex { get; set; } public string RowIndex { get; set; }
public decimal AllPPD { get; set; } public decimal AllPPD { get; set; }
public decimal AllLDi { get; set; }
public decimal AllSDi { get; set; }
} }
public class GetSplitPPdInDto public class GetSplitPPdInDto

14
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -999,7 +999,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
/// <summary> /// <summary>
/// 计算靶病灶状态 /// 计算分裂靶病灶状态
/// </summary> /// </summary>
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
@ -1148,17 +1148,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
var ppdAnswerList = await _readingTableQuestionAnswerRepository.Where(x => var ppdAnswerList = await _readingTableQuestionAnswerRepository.Where(x =>
x.VisitTaskId == inDto.VisitTaskId && x.VisitTaskId == inDto.VisitTaskId &&
x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.PPD && //x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.PPD &&
x.QuestionId == targetQuestion.Id) x.QuestionId == targetQuestion.Id)
.Select(x => new { .Select(x => new {
x.RowId, x.RowId,
x.RowIndex, x.RowIndex,
x.Answer x.Answer,
x.ReadingTableQuestionTrial.QuestionMark,
}).ToListAsync(); }).ToListAsync();
var answerList = ppdAnswerList.Select(x => new { var answerList = ppdAnswerList.Select(x => new {
x.RowId, x.RowId,
x.RowIndex, x.RowIndex,
Answer = x.Answer.IsNullOrEmptyReturn0() Answer = x.Answer.IsNullOrEmptyReturn0(),
x.QuestionMark,
}).ToList(); }).ToList();
var maxRowIndex = answerList.MaxOrDefault(x => x.RowIndex); var maxRowIndex = answerList.MaxOrDefault(x => x.RowIndex);
for (int i = 1; i < maxRowIndex; i++) for (int i = 1; i < maxRowIndex; i++)
@ -1167,7 +1169,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
RowId = answerList.Where(x => x.RowIndex == i).Select(x => x.RowId).FirstOrDefault(), RowId = answerList.Where(x => x.RowIndex == i).Select(x => x.RowId).FirstOrDefault(),
RowIndex = answerList.Where(x => x.RowIndex == i).Select(x => x.RowIndex).FirstOrDefault().ToString(), RowIndex = answerList.Where(x => x.RowIndex == i).Select(x => x.RowIndex).FirstOrDefault().ToString(),
AllPPD = answerList.Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer), AllPPD = answerList.Where(x=>x.QuestionMark== QuestionMark.PPD).Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer),
AllLDi = answerList.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer),
AllSDi = answerList.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer),
}); });
} }
} }