修改一版

IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs

@@ -252,6 +252,11 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<IResponseOutput> SaveMedicineQuestion(SaveMedicineQuestionInDto inDto)
         {
+            var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+            if (medicalReviewInfo.IsInvalid)
+            {
+                throw new BusinessValidationFailedException("该医学审核无效,操作失败");
+            }
             await _readingMedicineQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.TaskMedicalReviewId == inDto.TaskMedicalReviewId);
 
             List<ReadingMedicineQuestionAnswer> questionAnswerList = inDto.QuestionAnswerList.Select(x => new ReadingMedicineQuestionAnswer()
@@ -285,6 +290,11 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> SaveMedicalReviewInfo(SaveMedicalReviewInfoInDto inDto)
         {
+            var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+            if (medicalReviewInfo.IsInvalid)
+            {
+                throw new BusinessValidationFailedException("该医学审核无效,操作失败");
+            }
             if ((await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.SaveQuestionTime).FirstOrDefaultAsync()) == null)
             {
                 return ResponseOutput.NotOk("请先保存医审核问题");
@@ -357,6 +367,12 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public  async Task<IResponseOutput> SendMedicalReviewDialog(SendMedicalReviewDialogInDto inDto)
         {
+            var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+            if (medicalReviewInfo.IsInvalid)
+            {
+                throw new BusinessValidationFailedException("该医学审核无效,操作失败");
+            }
+
             var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
             ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
             {
@@ -384,6 +400,11 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> IRSendMedicalReviewDialog(IRSendMedicalReviewDialogInDto inDto)
         {
+            var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+            if (medicalReviewInfo.IsInvalid)
+            {
+                throw new BusinessValidationFailedException("该医学审核无效,操作失败");
+            }
             var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
             if (inDto.IsApplyHeavyReading??false)
             {
@@ -460,6 +481,11 @@ namespace IRaCIS.Core.Application.Service
         [NonDynamicMethod]
         public async Task<IResponseOutput> FinishMedicalReview(FinishMedicalReviewInDto inDto)
         {
+            var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+            if (medicalReviewInfo.IsInvalid)
+            {
+                throw new BusinessValidationFailedException("该医学审核无效,操作失败");
+            }
 
             var taskmedicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => new
             {
@@ -500,6 +526,12 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<IResponseOutput> IRConfirmMedicalReview(IRConfirmMedicalReviewInDto inDto)
         {
+            var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+            if (medicalReviewInfo.IsInvalid)
+            {
+                throw new BusinessValidationFailedException("该医学审核无效,操作失败");
+            }
+
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
                 DoctorUserIdeaEnum = inDto.DoctorUserIdeaEnum,
@@ -534,7 +566,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<PageOutput<GetIRMedicalFeedbackListOutDto>> GetIRMedicalFeedbackList(GetIRMedicalFeedbackListInDto inDto)
         {
             var taskMedicalReviewquery = _taskMedicalReviewRepository.Where(x => x.TrialId == inDto.TrialId).Include(x => x.VisitTask)
-                .Where(x => x.MedicalManagerUserId == _userInfo.Id)
+                .Where(x => x.VisitTask.DoctorUserId == _userInfo.Id)
                 .Where(x=>!x.IsHaveQuestion)
                 .Select(x => new GetIRMedicalFeedbackListOutDto
                 {

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

@@ -166,7 +166,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
         /// <summary>
-        /// 无效的
+        /// 无效的 为True无效
         /// </summary>
         public bool IsInvalid { get; set; }
     }