From d2228b45bab339ba5a00acdc4ff93c9b319bc29d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 21 Dec 2022 15:51:21 +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

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index a6250cd0f..441984bb6 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -257,6 +257,7 @@ namespace IRaCIS.Application.Services
             x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
             x.ReadingTaskState == ReadingTaskState.HaveSigned &&
             x.TaskState == TaskState.Effect &&
+            x.IsSelfAnalysis == taskInfo.IsSelfAnalysis&&
             x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
             .WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit, x => x.ReadingCategory == taskInfo.ReadingCategory)
 
@@ -1074,6 +1075,8 @@ namespace IRaCIS.Application.Services
                     throw new BusinessValidationFailedException($"InstanceId和SeriesId不对应！");
                 }
             }
+
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             var questionInfo = await _readingQuestionTrialRepository.Where(x => x.Id == inDto.QuestionId).FirstNotNullAsync();
             var criterionId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.TrialReadingCriterionId).FirstOrDefaultAsync();
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == criterionId).FirstNotNullAsync();
@@ -1161,7 +1164,7 @@ namespace IRaCIS.Application.Services
             rowInfo.IsDicomReading = inDto.IsDicomReading;
             rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
             rowInfo.NumberOfFrames = inDto.NumberOfFrames;
-            rowInfo.FristAddTaskNum = inDto.FristAddTaskNum;
+            rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
             rowInfo.PicturePath = inDto.PicturePath;
             rowInfo.RowIndex = inDto.RowIndex;
             rowInfo.OrganInfoId = inDto.OrganInfoId;