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 running
Details
continuous-integration/drone/push Build is running
Details
commit
9ee85bfa3c
|
|
@ -480,6 +480,22 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public ValueUnit? Unit { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 数值类型
|
||||
/// </summary>
|
||||
public ValueOfType? ValueType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 自定义单位
|
||||
/// </summary>
|
||||
public string? CustomUnit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 类型
|
||||
/// </summary>
|
||||
public string? Type { get; set; }
|
||||
|
||||
public List<ReportChartData> ChartDataList { get; set; }
|
||||
|
||||
|
||||
|
|
@ -536,6 +552,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public ReportChartType? ChartType { get; set; }
|
||||
public string GroupName { get; set; }
|
||||
public ValueUnit? Unit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数值类型
|
||||
/// </summary>
|
||||
public ValueOfType? ValueType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 自定义单位
|
||||
/// </summary>
|
||||
public string? CustomUnit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 类型
|
||||
/// </summary>
|
||||
public string? Type { get; set; }
|
||||
public List<string> VisitTaskNameList { get; set; } = new List<string>();
|
||||
public List<DateTime?> LatestScanDateList { get; set; } = new List<DateTime?>();
|
||||
public List<ReportChartData> ChartDataList { get; set; } = new List<ReportChartData>();
|
||||
|
|
|
|||
|
|
@ -294,6 +294,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
});
|
||||
result.ChartDataList = reportData.ChartDataList;
|
||||
result.Unit = reportData.Unit;
|
||||
result.CustomUnit = reportData.CustomUnit;
|
||||
reportData.Type=reportData.Type;
|
||||
result.ValueType=reportData.ValueType;
|
||||
}
|
||||
else if (inDto.QuestionId != null)
|
||||
{
|
||||
|
|
@ -302,6 +305,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
if (question != null)
|
||||
{
|
||||
result.Unit = question.Unit;
|
||||
result.Type = question.Type;
|
||||
result.ValueType = question.ValueType;
|
||||
result.CustomUnit = question.CustomUnit;
|
||||
ReportChartData chartData = new ReportChartData()
|
||||
{
|
||||
Name = question.QuestionName,
|
||||
|
|
@ -330,6 +336,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
if (lesion != null)
|
||||
{
|
||||
result.Unit = lesion.Unit;
|
||||
result.Type = lesion.Type;
|
||||
result.ValueType = lesion.ValueType;
|
||||
result.CustomUnit = lesion.CustomUnit;
|
||||
ReportChartData chartData = new ReportChartData()
|
||||
{
|
||||
Name = lesion.QuestionName,
|
||||
|
|
@ -391,11 +400,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{
|
||||
chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer[i].Answer).FirstOrDefault());
|
||||
result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Unit).FirstOrDefault();
|
||||
result.Type = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Type).FirstOrDefault();
|
||||
result.ValueType = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.ValueType).FirstOrDefault();
|
||||
result.CustomUnit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.CustomUnit).FirstOrDefault();
|
||||
}
|
||||
else
|
||||
{
|
||||
chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Answer[i].Answer).FirstOrDefault());
|
||||
result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Unit).FirstOrDefault();
|
||||
result.Type = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Type).FirstOrDefault();
|
||||
result.ValueType = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.ValueType).FirstOrDefault();
|
||||
result.CustomUnit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.CustomUnit).FirstOrDefault();
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -403,6 +418,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
case CriterionType.Lugano2014WithoutPET:
|
||||
chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.PPD).Select(x => x.Answer[i].Answer).FirstOrDefault());
|
||||
result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.PPD).Select(x => x.Unit).FirstOrDefault();
|
||||
result.Type = item.Childrens.Where(x => x.QuestionMark == QuestionMark.PPD).Select(x => x.Type).FirstOrDefault();
|
||||
result.ValueType = item.Childrens.Where(x => x.QuestionMark == QuestionMark.PPD).Select(x => x.ValueType).FirstOrDefault();
|
||||
result.CustomUnit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.PPD).Select(x => x.CustomUnit).FirstOrDefault();
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -434,8 +452,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.Answer[i].Answer).FirstOrDefault());
|
||||
result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.Unit).FirstOrDefault();
|
||||
|
||||
|
||||
result.Type = item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.Type).FirstOrDefault();
|
||||
result.ValueType = item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.ValueType).FirstOrDefault();
|
||||
result.CustomUnit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.CustomUnit).FirstOrDefault();
|
||||
}
|
||||
|
||||
result.ChartDataList.Add(chartData);
|
||||
|
|
@ -620,6 +639,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
ChartType = null,
|
||||
GroupName = g.GroupName,
|
||||
Unit = items.FirstOrDefault()?.Unit,
|
||||
CustomUnit= items.FirstOrDefault()?.CustomUnit,
|
||||
Type = items.FirstOrDefault()?.Type,
|
||||
ValueType = items.FirstOrDefault()?.ValueType,
|
||||
VisitTaskNameList = alldata.VisitTaskList.Select(x => x.BlindName).ToList(),
|
||||
LatestScanDateList = alldata.VisitTaskList.Select(x => x.LatestScanDate).ToList(),
|
||||
ChartDataList = chartList
|
||||
|
|
@ -649,6 +671,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
});
|
||||
item.ChartDataList = chart.ChartDataList;
|
||||
item.Unit = chart.Unit;
|
||||
item.CustomUnit = chart.CustomUnit;
|
||||
item.Type = chart.Type;
|
||||
item.ValueType = chart.ValueType;
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -288,6 +288,8 @@ namespace IRaCIS.Application.Contracts
|
|||
|
||||
public bool IsExternalViewTrialChart { get; set; }
|
||||
#endregion
|
||||
|
||||
public TrialDataStore TrialDataStoreType { get; set; }
|
||||
}
|
||||
|
||||
public class TrialPacsInfo
|
||||
|
|
|
|||
|
|
@ -1566,7 +1566,7 @@ namespace IRaCIS.Core.Application
|
|||
[AllowAnonymous]
|
||||
public async Task<TrialConfigInfo> GetTrialExtralConfig(Guid trialId)
|
||||
{
|
||||
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask, t.IsImageQualityControl }).FirstOrDefault();
|
||||
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr,t.TrialDataStoreType, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask, t.IsImageQualityControl }).FirstOrDefault();
|
||||
|
||||
var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
|
||||
|
||||
|
|
@ -1577,7 +1577,7 @@ namespace IRaCIS.Core.Application
|
|||
trialConfig.IsExternalViewTrialChart = extralObj.IsExternalViewTrialChart;
|
||||
trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
|
||||
trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask;
|
||||
|
||||
trialConfig.TrialDataStoreType = extralObj.TrialDataStoreType;
|
||||
|
||||
return trialConfig;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue