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

肿瘤学阅片修改

IRC_NewDev
he 2024-02-29 14:06:17 +08:00
parent 7b9c90b77c
commit fb498b3723
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1317,7 +1317,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsBaseLine { get; set; } public bool IsBaseLine { get; set; }
public bool IsHaveChange { get; set; } public decimal VisitNum { get; set; }
public bool IsHaveChange { get; set; }
public string VisitRemark { get; set; } = string.Empty; public string VisitRemark { get; set; } = string.Empty;

11
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
View File

@ -215,7 +215,9 @@ namespace IRaCIS.Application.Services
{ {
VisitName = x.SourceSubjectVisit.VisitName, VisitName = x.SourceSubjectVisit.VisitName,
IsBaseLine = x.SourceSubjectVisit.IsBaseLine, IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
VisitTaskId = x.Id, VisitNum=x.SourceSubjectVisit.VisitNum,
VisitTaskId = x.Id,
// QuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).OrderBy(y => y.ReadingQuestionTrial.ShowOrder) // QuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
//.Select(y => new OncologyQuestion() //.Select(y => new OncologyQuestion()
//{ //{
@ -225,7 +227,7 @@ namespace IRaCIS.Application.Services
//}).ToList() //}).ToList()
}).ToListAsync(); }).ToListAsync();
var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).ToListAsync(); var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).Include(x=>x.VisitTask).ToListAsync();
// 上一次肿瘤学阅片 // 上一次肿瘤学阅片
var lastOncologyTask = await _visitTaskRepository.Where(x => var lastOncologyTask = await _visitTaskRepository.Where(x =>
@ -241,7 +243,7 @@ namespace IRaCIS.Application.Services
if (lastOncologyTask != null&& taskInfo.TaskState==TaskState.Effect&&taskInfo.ReadingTaskState!=ReadingTaskState.HaveSigned) if (lastOncologyTask != null&& taskInfo.TaskState==TaskState.Effect&&taskInfo.ReadingTaskState!=ReadingTaskState.HaveSigned)
{ {
lastOncologyAnswerList= await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == lastOncologyTask.Id).ToListAsync(); lastOncologyAnswerList= await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == lastOncologyTask.Id).Include(x => x.VisitTask).ToListAsync();
} }
@ -249,7 +251,8 @@ namespace IRaCIS.Application.Services
oncologyVisits.ForEach(x => oncologyVisits.ForEach(x =>
{ {
var oncologyData = oncologyReadingQuestions.Where(y => y.VisitTaskId == x.VisitTaskId).FirstOrDefault(); var oncologyData = oncologyReadingQuestions.Where(y => y.VisitTaskId == x.VisitTaskId).FirstOrDefault();
var lastOncologyData = lastOncologyAnswerList.Where(y => y.VisitTaskId == x.VisitTaskId).FirstOrDefault(); /// 根据任务编号匹配 不区分 r1 r2
var lastOncologyData = lastOncologyAnswerList.Where(y => y.VisitTask.VisitTaskNum == x.VisitNum).FirstOrDefault();
var evaluationResult = string.Empty; var evaluationResult = string.Empty;
var evaluationReason = string.Empty; var evaluationReason = string.Empty;