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

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-11 14:08:57 +08:00
parent bbfa966b57 6d11fc68b4
commit a0fe7be308
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs
View File

@ -24,6 +24,8 @@ public class TumorCommonQustionInfo
public string TranslateDicName { get; set; } public string TranslateDicName { get; set; }
public ValueUnit? Unit { get; set; } public ValueUnit? Unit { get; set; }
public ValueOfType? ValueType { get; set; }
} }
public class TumorLessionInfo public class TumorLessionInfo
@ -210,9 +212,9 @@ public class TU_TR_RSBaseModel
public string IsJudgeSelectStr => IsJudgeSelect == true ? "Y" : ""; public string IsJudgeSelectStr => IsJudgeSelect == true ? "Y" : "";
public bool IsTargetPD = false; public bool IsTargetPD { get; set; } = false;
public bool IsOverallResponsePD = false; public bool IsOverallResponsePD { get; set; } = false;
//TR表 靶病灶PD了，访视层级的都是最早拍片日期 RS表 整体肿瘤评估PD了，那么疗效评估的拍片日期都给最早的 //TR表 靶病灶PD了，访视层级的都是最早拍片日期 RS表 整体肿瘤评估PD了，那么疗效评估的拍片日期都给最早的
public bool IsPD => Domain == "TR" ? IsTargetPD : IsOverallResponsePD; public bool IsPD => Domain == "TR" ? IsTargetPD : IsOverallResponsePD;

9
IRaCIS.Core.Application/Service/Common/Export/RESISTExportService.cs
View File

@ -302,6 +302,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName, QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer, QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
TranslateDicName = c.ReadingQuestionTrial.DictionaryCode, TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
ValueType = c.ReadingQuestionTrial.ValueType,
Unit = c.ReadingQuestionTrial.Unit Unit = c.ReadingQuestionTrial.Unit
}).ToList(), }).ToList(),
@ -575,9 +576,17 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
tr.OriginalMeasurements = translateDataList[questionAnswer.TranslateDicName].Where(t => t.Code.ToLower() == questionAnswer.QuestionValue?.ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty; tr.OriginalMeasurements = translateDataList[questionAnswer.TranslateDicName].Where(t => t.Code.ToLower() == questionAnswer.QuestionValue?.ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
} }
else else
{
if (questionAnswer.ValueType == ValueOfType.Percentage)
{
tr.OriginalMeasurements = questionAnswer.QuestionValue +"%";
}
else
{ {
tr.OriginalMeasurements = questionAnswer.QuestionValue; tr.OriginalMeasurements = questionAnswer.QuestionValue;
} }
}
tr.OriginalUnit = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)questionAnswer.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty; tr.OriginalUnit = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)questionAnswer.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;