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

lugano 长短经导表修改

Test_IRC_Net8
hang 2025-12-03 16:21:26 +08:00
parent 647aee010a
commit e1632b58ac
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,7 +514,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
{ {
if (OncologyResult.OncologyReason.IsNotNullOrEmpty()) if (OncologyResult.OncologyReason.IsNotNullOrEmpty())
{ {
var co = CreatNewCOExport(task, coList.Count + 1); var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = $"{OncologyResult?.VisitName}_ONCOLOGY_COMMENTS"; co.RemarksQuote = $"{OncologyResult?.VisitName}_ONCOLOGY_COMMENTS";
@ -525,7 +525,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
co.Remarks = OncologyResult.OncologyReason; co.Remarks = OncologyResult.OncologyReason;
co.CODTC = task.SignTime?.ToString("yyyy-MM-dd"); co.CODTC = task.SignTime?.ToString("yyyy-MM-dd");
@ -535,7 +535,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
if (OncologyResult.OncologyResult.IsNotNullOrEmpty()) if (OncologyResult.OncologyResult.IsNotNullOrEmpty())
{ {
var visitTask = taskList.Where(t => t.VisitNum == OncologyResult?.VisitTaskNum && t.SubjectCode==task.SubjectCode).FirstOrDefault(); var visitTask = taskList.Where(t => t.VisitNum == OncologyResult?.VisitTaskNum && t.SubjectCode == task.SubjectCode).FirstOrDefault();
var rs = CreatNewRSExport(task, rs_subjectIndexNoDic); var rs = CreatNewRSExport(task, rs_subjectIndexNoDic);
@ -547,7 +547,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
rs.LatestScanDate = visitTask?.LatestScanDate; rs.LatestScanDate = visitTask?.LatestScanDate;
rs.EarliestScanDate = visitTask?.EarliestScanDate; rs.EarliestScanDate = visitTask?.EarliestScanDate;
Fill_RS_IndexValue(rs, 9, Lugano_RSFixed.RSValueList); Fill_RS_IndexValue(rs, 9, Lugano_RSFixed.RSValueList);
@ -781,7 +781,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
rsValueList = RESIST_RSFixed.RSValueList; rsValueList = RESIST_RSFixed.RSValueList;
overallPD = "PD"; overallPD = "PD";
} }
else if (criterion.CriterionType == CriterionType.Lugano2014) else if (criterion.CriterionType == CriterionType.Lugano2014)
@ -1205,6 +1205,38 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
} }
} }
if (trValueTypeIndex == 0 || trValueTypeIndex == 1)
{
if (lesion.LessionType == LesionType.TargetLesion)
{
//处理消失 空为0mm
if (lessionAnswer.QuestionValue.IsNullOrEmpty() && lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.State)?.QuestionValue == "3")
{
lessionAnswer.QuestionValue = "0";
}
}
//有值 就展示，没值就不展示
else if (lesion.LessionType == LesionType.NonTargetLesions || lesion.LessionType == LesionType.NewLesions)
{
if (lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.ShortAxis)?.QuestionValue.IsNotNullOrEmpty() == true
|| lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.MajorAxis)?.QuestionValue.IsNotNullOrEmpty() == true)
{
}
else
{
trValueTypeIndex = -1;
}
}
else
{
trValueTypeIndex = -1;
}
}
return trValueTypeIndex; return trValueTypeIndex;