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

修改

Uat_Study
he 2022-12-01 17:40:27 +08:00
parent 5144a2e2b3
commit 608fee950b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,9 +80,9 @@ namespace IRaCIS.Core.Application.Service
MedicalReviewInfo reviewInfo= await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId) MedicalReviewInfo reviewInfo= await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId)
.ProjectTo<MedicalReviewInfo>(_mapper.ConfigurationProvider).FirstNotNullAsync(); .ProjectTo<MedicalReviewInfo>(_mapper.ConfigurationProvider).FirstNotNullAsync();
var visitTaskfInfo = await _visitTaskRepository.Where(x => x.Id == reviewInfo.VisitTaskId).FirstNotNullAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == reviewInfo.VisitTaskId).Include(x => x.Subject).FirstNotNullAsync();
var medicalReviewInfo = await _readingQuestionCriterionTrial.Where(x => x.Id == visitTaskfInfo.TrialReadingCriterionId).Select(x => new GetMedicalReviewReadingTaskOutDto() var medicalReviewInfo = await _readingQuestionCriterionTrial.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => new GetMedicalReviewReadingTaskOutDto()
{ {
ReadingType=x.ReadingType, ReadingType=x.ReadingType,
IsReadingTaskViewInOrder=x.IsReadingTaskViewInOrder, IsReadingTaskViewInOrder=x.IsReadingTaskViewInOrder,
@ -91,12 +91,12 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.MedicalReviewInfo = reviewInfo; medicalReviewInfo.MedicalReviewInfo = reviewInfo;
var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReviewInfo.MedicalReviewInfo.VisitTaskId).Include(x=>x.Subject).FirstNotNullAsync();
medicalReviewInfo.VisitTaskId = taskInfo.Id; medicalReviewInfo.VisitTaskId = taskInfo.Id;
medicalReviewInfo.ArmEnum = taskInfo.ArmEnum; medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
medicalReviewInfo.SubjectCode = visitTaskfInfo.Subject.Code; medicalReviewInfo.SubjectCode = taskInfo.Subject.Code;
medicalReviewInfo.TaskBlindName = visitTaskfInfo.TaskBlindName; medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName;
medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog; medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog;
medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState; medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState;
medicalReviewInfo.IsSendMessage = medicalReviewInfo.MedicalReviewInfo.IsSendMessage; medicalReviewInfo.IsSendMessage = medicalReviewInfo.MedicalReviewInfo.IsSendMessage;
@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
// 先判断是否是肿瘤学任务 // 先判断是否是肿瘤学任务
if (taskInfo.ReadingCategory == ReadingCategory.Oncology) if (taskInfo.ReadingCategory == ReadingCategory.Oncology)
{ {
var oncologyList = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == visitTaskfInfo.Id).ToListAsync(); var oncologyList = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == taskInfo.Id).ToListAsync();
var taskIds= oncologyList.Select(x=>x.VisitTaskId).ToList(); var taskIds= oncologyList.Select(x=>x.VisitTaskId).ToList();