From 9dc272fd173e243e7b099ba915f261db2bcbaad4 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 15:39:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/General/GeneralCalculateService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs index e6919d664..221b6a6ad 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs @@ -249,8 +249,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate index++; x.RowIndex = index; x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark(); - x.FromMark = x.FristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark; - x.FristAddTaskId = x.FristAddTaskId==beforeConvertedTaskId? visitTaskId: x.FristAddTaskId; + var fristAddTaskId = x.FristAddTaskId.Clone(); + x.FromMark = fristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark; + x.FristAddTaskId = fristAddTaskId == beforeConvertedTaskId? visitTaskId: fristAddTaskId; x.QuestionId = otherLesionQuestion.Id; x.OrderMark = otherLesionQuestion.OrderMark; x.ReportMark = x.RowMark; From b8ecc5e59123501a9e704da1c332458062fa5531 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 16:04:03 +0800 Subject: [PATCH 2/7] =?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, 5 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 100081bf1..55da62bfa 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -14,6 +14,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Microsoft.Extensions.Caching.Memory; using IRaCIS.Core.Application.Filter; +using DocumentFormat.OpenXml.Drawing; namespace IRaCIS.Application.Services { @@ -1144,6 +1145,10 @@ namespace IRaCIS.Application.Services { Dictionary answers = new Dictionary(); var rowInfo = tableAnsweRowInfos.Where(y => y.RowIndex == x && y.QuestionId == item.Id).FirstOrDefault(); + if (rowInfo == null) + { + continue; + } var rowAnswer = thisAnswer.Where(y => y.RowId == rowInfo.Id).OrderBy(y => y.ShowOrder).ToList(); var organInfo = organInfos.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefault(); From ecb4854c78b0192d43c91f0db39f6634dde1c0fc Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 16:07:07 +0800 Subject: [PATCH 3/7] =?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, 3 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 55da62bfa..0209ef04c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1141,14 +1141,15 @@ namespace IRaCIS.Application.Services QuestionMark.Part, }; - orders.ForEach(x => + foreach (var x in orders) { Dictionary answers = new Dictionary(); var rowInfo = tableAnsweRowInfos.Where(y => y.RowIndex == x && y.QuestionId == item.Id).FirstOrDefault(); if (rowInfo == null) { - continue; + continue; } + var rowAnswer = thisAnswer.Where(y => y.RowId == rowInfo.Id).OrderBy(y => y.ShowOrder).ToList(); var organInfo = organInfos.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefault(); From 2e9a252910af62128e415b9656c4b0f6f8ac50b2 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 16:08:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 0209ef04c..52030e1b1 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1247,7 +1247,7 @@ namespace IRaCIS.Application.Services item.TableQuestions.Answers.Add(answers); - }); + }; if (item.Childrens != null && item.Childrens.Count != 0) { From 0adf7a5c847f3e21871d2932dc2fb95f04835bde Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 16:18:02 +0800 Subject: [PATCH 5/7] =?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 | 4 ++-- .../ReadingCalculate/General/GeneralCalculateService.cs | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 52030e1b1..e3ebd2024 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1131,7 +1131,7 @@ namespace IRaCIS.Application.Services }); var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList(); - var orders = thisAnswer.Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList(); + var orders = thisAnswer.OrderBy(x => x.RowIndex).Select(x=>x.RowId).ToList(); item.TableQuestions.Answers = new List>(); @@ -1144,7 +1144,7 @@ namespace IRaCIS.Application.Services foreach (var x in orders) { Dictionary answers = new Dictionary(); - var rowInfo = tableAnsweRowInfos.Where(y => y.RowIndex == x && y.QuestionId == item.Id).FirstOrDefault(); + var rowInfo = tableAnsweRowInfos.Where(y => y.Id==x).FirstOrDefault(); if (rowInfo == null) { continue; diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs index 221b6a6ad..258dcf6f1 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs @@ -266,6 +266,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { if (needRowIds.Contains(x.RowId)) { + + var row = addrowInfo.Where(y => y.Id == x.RowId).FirstOrDefault(); + if (row != null) + { + x.RowIndex = row.RowIndex; + } + + x.QuestionId = otherLesionQuestion.Id; var newLesionTableQuestion = newLesionTableQuestionList.Where(y => y.Id == x.TableQuestionId).FirstOrDefault(); From b0c3ba2a1199b55a678f4736d40c837e7c9e38b3 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 16:34:08 +0800 Subject: [PATCH 6/7] =?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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index e3ebd2024..0f9c1b38f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1145,10 +1145,10 @@ namespace IRaCIS.Application.Services { Dictionary answers = new Dictionary(); var rowInfo = tableAnsweRowInfos.Where(y => y.Id==x).FirstOrDefault(); - if (rowInfo == null) - { - continue; - } + //if (rowInfo == null) + //{ + // continue; + //} var rowAnswer = thisAnswer.Where(y => y.RowId == rowInfo.Id).OrderBy(y => y.ShowOrder).ToList(); From d4ffe2eadfd576d5e5b52f83e68188567ce8afc3 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 22 May 2023 17:09:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 0f9c1b38f..124994922 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1131,7 +1131,7 @@ namespace IRaCIS.Application.Services }); var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList(); - var orders = thisAnswer.OrderBy(x => x.RowIndex).Select(x=>x.RowId).ToList(); + var orders = thisAnswer.OrderBy(x => x.RowIndex).Select(x=>x.RowId).Distinct().ToList(); item.TableQuestions.Answers = new List>();