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

代码修改

Uat_Study
he 2023-03-15 17:04:18 +08:00
parent 4f262f8224
commit fa85421e5d
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -6757,7 +6757,7 @@
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit">
<summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
<summary> OrganInfoAddOrEdit 列表查询参数模型</summary> = string.Empty;
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.Classification">
<summary>

8
IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
View File

@ -393,11 +393,11 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid SystemCriterionId { get; set; }
public string Part { get; set; }
public string Part { get; set; } = string.Empty;
public string TULAT { get; set; }
public string TULAT { get; set; } = string.Empty;
public string TULOC { get; set; }
public string TULOC { get; set; } = string.Empty;
}
@ -405,7 +405,7 @@ namespace IRaCIS.Core.Application.ViewModel
///<summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
///<summary> OrganInfoAddOrEdit 列表查询参数模型</summary> = string.Empty;
public class OrganInfoAddOrEdit
{
public Guid? Id { get; set; }

28
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
View File

@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
private readonly IRepository<OrganInfo> _organInfoRepository;
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
private readonly IRepository<TumorAssessment_RECIST1Point1BM> _tumorAssessment_RECIST1Point1BM;
private readonly IGeneralCalculateService _generalCalculateService;
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
IRepository<OrganInfo> organInfoRepository,
IRepository<SubjectVisit> subjectVisitRepository,
IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
IRepository<TumorAssessment_RECIST1Point1BM> tumorAssessment_RECIST1Point1BM,
IGeneralCalculateService generalCalculateService,
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
)
@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
this._readingQuestionTrialRepository = readingQuestionTrialRepository;
this._organInfoRepository = organInfoRepository;
this._subjectVisitRepository = subjectVisitRepository;
this._tumorAssessmentRepository = tumorAssessmentRepository;
this._tumorAssessment_RECIST1Point1BM = tumorAssessment_RECIST1Point1BM;
this._generalCalculateService = generalCalculateService;
this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
}
@ -1120,7 +1120,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var targetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).Select(x => x.Answer).FirstOrDefault();
var noTargetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NoTargetLesion).Select(x => x.Answer).FirstOrDefault();
var newLesions = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesions).Select(x => x.Answer).FirstOrDefault();
var result = await _tumorAssessmentRepository.Where(x =>
var result = await _tumorAssessment_RECIST1Point1BM.Where(x =>
x.TargetLesion == (TargetAssessment)int.Parse(targetLesion.IsNullOrEmpty() ? TargetAssessment.NA.GetEnumInt() : targetLesion) &&
x.NonTargetLesions == (NoTargetAssessment)int.Parse(noTargetLesion.IsNullOrEmpty() ? NoTargetAssessment.NA.GetEnumInt() : noTargetLesion) &&
x.NewLesion == (NewLesionAssessment)int.Parse(newLesions.IsNullOrEmpty() ? NewLesionAssessment.NA.GetEnumInt() : newLesions)).Select(x => x.OverallEfficacy).ToListAsync();
@ -1388,7 +1388,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// </summary>
/// <param name="inDto"></param>
/// <remarks>
/// 靶病灶疗效评估算法-20230306确认版本：
/// if（基线没有靶病灶）
///{
/// 靶病灶疗效为 ND
@ -1402,7 +1401,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
/// }
///
///if (非淋巴结靶病灶长径之和 == 0 并且所有淋巴结靶病灶的短径 < 10且淋巴结非靶病灶全部消失)
///if (非淋巴结靶病灶长径之和 == 0)
///{
/// 靶病灶疗效为 CR
///
@ -1434,11 +1433,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
///if（上次访视点评估是CR）
/// {
/// if (当前访视点淋巴结病灶,至少一个淋巴结靶病灶短径≥10 mm 并且该淋巴结靶病灶短径绝对增加值≥5 mm)
/// {
/// 靶病灶疗效为 PD
///
/// }
/// if (当前访视点非淋巴结病灶至少一个非淋巴结靶病灶的长径＞0 mm。)
/// {
/// 靶病灶疗效为 PD
@ -1584,8 +1578,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//靶病灶疗效为 PR
result = TargetAssessment.PR;
}
//if (非淋巴结靶病灶长径之和 == 0 并且所有淋巴结靶病灶的短径 < 10且淋巴结非靶病灶全部消失)
if (resultData.SumOfDiameter == 0 && resultData.DiameterLessThan10 && resultData.NonTargetStateIsLoss)
//if (非淋巴结靶病灶长径之和 == 0)
if (resultData.SumOfDiameter == 0)
{
//靶病灶疗效为 CR
result = TargetAssessment.CR;
@ -1619,13 +1613,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//if（上次访视点评估是CR）
if (resultData.LastTargetLesionEvaluate.EqEnum(TargetAssessment.CR))
{
//if (当前访视点淋巴结病灶,至少一个淋巴结靶病灶短径≥10 mm 并且该淋巴结靶病灶短径绝对增加值≥5 mm)
// 换句话说 就是 短径≥10 的病灶 和 短径增加值≥5的病灶 的交集数量大于0
if (resultData.ShortBigger10Indexs.Intersect(resultData.AddFiveIndexs).ToList().Count()>0)
{
//靶病灶疗效为 PD
result = TargetAssessment.PD;
}
//if (当前访视点非淋巴结病灶至少一个非淋巴结靶病灶的长径＞0 mm。)
if (resultData.CurrentMajoreBigger0)
{