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

修改

Browse Source
This commit is contained in:
he
2022-11-10 13:43:30 +08:00
parent 55b98cae7b
commit f68a46da54
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+14 -2
View File
@@ -936,7 +936,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.Select(x => x.RowId).Distinct().ToListAsync();
IEnumerable<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> stateIsNullList = tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> allExists = measureDataList.Intersect(stateIsNullList).ToList();
measureDataList = measureDataList.Except(allExists).ToList();
stateIsNullList = stateIsNullList.Except(allExists).ToList();
if (measureDataList.Count() > 0)
@@ -947,7 +954,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (tableAnswerList.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()))}状态为空,";
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}状态为空,";
}
if (allExists.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}未做标记，且状态为空,";
}
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+14 -2
View File
@@ -527,7 +527,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.Select(x => x.RowId).Distinct().ToListAsync();
IEnumerable<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> stateIsNullList = tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> allExists = measureDataList.Intersect(stateIsNullList).ToList();
measureDataList = measureDataList.Except(allExists).ToList();
stateIsNullList = stateIsNullList.Except(allExists).ToList();
if (measureDataList.Count() > 0)
@@ -538,7 +545,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (tableAnswerList.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()))}状态为空,";
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}状态为空,";
}
if (allExists.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}未做标记，且状态为空,";
}