diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index c1ce5ec0e..fc135fe28 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -119,22 +119,22 @@ namespace IRaCIS.Core.Application.Service var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync(); taskInfo.ReadingTaskState = ReadingTaskState.Reading; - //taskInfo.IsConvertedTask = true; + taskInfo.IsConvertedTask = true; taskInfo.BeforeConvertedTaskId = taskId; taskInfo.Id = NewId.NextGuid(); - //await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => - // x.IsAnalysisCreate == taskInfo.IsAnalysisCreate - // && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis - // && x.VisitTaskNum > taskInfo.VisitTaskNum - // && x.DoctorUserId == taskInfo.DoctorUserId - // && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId - // && x.SubjectId == taskInfo.SubjectId - // && x.ArmEnum == taskInfo.ArmEnum && - // x.TaskState == TaskState.Effect, x => new VisitTask() - // { - // IsConvertedTask = true - // }); + await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => + x.IsAnalysisCreate == taskInfo.IsAnalysisCreate + && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis + && x.VisitTaskNum > taskInfo.VisitTaskNum + && x.DoctorUserId == taskInfo.DoctorUserId + && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId + && x.SubjectId == taskInfo.SubjectId + && x.ArmEnum == taskInfo.ArmEnum && + x.TaskState == TaskState.Effect, x => new VisitTask() + { + IsConvertedTask = true + }); await _visitTaskRepository.AddAsync(taskInfo); @@ -146,8 +146,7 @@ namespace IRaCIS.Core.Application.Service var taskAnswer = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == taskId && x.ReadingQuestionTrial.Type != "calculation").IgnoreAutoIncludes().AsNoTracking().ToListAsync(); - taskAnswer.ForEach(x => - { + taskAnswer.ForEach(x => { x.VisitTaskId = taskInfo.Id; @@ -623,38 +622,6 @@ namespace IRaCIS.Core.Application.Service } - //private async Task IsConvertedTask(Guid trialReadingCriterionId, Guid subjectId, decimal visitTaskNum, Guid? doctorUserId) - //{ - - // var criterion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId); - // if (criterion.CriterionType == CriterionType.IRECIST1Point1) - // { - - // if (doctorUserId == null) - // { - // return false; - // } - // else - // { - // if (await _visitTaskRepository.AnyAsync(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectId == subjectId && t.DoctorUserId == doctorUserId && t.VisitTaskNum <= visitTaskNum && t.IsConvertedTask && t.TaskState == TaskState.Effect)) - // { - // return true; - // } - // else - // { - // return false; - // } - // } - - - // } - // else - // { - // return false; - // } - //} - - public DateTime GetSuggessFinishTime(bool isInOrder, UrgentType urgentType) { @@ -1434,7 +1401,6 @@ namespace IRaCIS.Core.Application.Service { taskUrgent = TaskUrgentType.VisitUrgent; } - bool isCanEditUrgent = taskUrgent == TaskUrgentType.EnrollmentConfirm || taskUrgent == TaskUrgentType.PDProgress ? false : true; var newTask = await _visitTaskRepository.AddAsync(new VisitTask() { @@ -1468,18 +1434,6 @@ namespace IRaCIS.Core.Application.Service IsNeedClinicalDataSign = reReadingVisitTask.IsNeedClinicalDataSign, IsClinicalDataSign = reReadingVisitTask.IsClinicalDataSign, - - - //生成的任务分配给原始医生 - DoctorUserId = reReadingVisitTask.DoctorUserId, - TaskAllocationState = TaskAllocationState.Allocated, - AllocateTime = DateTime.Now, - SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget), - - //IR 重阅的任务这两个字段和之前任务保持一致 - //IsConvertedTask = await IsConvertedTask(reReadingVisitTask.TrialReadingCriterionId, reReadingVisitTask.SubjectId, reReadingVisitTask.VisitTaskNum, reReadingVisitTask.DoctorUserId), - //BeforeConvertedTaskId = reReadingVisitTask.BeforeConvertedTaskId, - // TaskAllocationState = reReadingVisitTask.TaskAllocationState, // AllocateTime = DateTime.Now, //DoctorUserId = reReadingVisitTask.DoctorUserId, @@ -1682,7 +1636,7 @@ namespace IRaCIS.Core.Application.Service var task1 = await _visitTaskRepository.AddAsync(new VisitTask() { TrialId = trialId, - //IsConvertedTask = originalTaskInfo.IsConvertedTask, + IsConvertedTask = originalTaskInfo.IsConvertedTask, SubjectId = item.SubjectId, IsUrgent = originalTaskInfo.IsUrgent, VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global], @@ -1734,7 +1688,7 @@ namespace IRaCIS.Core.Application.Service SubjectId = item.SubjectId, IsUrgent = originalTaskInfo.IsUrgent, TaskName = item.ReadingName, - //IsConvertedTask = originalTaskInfo.IsConvertedTask, + IsConvertedTask = originalTaskInfo.IsConvertedTask, // 原任务是全局任务 加0.03 就好 VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m, ArmEnum = Arm.TumorArm, //特殊