From 27f0a0fcfa5375bc690b87b5cb6cd1a788c88591 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 24 Jan 2024 14:13:15 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=9B=9E=E9=80=80bug]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 30 +++++++++++++++++++
.../Service/Allocation/VisitTaskService.cs | 12 ++++++--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 1604e2e36..328e313f8 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -6702,6 +6702,11 @@
限制编辑
+
+
+ 限制显示
+
+
最大答案长度
@@ -6790,6 +6795,11 @@
限制编辑
+
+
+ 限制显示
+
+
最大答案长度
@@ -7153,6 +7163,11 @@
限制编辑
+
+
+ 限制显示
+
+
最大答案长度
@@ -7213,6 +7228,11 @@
限制编辑
+
+
+ 限制显示
+
+
最大答案长度
@@ -7558,6 +7578,11 @@
限制编辑
+
+
+ 限制显示
+
+
最大答案长度
@@ -7903,6 +7928,11 @@
限制编辑
+
+
+ 限制显示
+
+
最大答案长度
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 96c28bf13..ef9eb8ee7 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -2281,7 +2281,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
#region 方式二
- var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault();
+
+ //pm退回的时候，影响的任务里不一定有该任务id 双重 分配了一个人，退回的时候，选择的是未分配的
+
+ //var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault();
+
+ var origenalTask = await _visitTaskRepository.FindAsync(task.Id);
+
foreach (var influenceTask in influenceTaskList)
{
@@ -2340,7 +2346,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
await SetMedicalReviewInvalidAsync(currentVisitList);
- var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First();
+ //var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First();
+
+ var origenalTask = await _visitTaskRepository.FindAsync(task.Id);
foreach (var influenceTask in currentVisitList)
{