受试者图表数据修改
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
parent
fe96ff5924
commit
7cd476028a
|
|
@ -91,6 +91,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
|
||||||
{
|
{
|
||||||
TrialReadingCriterionId = t.Id,
|
TrialReadingCriterionId = t.Id,
|
||||||
IsAutoCreate = t.IsAutoCreate,
|
IsAutoCreate = t.IsAutoCreate,
|
||||||
|
ReadingTool = t.ReadingTool,
|
||||||
IsAdditionalAssessment = t.IsAdditionalAssessment,
|
IsAdditionalAssessment = t.IsAdditionalAssessment,
|
||||||
TrialReadingCriterionName = t.CriterionName,
|
TrialReadingCriterionName = t.CriterionName,
|
||||||
CriterionType = t.CriterionType,
|
CriterionType = t.CriterionType,
|
||||||
|
|
|
||||||
|
|
@ -599,6 +599,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public string DictionaryCode { get; set; }
|
public string DictionaryCode { get; set; }
|
||||||
|
|
||||||
public bool IsHighlight { get; set; } = false;
|
public bool IsHighlight { get; set; } = false;
|
||||||
|
|
||||||
|
public Guid VisitTaskId { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ChartItem
|
public class ChartItem
|
||||||
|
|
|
||||||
|
|
@ -590,6 +590,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void SetVisitTaskId(List<EvaluationValue> data, List<VisitTaskInfo> VisitTaskList)
|
||||||
|
{
|
||||||
|
for (var index = 0; index < data.Count; index++)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
data[index].VisitTaskId = VisitTaskList[index].VisitTaskId;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue()
|
result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue()
|
||||||
{
|
{
|
||||||
Value = x
|
Value = x
|
||||||
|
|
@ -622,6 +642,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
.Take(length)
|
.Take(length)
|
||||||
.ToList();
|
.ToList();
|
||||||
SetHighlight(r1data, Arm.DoubleReadingArm1);
|
SetHighlight(r1data, Arm.DoubleReadingArm1);
|
||||||
|
SetVisitTaskId(r1data, r1.VisitTaskList);
|
||||||
result.Evaluation.Add(r1data);
|
result.Evaluation.Add(r1data);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -654,6 +675,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
.Take(length)
|
.Take(length)
|
||||||
.ToList();
|
.ToList();
|
||||||
SetHighlight(r2data, Arm.DoubleReadingArm2);
|
SetHighlight(r2data, Arm.DoubleReadingArm2);
|
||||||
|
SetVisitTaskId(r2data, r2.VisitTaskList);
|
||||||
result.Evaluation.Add(r2data);
|
result.Evaluation.Add(r2data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -396,6 +396,7 @@ namespace IRaCIS.Application.Contracts
|
||||||
//是否附加评估
|
//是否附加评估
|
||||||
public bool IsAdditionalAssessment { get; set; }
|
public bool IsAdditionalAssessment { get; set; }
|
||||||
|
|
||||||
|
public ReadingTool? ReadingTool { get; set; }
|
||||||
|
|
||||||
//自动 手动生成任务
|
//自动 手动生成任务
|
||||||
public bool IsAutoCreate { get; set; }
|
public bool IsAutoCreate { get; set; }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue