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 1/3] =?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)
{
From 34358060202fa1f2eae292e1c889b5d049083c7d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 24 Jan 2024 14:40:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E9=80=80=E5=9B=9Ebug2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index ef9eb8ee7..863ef4c7e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1088,7 +1088,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
.WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
// 前序 不存在 未一致性核查未通过的
- .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
+ .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
//.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
//t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
//.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
From a00e84018a05f658f0b81ffb349a59ec7502439e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 24 Jan 2024 17:57:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BAbug]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/Helper/ExcelExportHelper.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
index d347e03a4..3eed41f3b 100644
--- a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
+++ b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
@@ -342,7 +342,7 @@ public static class ExcelExportHelper
IgnoreTemplateParameterMissing = true,
};
- await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, translateData, config);
+ await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
memoryStream.Seek(0, SeekOrigin.Begin);