bug 修改
parent
4c3a96a0f6
commit
c37903b2f4
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -355,7 +355,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// <summary>
|
||||
/// 检查号
|
||||
/// </summary>
|
||||
public int StudyCode { get; set; }
|
||||
public string StudyIdStr { get; set; }
|
||||
|
||||
public Guid? RowId { get; set; }
|
||||
|
||||
|
|
@ -382,7 +382,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
}
|
||||
else
|
||||
{
|
||||
return $"{StudyCode}/{SeriesNumber}/{InstanceNumber}";
|
||||
return $"{StudyIdStr}/{SeriesNumber}/{InstanceNumber}";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Organ = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Organ, item.RowIndex),
|
||||
Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Part, item.RowIndex),
|
||||
Number = num,
|
||||
StudyCode = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.Code).FirstOrDefault(),
|
||||
StudyIdStr = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.StudyId).FirstOrDefault(),
|
||||
RowId = item.Id,
|
||||
SeriesNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.SeriesNumber).FirstOrDefault(),
|
||||
InstanceNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.InstanceNumber).FirstOrDefault(),
|
||||
|
|
|
|||
|
|
@ -106,6 +106,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
// 所有访视问题的答案
|
||||
var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
|
||||
|
||||
foreach (var item in answerList)
|
||||
{
|
||||
|
||||
if (item.ReadingQuestionTrial.QuestionType == QuestionType.DaysBetween)
|
||||
{
|
||||
if (item.Answer == "-1")
|
||||
{
|
||||
item.Answer = _localizer["CriterionCalculateExport_Unknown"];
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// 单位字典
|
||||
var unitDictionary = await _dictionaryRepository.Where(x => x.Code == "ValueUnit").Include(x => x.ChildList).ToListAsync();
|
||||
var imageProblem = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, inDto.VisitTaskId, QuestionType.ImageQualityAssessment);
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Organ = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Organ, item.RowIndex),
|
||||
Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Part, item.RowIndex),
|
||||
Number = num,
|
||||
StudyCode = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.Code).FirstOrDefault(),
|
||||
StudyIdStr = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.StudyId).FirstOrDefault(),
|
||||
RowId = item.Id,
|
||||
SeriesNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.SeriesNumber).FirstOrDefault(),
|
||||
InstanceNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.InstanceNumber).FirstOrDefault(),
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Organ = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Organ, item.RowIndex),
|
||||
Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Part, item.RowIndex),
|
||||
Number = num,
|
||||
StudyCode = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.Code).FirstOrDefault(),
|
||||
StudyIdStr = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.StudyId).FirstOrDefault(),
|
||||
RowId = item.Id,
|
||||
SeriesNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.SeriesNumber).FirstOrDefault(),
|
||||
InstanceNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.InstanceNumber).FirstOrDefault(),
|
||||
|
|
|
|||
Loading…
Reference in New Issue