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

修改一版

Uat_Study
he 2022-12-01 13:06:50 +08:00
parent d38e8b23bd
commit a890dd3446
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -260,6 +260,7 @@ namespace IRaCIS.Core.Application.Service
List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId
&& x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
&& x.TaskState==TaskState.Effect
) )
.Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
.OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
@ -296,15 +297,20 @@ namespace IRaCIS.Core.Application.Service
QuestionName = x.ReadingQuestionTrial.QuestionName QuestionName = x.ReadingQuestionTrial.QuestionName
}).ToListAsync(); }).ToListAsync();
visitTaskAnswer.AddRange(await _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.GlobalAnswerType == GlobalAnswerType.Question && x.TrialReadingQuestion.IsJudgeQuestion).Select(x => new JudgeQuestionAnswerInfo var globalTaskAnswer = await (from global in _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.GlobalAnswerType == GlobalAnswerType.Question && x.TrialReadingQuestion.IsJudgeQuestion).Include(x=>x.TrialReadingQuestion)
join taskAnswer in _readingTaskQuestionAnswerRepository.AsQueryable() on new { TaskId= global.TaskId, QuestionId=global.QuestionId??default(Guid) } equals new { TaskId=taskAnswer.VisitTaskId, QuestionId=taskAnswer.ReadingQuestionTrialId }
select new JudgeQuestionAnswerInfo()
{ {
Answer = x.Answer, Answer = global.Answer==string.Empty? taskAnswer.Answer: global.Answer,
VisitTaskId = x.GlobalTaskId, VisitTaskId = global.GlobalTaskId,
DictionaryCode = x.TrialReadingQuestion.DictionaryCode, DictionaryCode = global.TrialReadingQuestion.DictionaryCode,
ShowOrder = x.TrialReadingQuestion.ShowOrder, ShowOrder = global.TrialReadingQuestion.ShowOrder,
QuestionGenre = x.TrialReadingQuestion.QuestionGenre, QuestionGenre = global.TrialReadingQuestion.QuestionGenre,
QuestionName = x.TrialReadingQuestion.QuestionName QuestionName = global.TrialReadingQuestion.QuestionName
}).ToListAsync()); }).ToListAsync();
visitTaskAnswer.AddRange(globalTaskAnswer);
medicalReviewInfo.TaskList.ForEach(x => medicalReviewInfo.TaskList.ForEach(x =>
{ {