XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能添加

Test_IRC_Net10
he 2026-06-09 15:45:52 +08:00
parent 7c9987f3de
commit 0579c4aeda
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -192,6 +192,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingReportEvaluationOutDto public class GetReadingReportEvaluationOutDto
{ {
public Guid? VisitTaskId { get; set; }
public object ReportCalculateResult { get; set; } public object ReportCalculateResult { get; set; }
@ -566,6 +567,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Value { get; set; } public string Value { get; set; }
public string DictionaryCode { get; set; } public string DictionaryCode { get; set; }
public bool IsHighlight { get; set; } = false;
} }
public class ChartItem public class ChartItem

18
IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
View File

@ -30,6 +30,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository, IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
IRepository<OrganInfo> _organInfoRepository, IRepository<OrganInfo> _organInfoRepository,
IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository, IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository,
IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository,
IRepository<SubjectVisit> _subjectVisitRepository, IRepository<SubjectVisit> _subjectVisitRepository,
IRepository<TumorAssessment_IRECIST1Point1> _tumorAssessmentRepository, IRepository<TumorAssessment_IRECIST1Point1> _tumorAssessmentRepository,
IGeneralCalculateService _generalCalculateService, IGeneralCalculateService _generalCalculateService,
@ -508,12 +509,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
TrialId = task.TrialId, TrialId = task.TrialId,
VisitTaskId = task.Id, VisitTaskId = task.Id,
}); });
data.VisitTaskId= task.Id;
} }
return data; return data;
} }
EvaluationColumn BuildEvaluationTable(GetReadingReportEvaluationOutDto r1, GetReadingReportEvaluationOutDto r2) async Task<EvaluationColumn> BuildEvaluationTable(GetReadingReportEvaluationOutDto r1, GetReadingReportEvaluationOutDto r2)
{ {
EvaluationColumn result = new EvaluationColumn() EvaluationColumn result = new EvaluationColumn()
{ {
@ -537,6 +540,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
break; break;
} }
if (r1.VisitTaskId != null && r2.VisitTaskList != null)
{
var judgeInfo = _visitTaskRepository.Where(x => x.SubjectId == inDto.SubjectId && x.TrialReadingCriterionId == inDto.TrialCriterionId
&& x.TaskState == TaskState.Effect && x.ReadingTaskState == ReadingTaskState.HaveSigned
&& x.ReadingCategory== ReadingCategory.Judge
).OrderByDescending(x => x.VisitTaskNum).Include(x=>x.JudgeResultTask).FirstOrDefaultAsync();
}
result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue() result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue()
@ -679,7 +693,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
result.Evaluation = BuildEvaluationTable(r1Data, r2Data); result.Evaluation =await BuildEvaluationTable(r1Data, r2Data);
if (r1Data != null) if (r1Data != null)
{ {
var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1); var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1);