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

计算问题

Uat_Study
he 2022-12-16 10:10:57 +08:00 committed by {872297557@qq.com}
parent 919dbd818a
commit bb95a50abc
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
View File

@ -113,6 +113,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public string TaskBlindName { get; set; } = string.Empty;
public bool IsAnalysisCreate { get; set; } public bool IsAnalysisCreate { get; set; }
public bool? IsSelfAnalysis { get; set; } public bool? IsSelfAnalysis { get; set; }

1
IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
View File

@ -118,6 +118,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
ReadingCalculateDto readingData = new ReadingCalculateDto() ReadingCalculateDto readingData = new ReadingCalculateDto()
{ {
SubjectId = visitTask.SubjectId, SubjectId = visitTask.SubjectId,
TaskBlindName= visitTask.TaskBlindName,
VisitTaskId = visitTaskId, VisitTaskId = visitTaskId,
SubjectVisitId = visitTask.SourceSubjectVisitId!.Value, SubjectVisitId = visitTask.SourceSubjectVisitId!.Value,
QuestionInfo = questionInfos, QuestionInfo = questionInfos,

2
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -1185,6 +1185,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit
&& x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate && x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
&& x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis && x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
&&x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
&& x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD) && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
.Select(x => new VisitTaskAnswerInfo .Select(x => new VisitTaskAnswerInfo
{ {
@ -1202,6 +1203,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
visitTaskAnswerList.Add(new VisitTaskAnswerInfo() visitTaskAnswerList.Add(new VisitTaskAnswerInfo()
{ {
VisitTaskId = inDto.VisitTaskId, VisitTaskId = inDto.VisitTaskId,
BlindName=inDto.TaskBlindName,
QuestionId = visitTaskAnswerList[0].QuestionId, QuestionId = visitTaskAnswerList[0].QuestionId,
VisitName = inDto.VisitName, VisitName = inDto.VisitName,
SOD = (await GetSODData(inDto)).ToString().IsNullOrEmptyReturn0(), SOD = (await GetSODData(inDto)).ToString().IsNullOrEmptyReturn0(),