稽查答案修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
4d185f6f99
commit
7189ea563c
|
@ -101,6 +101,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList, string? answer)
|
public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList, string? answer)
|
||||||
{
|
{
|
||||||
|
if (answer == null|| answer==string.Empty)
|
||||||
|
{
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
if (answerType == "upload")
|
if (answerType == "upload")
|
||||||
{
|
{
|
||||||
return "❄❅❆❇❈❉❊";
|
return "❄❅❆❇❈❉❊";
|
||||||
|
@ -3234,9 +3239,37 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
.Where(x => x.RowId == entity.RowId && x.TableQuestionId == entity.TableQuestionId).FirstOrDefault();
|
.Where(x => x.RowId == entity.RowId && x.TableQuestionId == entity.TableQuestionId).FirstOrDefault();
|
||||||
var answer = string.Empty;
|
var answer = string.Empty;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (tableQuestionAnswer != null)
|
if (tableQuestionAnswer != null)
|
||||||
{
|
{
|
||||||
answer = tableQuestionAnswer.Answer;
|
|
||||||
|
|
||||||
|
var tableQuesionList = await _dbContext.ReadingTableQuestionTrial.Where(t =>t.Id== tableQuestionAnswer.TableQuestionId).Select(t =>
|
||||||
|
new
|
||||||
|
{
|
||||||
|
TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id
|
||||||
|
Type = t.ReadingQuestionTrial.QuestionName, //病灶类型
|
||||||
|
t.Unit,
|
||||||
|
t.CustomUnit,
|
||||||
|
t.DictionaryCode,
|
||||||
|
t.QuestionName,
|
||||||
|
t.QuestionEnName,
|
||||||
|
QuestionId = t.Id,
|
||||||
|
t.ShowOrder,
|
||||||
|
AnswerType = t.Type,
|
||||||
|
})
|
||||||
|
.OrderBy(t => t.ShowOrder).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
List<UnitData> unitDataList = (await _dbContext.Dictionary.Where(x => x.Parent.Code == "ValueUnit").Where(x => x.Code != "0").ToListAsync()).Select(x => new UnitData()
|
||||||
|
{
|
||||||
|
|
||||||
|
Unit = (ValueUnit)int.Parse(x.Code),
|
||||||
|
UnitName = x.Value.ToString(),
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
answer = Translationunit(tableQuesionList.AnswerType, tableQuesionList.Unit, tableQuesionList.CustomUnit, unitDataList, tableQuestionAnswer.Answer) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
|
var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
|
||||||
|
|
Loading…
Reference in New Issue