Compare commits

..

No commits in common. "f83819d0c93a437feaaa293a10a6680257283126" and "71f978609ba5e73c2c375c62e7b4d1ff2318bc7c" have entirely different histories.

2 changed files with 7 additions and 21 deletions

View File

@ -5395,7 +5395,7 @@
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.ChangeLastTaskSiteVisitForTumorEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.ChangeLastTaskSiteVisitForTumorEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary> <summary>
修改上一次访视结果 并且计算是不是PD 修改上一次访视结果
</summary> </summary>
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>

View File

@ -867,15 +867,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
TrialId = x.TrialId, TrialId = x.TrialId,
}).ToListAsync(); }).ToListAsync();
// 肛门淋巴结
var portalOrgan = await _organInfoRepository.Where(x => x.SystemCriterionId == trialReadingCriterion.ReadingQuestionCriterionSystemId &&
x.Part == "肝门淋巴结" &&
x.IsLymphNodes == IsLymph.Yes
).FirstOrDefaultAsync();
foreach (var item in recistTableAnswers) foreach (var item in recistTableAnswers)
{ {
var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault(); var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault();
@ -883,19 +874,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
item.QuestionId = rowinfo.QuestionId; item.QuestionId = rowinfo.QuestionId;
var IslymphNode= recistTableAnswers.Where(x=>x.RowId== item.RowId&&x.QuestionMark==QuestionMark.IsLymph).Select(x=>x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
if (portalOrgan != null && rowinfo.OrganInfoId == portalOrgan.Id) var minorAxis= recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
var iSbetween15and20= minorAxis >= 15 && minorAxis < 20;
if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
{ {
var IslymphNode = recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.IsLymph).Select(x => x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes); item.Answer = string.Empty;
var minorAxis = recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
var iSbetween15and20 = minorAxis >= 15 && minorAxis < 20;
if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
{
item.Answer = string.Empty;
}
} }
} }