Compare commits
No commits in common. "024e62103a4bd0919404842488617292680bf3ae" and "7a0b29bda63019baad8614b2fe50004e34fd1c93" have entirely different histories.
024e62103a
...
7a0b29bda6
|
|
@ -520,17 +520,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
|
||||||
oct.TESTCD = mark;
|
oct.TESTCD = mark;
|
||||||
|
|
||||||
// 测量参数值
|
// 测量参数值
|
||||||
|
oct.ORRES = lessionAnswer?.QuestionValue ?? string.Empty;
|
||||||
if (lessionAnswer.TranslateDicName.IsNotNullOrEmpty())
|
|
||||||
{
|
|
||||||
oct.ORRES = translateDataList[lessionAnswer.TranslateDicName].Where(t => t.Code.ToLower() == lessionAnswer.QuestionValue?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
oct.ORRES = lessionAnswer?.QuestionValue ?? string.Empty;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 测量值单位
|
// 测量值单位
|
||||||
oct.ORRESU = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)lessionAnswer.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
|
oct.ORRESU = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)lessionAnswer.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
|
||||||
|
|
@ -795,19 +785,13 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
|
||||||
// 脂质角度最大值
|
// 脂质角度最大值
|
||||||
oct.LAMAX = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MaxAvgLipidAngle).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
oct.LAMAX = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MaxAvgLipidAngle).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
||||||
// 巨噬细胞浸润
|
// 巨噬细胞浸润
|
||||||
|
oct.PLAMACRI = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MacrophageInfiltration).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
||||||
var macri = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MacrophageInfiltration).FirstOrDefault();
|
|
||||||
oct.PLAMACRI = translateDataList[macri?.TranslateDicName].Where(t => t.Code.ToLower() == macri?.QuestionValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
|
|
||||||
// 巨噬细胞浸润角度
|
// 巨噬细胞浸润角度
|
||||||
oct.PLAMIARC = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MacrophageExtensionAngle).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
oct.PLAMIARC = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MacrophageExtensionAngle).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
||||||
// 微通道
|
// 微通道
|
||||||
|
oct.PLAMC = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.Microchannels).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
||||||
var mc = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.Microchannels).FirstOrDefault();
|
|
||||||
oct.PLAMC = translateDataList[mc?.TranslateDicName].Where(t => t.Code.ToLower() == mc?.QuestionValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
|
|
||||||
// 胆固醇结晶
|
// 胆固醇结晶
|
||||||
|
oct.PLACCS = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.CholesterolCrystallization).FirstOrDefault()?.QuestionValue ?? string.Empty;
|
||||||
var ccs = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.CholesterolCrystallization).FirstOrDefault();
|
|
||||||
oct.PLACCS = translateDataList[ccs?.TranslateDicName].Where(t => t.Code.ToLower() == ccs?.QuestionValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
|
|
||||||
|
|
||||||
return oct;
|
return oct;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue