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

uat-lugano NA%

Test_IRC_Net8
hang 2025-12-02 10:54:28 +08:00
parent 7be3813527
commit fafc075735
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
View File

@ -314,7 +314,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
LesionList = t.LesionList.OrderBy(t => t.RowMark).Select(c => new TumorLessionInfo()
{
Id = c.Id,
OrganInfoId=c.OrganInfoId,
OrganInfoId = c.OrganInfoId,
LessionType = c.ReadingQuestionTrial.LesionType,
LessionCode = c.RowMark,
SplitRowId = c.SplitRowId,
@ -389,7 +389,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
.Union(new List<string>() { "ArmEnum", "ValueUnit", "GlobalAssessType", "ImageQualityIssues" })
.Distinct().ToArray();
var trialOrganDic = _trialOrganRepository.Where(t => t.TrialCriterionId == criterion.Id).Select(t=>new {t.OrganInfoId,t.Part,t.PartEN}).ToDictionary(
var trialOrganDic = _trialOrganRepository.Where(t => t.TrialCriterionId == criterion.Id).Select(t => new { t.OrganInfoId, t.Part, t.PartEN }).ToDictionary(
t => t.OrganInfoId,
t => new { t.Part, t.PartEN }
);
@ -660,7 +660,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
}
else
{
if (questionAnswer.ValueType == ValueOfType.Percentage)
if (questionAnswer.ValueType == ValueOfType.Percentage && double.TryParse(questionAnswer.QuestionValue, out _))
{
tr.OriginalMeasurements = questionAnswer.QuestionValue + "%";
@ -721,7 +721,9 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
rs.RespondEfficacyAssessment = questionAnswer.QuestionValue;
}
if (questionAnswer.QuestionType == QuestionType.Tumor)
if ((questionAnswer.QuestionType == QuestionType.Tumor && criterion.CriterionType == CriterionType.RECIST1Point1)||
(questionAnswer.QuestionType == QuestionType.ImgOncology && criterion.CriterionType == CriterionType.Lugano2014))
{
rs.AssessmentReason = task.VisitNote;
@ -1277,7 +1279,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
case QuestionType.NoTargetLesion:
rsValueTypeIndex = 1;
break;
case QuestionType.NewLesions:
case QuestionType.NewLesionEvaluation:
rsValueTypeIndex = 2;
break;