导出修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
335535d6d3
commit
75be9eba74
|
|
@ -24,7 +24,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
IRepository<VisitTask> _visitTaskRepository,
|
||||
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
|
||||
ILogger<GeneralCalculateService> _logger,
|
||||
|
||||
IRepository<OrganInfo> _organInfoRepository,
|
||||
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
|
||||
IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
|
||||
IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
|
||||
|
|
@ -877,7 +877,77 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
return string.Empty;
|
||||
}
|
||||
var answer = string.Empty;
|
||||
if (answerData.ReadingTableQuestionTrial.TableQuestionType == TableQuestionType.Dictionary)
|
||||
|
||||
var needChangeType = new List<QuestionMark?>() {
|
||||
QuestionMark.Organ,
|
||||
QuestionMark.Location,
|
||||
QuestionMark.Part,
|
||||
};
|
||||
if (needChangeType.Contains(questionMark))
|
||||
{
|
||||
|
||||
var rowinfo = _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == taskId && x.ReadingQuestionTrial.LesionType == lesionType && x.RowIndex == rowIndex).FirstOrDefault();
|
||||
if (rowinfo != null)
|
||||
{
|
||||
var organInfo = _organInfoRepository.Where(x => x.Id == rowinfo.OrganInfoId).FirstOrDefault();
|
||||
if (organInfo != null)
|
||||
{
|
||||
if (_userInfo.IsEn_Us)
|
||||
{
|
||||
switch (questionMark)
|
||||
{
|
||||
case QuestionMark.Organ:
|
||||
answer = organInfo.TULOCEN;
|
||||
|
||||
|
||||
break;
|
||||
case QuestionMark.Location:
|
||||
if (organInfo.IsCanEditPosition)
|
||||
{
|
||||
answer = answerData.Answer;
|
||||
}
|
||||
else
|
||||
{
|
||||
answer = organInfo.TULATEN;
|
||||
}
|
||||
break;
|
||||
case QuestionMark.Part:
|
||||
answer = organInfo.PartEN;
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (questionMark)
|
||||
{
|
||||
case QuestionMark.Organ:
|
||||
answer = organInfo.TULOC;
|
||||
break;
|
||||
case QuestionMark.Location:
|
||||
if (organInfo.IsCanEditPosition)
|
||||
{
|
||||
answer = answerData.Answer;
|
||||
}
|
||||
else
|
||||
{
|
||||
answer = organInfo.TULAT;
|
||||
|
||||
}
|
||||
break;
|
||||
case QuestionMark.Part:
|
||||
answer = organInfo.Part;
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else if (answerData.ReadingTableQuestionTrial.TableQuestionType == TableQuestionType.Dictionary)
|
||||
{
|
||||
if (_userInfo.IsEn_Us)
|
||||
{
|
||||
|
|
@ -954,7 +1024,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{
|
||||
picNum += 1;
|
||||
|
||||
return $"图{picNum} ";
|
||||
return $"{_localizer["CriterionCalculateExport_Pic"]}{picNum} ";
|
||||
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue