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

修改重阅申请 不符合条件，以异常的方式抛出

Uat_Study
hang 2023-05-30 11:21:31 +08:00
parent c6b7902eca
commit aa15145765
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1340,7 +1340,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
&& t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.RequestReReadingType == RequestReReadingType.DocotorApply && t.RequestReReadingResultEnum == RequestReReadingResult.Default)) && t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.RequestReReadingType == RequestReReadingType.DocotorApply && t.RequestReReadingResultEnum == RequestReReadingResult.Default))
{ {
//---当前为有序阅片，该受试者已有访视已申请重阅还未处理，暂不能继续申请重阅 //---当前为有序阅片，该受试者已有访视已申请重阅还未处理，暂不能继续申请重阅
return ResponseOutput.NotOk(_localizer["VisitTask_SequentialReading"]); throw new BusinessValidationFailedException(_localizer["VisitTask_SequentialReading"]);
} }
@ -1358,7 +1358,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
.AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum)) .AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum))
{ {
//---当前为有序阅片，影像存在问题，项目组已申请回退,暂不能申请重阅 //---当前为有序阅片，影像存在问题，项目组已申请回退,暂不能申请重阅
return ResponseOutput.NotOk(_localizer["VisitTask_ImageProblem"]); throw new BusinessValidationFailedException(_localizer["VisitTask_ImageProblem"]);
} }
} }
@ -2236,11 +2236,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated; Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;
//附加评估 IR 和PM 看到的影响列表不一样
if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment) if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
{ {
//影像退回，必定影响两个标准的任务
filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB); filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);

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

@ -585,10 +585,11 @@ namespace IRaCIS.Core.Application.Service
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
TaskIdList = new List<Guid>() TaskIdList = new List<Guid>()
{ {
visitTaskId visitTaskId
} }
}); });
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview() await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{ {
IsClosedDialog = true, IsClosedDialog = true,
@ -598,9 +599,7 @@ namespace IRaCIS.Core.Application.Service
IsApplyHeavyReading = true, IsApplyHeavyReading = true,
FileName = inDto.FileName, FileName = inDto.FileName,
ImagePath = JsonConvert.SerializeObject(inDto.FileList), ImagePath = JsonConvert.SerializeObject(inDto.FileList),
DisagreeReason = inDto.DisagreeReason, DisagreeReason = inDto.DisagreeReason,
}); });
} }