XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2023-01-16 15:41:11 +08:00
parent 99f9d48ae4
commit 0236657832
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -578,6 +578,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid? TaskId { get; set; } public Guid? TaskId { get; set; }
public decimal VisitTaskNum { get; set; }
/// <summary> /// <summary>
/// 是否是当前任务 /// 是否是当前任务
/// </summary> /// </summary>
@ -617,11 +619,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? OtherTaskId { get; set; } public Guid? OtherTaskId { get; set; }
public Guid? GlobalTaskId { get; set; }
public Guid? JudgeTaskId { get; set; }
public Arm OtherArmEnum { get; set; } public Arm OtherArmEnum { get; set; }
public Guid? JudgeVisitTaskId { get; set; } //public Guid? JudgeVisitTaskId { get; set; }
public Guid? JudgeResultTaskId { get; set; } //public Guid? JudgeResultTaskId { get; set; }
public Arm? JudgeResultArm { get; set; } public Arm? JudgeResultArm { get; set; }

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

@ -163,6 +163,8 @@ namespace IRaCIS.Core.Application.Service
).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() ).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{ {
TaskId = x.Id, TaskId = x.Id,
VisitTaskNum=x.VisitTaskNum,
//JudgeTaskId=x.JudgeVisitTaskId, // 在下面赋值 要去已完成的
IsCurrentTask = x.Id == taskInfo.Id, IsCurrentTask = x.Id == taskInfo.Id,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
TaskBlindName = x.TaskBlindName, TaskBlindName = x.TaskBlindName,
@ -170,7 +172,7 @@ namespace IRaCIS.Core.Application.Service
TaskName = x.TaskName, TaskName = x.TaskName,
SouceReadModuleId = x.SouceReadModuleId, SouceReadModuleId = x.SouceReadModuleId,
SourceSubjectVisitId = x.SourceSubjectVisitId, SourceSubjectVisitId = x.SourceSubjectVisitId,
JudgeVisitTaskId = x.JudgeVisitTaskId, //JudgeVisitTaskId = x.JudgeVisitTaskId,
JudgeResultArm = x.JudgeResultTask.ArmEnum, JudgeResultArm = x.JudgeResultTask.ArmEnum,
SubjectId = x.SubjectId, SubjectId = x.SubjectId,
}).ToListAsync(); }).ToListAsync();
@ -189,6 +191,7 @@ namespace IRaCIS.Core.Application.Service
.OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{ {
TaskId = x.Id, TaskId = x.Id,
IsCurrentTask = x.Id == taskInfo.Id, IsCurrentTask = x.Id == taskInfo.Id,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
TaskBlindName = x.TaskBlindName, TaskBlindName = x.TaskBlindName,
@ -216,6 +219,8 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.TaskList = await _visitTaskRepository.Where(x => x.Id == taskInfo.Id).Select(x => new TaskInfo() medicalReviewInfo.TaskList = await _visitTaskRepository.Where(x => x.Id == taskInfo.Id).Select(x => new TaskInfo()
{ {
TaskId = x.Id, TaskId = x.Id,
VisitTaskNum = x.VisitTaskNum,
//JudgeTaskId = x.JudgeVisitTaskId, // 在下面赋值 要去已完成的
IsCurrentTask = x.Id == taskInfo.Id, IsCurrentTask = x.Id == taskInfo.Id,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
TaskBlindName = x.TaskBlindName, TaskBlindName = x.TaskBlindName,
@ -275,8 +280,29 @@ namespace IRaCIS.Core.Application.Service
QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName,_userInfo.IsEn_Us) QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName,_userInfo.IsEn_Us)
}).ToListAsync(); }).ToListAsync();
var globalChangeAnswer = await _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.Answer != string.Empty && x.GlobalAnswerType == GlobalAnswerType.Question && x.GlobalVisitTask.TaskState == TaskState.Effect).ToListAsync(); var globalChangeAnswer = await _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.Answer != string.Empty && x.GlobalAnswerType == GlobalAnswerType.Question && x.GlobalVisitTask.TaskState == TaskState.Effect).ToListAsync();
// 找全局阅片 和裁判
var globalTask = await _visitTaskRepository.Where(x =>
x.SubjectId == taskInfo.SubjectId
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
&& x.TaskState == TaskState.Effect
&& x.ArmEnum== taskInfo.ArmEnum
&& (x.ReadingCategory == ReadingCategory.Global||x.ReadingCategory==ReadingCategory.Judge)
&& x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
&& x.DoctorUserId == taskInfo.DoctorUserId
&& x.ReadingTaskState == ReadingTaskState.HaveSigned
&& x.ReReadingApplyState != ReReadingApplyState.Agree)
.Select(x => new
{
x.VisitTaskNum,
x.Id
}).ToListAsync();
medicalReviewInfo.TaskList.ForEach(x => medicalReviewInfo.TaskList.ForEach(x =>
{ {
x.GlobalTaskId= globalTask.Where(y=>y.VisitTaskNum==x.VisitTaskNum+ ReadingCommon.TaskNumDic[ReadingCategory.Global]).Select(y=>y.Id).FirstOrDefault(),
x.JudgeTaskId = globalTask.Where(y => y.VisitTaskNum == x.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]).Select(y => y.Id).FirstOrDefault(),
x.IsGlobalChange = globalChangeAnswer.Any(y => y.TaskId == x.TaskId); x.IsGlobalChange = globalChangeAnswer.Any(y => y.TaskId == x.TaskId);
x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList(); x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList();
}); });