diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs index 21a563927..dd8ce3cd5 100644 --- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs @@ -514,7 +514,7 @@ public class Tumor_CDISC_ExportService(IRepository 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); @@ -547,7 +547,7 @@ public class Tumor_CDISC_ExportService(IRepository 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;