diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index 3e2307e3..b65ffd57 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -220,6 +220,7 @@ namespace IRaCIS.Core.Application.Service List otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&x.TaskState==TaskState.Effect + && x.ArmEnum == taskInfo.ArmEnum && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree) .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() @@ -472,7 +473,7 @@ namespace IRaCIS.Core.Application.Service } if ((await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.SaveQuestionTime).FirstOrDefaultAsync()) == null) { - return ResponseOutput.NotOk(_localizer["MedicalReview_SaveQuestion"]); + throw new BusinessValidationFailedException(_localizer["MedicalReview_SaveQuestion"]); } await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview() {