Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-11-12 16:19:15 +08:00
commit c6920a1995
2 changed files with 6 additions and 2 deletions

View File

@ -368,7 +368,11 @@ public class TR_Export : TU_TR_RSBaseModel
/// <summary>
/// 标准结果(数值) TRORRESU
/// </summary>
public string StandardResult_Numeric => double.TryParse(OriginalMeasurements, out _) ? OriginalMeasurements : "";
public string StandardResult_Numeric => double.TryParse(OriginalMeasurements, out _) ||
(OriginalMeasurements?.EndsWith("%") == true &&
double.TryParse(OriginalMeasurements.TrimEnd('%'), out _))
? OriginalMeasurements
: "";
/// <summary>
/// 标准单位 TRSTRESU

View File

@ -1786,6 +1786,6 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
}
}
return resultExceptJudgeList.Union(judegeList).ToList();
return resultExceptJudgeList.Union(judegeList).OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ThenBy(t => t.ArmEnum).ToList();
}
}