From d9d48da62bc03ce3e15de214f6fb53f5affe62a1 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 12 Oct 2022 17:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ReadingImageTaskService.cs           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 4182c6681..ea1c84a71 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -283,11 +283,12 @@ namespace IRaCIS.Application.Services
         public async Task<IResponseOutput> DeleteReadingRowAnswer(DeleteReadingRowAnswerInDto inDto)
         {
 
-            if (!(await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId)))                
+            var deleteRowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId).FirstNotNullAsync();
+            if (deleteRowInfo==null)                
             {
                 return ResponseOutput.Ok(true);
             }
-            var deleteRowInfo=await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId).FirstNotNullAsync();
+           
 
             if(await _readingTableAnswerRowInfoRepository.AnyAsync(x=>x.SplitRowId== deleteRowInfo.Id&&x.MergeRowId==deleteRowInfo.Id))
             {
@@ -1184,7 +1185,7 @@ namespace IRaCIS.Application.Services
                     new GlobalQuestionInfo()
                     {
                         Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? String.Empty,
-                        QuestionName = "是否同意访视结果",
+                        QuestionName = "是否同意",
                         Type = "input",
                         GlobalAnswerType=GlobalAnswerType.AgreeOrNot,
 
@@ -1195,7 +1196,7 @@ namespace IRaCIS.Application.Services
                 List<GetGlobalQuestionType> questionTypes = new List<GetGlobalQuestionType>()
                 {   
                     new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.UpdateType,QuestionName="评估更新类型" },
-                    new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.Reason,QuestionName="原因" },
+                    new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.Reason,QuestionName="全局阅片备注" },
                     //new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.AgreeOrNot,QuestionName="是否同意访视结果" },
                    
                 };