From 3651be1ffbabc4b60f9f1cc99211ad1f820879b1 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 18 Jul 2022 17:28:36 +0800
Subject: [PATCH] bug

---
 .../Service/Allocation/VisitTaskHelpeService.cs           | 4 ++--
 .../Service/Allocation/VisitTaskService.cs                | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index d658c98be..033d9aee8 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -234,10 +234,10 @@ namespace IRaCIS.Core.Application.Service
                                                                 IsUrgent = subjectVisit.IsUrgent,
                                                                 ArmEnum = Arm.DoubleReadingArm1,//特殊
                                                                 Code = currentMaxCodeInt + 1,
-                                                                SourceSubjectVisitId = subjectVisit.Id,
                                                                 TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
                                                                 ReadingCategory = ReadingCategory.Visit,
 
+                                                                SourceSubjectVisitId = latestTask.Id,
                                                                 VisitTaskNum = latestTask.VisitTaskNum,
                                                                 TaskBlindName = latestTask.TaskBlindName,
                                                                 TaskName = latestTask.TaskName,
@@ -276,10 +276,10 @@ namespace IRaCIS.Core.Application.Service
                                                                 //CheckPassedTime = subjectVisit.CheckPassedTime,
                                                                 ArmEnum = Arm.DoubleReadingArm2,//特殊
                                                                 Code = currentMaxCodeInt + 1,
-                                                                SourceSubjectVisitId = subjectVisit.Id,
                                                                 TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
                                                                 ReadingCategory = ReadingCategory.Visit,
 
+                                                                SourceSubjectVisitId = latestTask.Id,
                                                                 VisitTaskNum = latestTask.VisitTaskNum,
                                                                 TaskBlindName = latestTask.TaskBlindName,
                                                                 TaskName = latestTask.TaskName,
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 919603303..f556afde8 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -907,14 +907,14 @@ namespace IRaCIS.Core.Application.Service
                 if (visitTask.SourceSubjectVisitId != null)
                 {
 
-                    if (await _visitTaskRepository.AnyAsync(t => t.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id))
+                    if (await _visitTaskRepository.AnyAsync(t => t.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && t.TaskAllocationState == TaskAllocationState.Allocated && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id))
                     {
                         return ResponseOutput.NotOk("其中一个任务已分配给该医生，不允许分配");
                     }
                 }
                 else if (visitTask.SouceReadModuleId != null)
                 {
-                    if (await _visitTaskRepository.AnyAsync(t => t.SouceReadModuleId == visitTask.SouceReadModuleId && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id))
+                    if (await _visitTaskRepository.AnyAsync(t => t.SouceReadModuleId == visitTask.SouceReadModuleId  && t.TaskAllocationState == TaskAllocationState.Allocated && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id))
                     {
                         return ResponseOutput.NotOk("其中一个任务已分配给该医生，不允许分配");
                     }
@@ -1026,9 +1026,9 @@ namespace IRaCIS.Core.Application.Service
 
                 //当前访视之前 已有任务申请
                 if (trialConfig.IsReadingTaskViewInOrder && await _visitTaskRepository.AnyAsync(t => t.TrialId == task.TrialId && t.SubjectId == task.SubjectId && t.TaskState == TaskState.Effect && t.ReadingCategory==ReadingCategory.Visit
-                                                && t.ReadingTaskState == ReadingTaskState.HaveSigned  && t.VisitTaskNum< task.VisitTaskNum &&( t.ReReadingApplyState == ReReadingApplyState.HaveApplyed) ))
+                                                && t.ReadingTaskState == ReadingTaskState.HaveSigned  && t.VisitTaskNum <= task.VisitTaskNum && t.Id!= task.Id && t.ReReadingApplyState == ReReadingApplyState.HaveApplyed ))
                 {
-                    return ResponseOutput.NotOk("当前为有序阅片，之前有访视已申请重阅，还未处理，当前访视不允许申请");
+                    return ResponseOutput.NotOk("当前为有序阅片，之前有访视,或其他IR的本次访视已申请重阅，还未处理，不允许申请");
                 }