From fa97d752c8f68adec933736185fbb95cd6f61874 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 21 Apr 2023 11:39:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs                | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 285b7832b..ea017e013 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1562,8 +1562,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                         //  {
                         //      ReReadingApplyState = ReReadingApplyState.Agree
                         //  });
-
-
                         #endregion
 
                         // 不管有序 无序  都会  回退访视
@@ -1890,8 +1888,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                     trakingOrigenalTask?.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = influenceTask.Id, OptType = ReReadingOrBackOptType.Abandon });
                                 }
 
-                                // 影响的任务 仅仅访视类别的才生成
-                                if (influenceTask.ReadingCategory == ReadingCategory.Visit)
+                                // 影响的任务 仅仅访视类别的才生成  或者就是IR 申请的任务
+                                if (influenceTask.ReadingCategory == ReadingCategory.Visit || influenceTask.Id == origenalTask.Id)
                                 {
 
 
@@ -2054,7 +2052,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                 }
 
 
-                                if (influenceTask.ReadingCategory == ReadingCategory.Visit)
+                                if (influenceTask.ReadingCategory == ReadingCategory.Visit || influenceTask.Id == origenalTask.Id)
                                 {
                                     await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()
                                     {

From 90286d435e85f20f3edb78d01a96cfef6c718769 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 21 Apr 2023 13:48:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 5c123685a..5573d0288 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1365,11 +1365,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
                         Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == task.TrialId && t.SubjectId == task.SubjectId && t.TaskState == TaskState.Effect && t.TrialReadingCriterionId == task.TrialReadingCriterionId
-                                                        && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.DoctorUserId == task.DoctorUserId && t.IsAnalysisCreate == false && t.VisitTaskNum > task.VisitTaskNum;
+                                                       && t.DoctorUserId == task.DoctorUserId && t.IsAnalysisCreate == false && t.VisitTaskNum > task.VisitTaskNum;
 
 
 
-                        if (task.ReadingCategory == ReadingCategory.Judge && await _visitTaskRepository.AnyAsync(filterExpression.And(t => t.ReadingCategory == ReadingCategory.Global)))
+                        if (task.ReadingCategory == ReadingCategory.Global && await _visitTaskRepository.AnyAsync(filterExpression.And(t => t.ReadingCategory == ReadingCategory.Global)))
                         {
                             //---有序阅片，只允许申请该受试者阅片人最后一次完成全局任务重阅
                             throw new BusinessValidationFailedException(_localizer["VisitTask_LastReading"]);

From 93fc3a83067c681b8ad495a6147d6d9d9a00d6d0 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 21 Apr 2023 15:15:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/IRaCIS.Core.API.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
index af73d1f81..d7992506c 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@@ -6,6 +6,10 @@
     <UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
     <LangVersion>default</LangVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <Version>1.0.1.001</Version>
+    <Company>上海展影医疗科技有限公司</Company>
+    <Product>IRC影像系统 (EICS)</Product>
+    <Copyright>上海展影医疗科技有限公司版权所有</Copyright>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">