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

修改

Test.EIImageViewer
he 2023-01-16 16:02:22 +08:00
parent 2e00b68bba
commit ef642356da
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -996,6 +996,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? OtherGlobalTaskId { get; set; } public Guid? OtherGlobalTaskId { get; set; }
public Guid? JudgeTaskId { get; set; }
public ReadingTaskState ReadingTaskState { get; set; } public ReadingTaskState ReadingTaskState { get; set; }
public string GlobalUpdateType { get; set; } public string GlobalUpdateType { get; set; }

15
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -140,6 +140,21 @@ namespace IRaCIS.Application.Services
result.OtherGlobalTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate result.OtherGlobalTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId
).Select(x => x.Id).FirstOrDefaultAsync(); ).Select(x => x.Id).FirstOrDefaultAsync();
result.JudgeTaskId = await _visitTaskRepository.Where(x =>
x.SubjectId == taskInfo.SubjectId
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
&& x.TaskState == TaskState.Effect
&& x.ArmEnum == taskInfo.ArmEnum
&& x.ReadingCategory == ReadingCategory.Judge
&& x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
&& x.DoctorUserId == taskInfo.DoctorUserId
&& x.ReadingTaskState == ReadingTaskState.HaveSigned
&& x.VisitTaskNum == taskInfo.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]
&& x.ReReadingApplyState != ReReadingApplyState.Agree)
.Select(x => x.Id).FirstOrDefaultAsync();
// 一致性分析按照doctorId 其他按照分组 // 一致性分析按照doctorId 其他按照分组
result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit && result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&