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

修改

Uat_Study
he 2022-09-23 17:11:03 +08:00
parent 1efa84a0a1
commit 97b0023c85
2 changed files with 20 additions and 3 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

@ -99,6 +99,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsBaseLine { get; set; } public bool IsBaseLine { get; set; }
public string VisitName { get; set; }
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }
public Guid BaseLineTaskId { get; set; } public Guid BaseLineTaskId { get; set; }

21
IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
View File

@ -356,6 +356,7 @@ namespace IRaCIS.Core.Application.Service
DoctorUserId = visitTask.DoctorUserId, DoctorUserId = visitTask.DoctorUserId,
BaseLineTaskId= baseLinetaskId, BaseLineTaskId= baseLinetaskId,
ArmEnum=visitTask.ArmEnum, ArmEnum=visitTask.ArmEnum,
VisitName= subjectVisit.VisitName,
}; };
return readingData; return readingData;
@ -831,8 +832,9 @@ namespace IRaCIS.Core.Application.Service
{ {
if (visitTaskAnswerList == null) if (visitTaskAnswerList == null)
{ {
visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x =>x.VisitTaskId==inDto.VisitTaskId|| (x.VisitTask.ReadingCategory == ReadingCategory.Visit // 查询的时候要把自己排除 因为查询出来的可能不是计算出的最新的
&& x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned &&x.VisitTask.ArmEnum==inDto.ArmEnum&& x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)) visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x =>x.VisitTaskId!=inDto.VisitTaskId&&x.VisitTask.ReadingCategory == ReadingCategory.Visit
&& 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
{ {
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
@ -841,7 +843,20 @@ namespace IRaCIS.Core.Application.Service
SOD = x.Answer.IsNullOrEmptyReturn0(), SOD = x.Answer.IsNullOrEmptyReturn0(),
}).ToListAsync(); }).ToListAsync();
} // 这里是需要加上自己的 基线不用管
if (visitTaskAnswerList.Count > 0)
{
visitTaskAnswerList.Add(new VisitTaskAnswerInfo()
{
VisitTaskId = inDto.VisitTaskId,
QuestionId= visitTaskAnswerList[0].QuestionId,
VisitName=inDto.VisitName,
SOD=GetSODData(inDto).ToString().IsNullOrEmptyReturn0(),
});
}
}
return visitTaskAnswerList; return visitTaskAnswerList;
} }