diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index c52280d2d..54e886cdd 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -6757,7 +6757,7 @@
- OrganInfoAddOrEdit 列表查询参数模型
+ OrganInfoAddOrEdit 列表查询参数模型 = string.Empty;
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index bc355685d..0a2315ad7 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -393,19 +393,19 @@ 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;
}
-
- /// OrganInfoAddOrEdit 列表查询参数模型
+
+ /// OrganInfoAddOrEdit 列表查询参数模型 = string.Empty;
public class OrganInfoAddOrEdit
{
public Guid? Id { get; set; }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index 9ebd7c356..cd48d876e 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
private readonly IRepository _readingQuestionTrialRepository;
private readonly IRepository _organInfoRepository;
private readonly IRepository _subjectVisitRepository;
- private readonly IRepository _tumorAssessmentRepository;
+ private readonly IRepository _tumorAssessment_RECIST1Point1BM;
private readonly IGeneralCalculateService _generalCalculateService;
private readonly IRepository _readingTaskQuestionAnswerRepository;
@@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository readingQuestionTrialRepository,
IRepository organInfoRepository,
IRepository subjectVisitRepository,
- IRepository tumorAssessmentRepository,
+ IRepository tumorAssessment_RECIST1Point1BM,
IGeneralCalculateService generalCalculateService,
IRepository 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,8 +1388,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
///
///
- /// 靶病灶疗效评估算法-20230306确认版本：
- ///if（基线没有靶病灶）
+ /// if（基线没有靶病灶）
///{
/// 靶病灶疗效为 ND
///}else
@@ -1402,8 +1401,8 @@ 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)
{