From 9d8fdcfa128f0dd09ccd014a941fd54755227bde Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 1 Feb 2024 09:16:53 +0800
Subject: [PATCH 1/4] =?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/ReadingCalculate/Dto/CriterionCalculateDto.cs | 2 ++
.../Service/ReadingCalculate/LuganoCalculateService.cs | 1 +
2 files changed, 3 insertions(+)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
index d68e11325..c1964894b 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
@@ -26,6 +26,8 @@ namespace IRaCIS.Core.Application.ViewModel
{
public Guid RowId { get; set; }
+ public decimal RowIndex { get; set; }
+
public decimal AllPPD { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index b1a2c4efd..6df0950a7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -1034,6 +1034,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
result.Add(new GetSplitPPdOutDto()
{
RowId = answerList.Where(x => x.RowIndex == i).Select(x => x.RowId).FirstOrDefault(),
+ RowIndex = i,
AllPPD = answerList.Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer),
});
}
From 467c7f77f53a098435fb38784d5d32ddc8c2be17 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 1 Feb 2024 09:46:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 13 +++++++++++++
.../ReadingCalculate/LuganoCalculateService.cs | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 328e313f8..b1d9efd92 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1764,6 +1764,19 @@
+
+
+ 计算靶病灶状态
+
+
+
+
+
+
+ 获取分裂病灶的PPd之和 不包括当前的主病灶
+
+
+
将上一次的访视病灶添加到这一次
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 6df0950a7..3eb65ffaa 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -1028,7 +1028,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
x.RowIndex,
Answer = x.Answer.IsNullOrEmptyReturn0()
}).ToList();
- var maxRowIndex = answerList.Max(x => x.RowIndex);
+ var maxRowIndex = answerList.MaxOrDefault(x => x.RowIndex);
for (int i = 1; i < maxRowIndex; i++)
{
result.Add(new GetSplitPPdOutDto()
From c54fcf920cd05d71d862c8be0206f544b9a1732b Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 1 Feb 2024 09:59:07 +0800
Subject: [PATCH 3/4] =?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/ReadingCalculate/Dto/CriterionCalculateDto.cs | 2 +-
.../Service/ReadingCalculate/LuganoCalculateService.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
index c1964894b..849a25dee 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.ViewModel
{
public Guid RowId { get; set; }
- public decimal RowIndex { get; set; }
+ public string RowIndex { get; set; }
public decimal AllPPD { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 3eb65ffaa..c7d12d6c6 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -1034,7 +1034,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
result.Add(new GetSplitPPdOutDto()
{
RowId = answerList.Where(x => x.RowIndex == i).Select(x => x.RowId).FirstOrDefault(),
- RowIndex = i,
+ RowIndex = answerList.Where(x => x.RowIndex == i).Select(x => x.RowIndex).FirstOrDefault().ToString(),
AllPPD = answerList.Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer),
});
}
From d6a585c6ccbdf1d1be584a045b1c230d679ca6c2 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 1 Feb 2024 10:46:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ReadingImageTaskService.cs | 9 +++-
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 41 +++++++++++--------
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index f78d2a27b..85e3c0a1e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1398,7 +1398,7 @@ namespace IRaCIS.Application.Services
///
- /// 拆分病灶
+ /// 拆分病灶 分裂病灶
///
///
[HttpPost]
@@ -1444,7 +1444,12 @@ namespace IRaCIS.Application.Services
});
await _readingTableAnswerRowInfoRepository.AddAsync(rowAnswer);
await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
- await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
+ await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.RowId, x => new ReadingTableAnswerRowInfo()
+ {
+ SplitOrMergeType = SplitOrMergeType.SplitMain
+ });
+
+ await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
}
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index fd28b89c1..d492b9a32 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -633,27 +633,32 @@ namespace IRaCIS.Core.Domain.Share
}
- ///
- /// 病灶分裂或合并
- ///
- public enum SplitOrMergeType
- {
+ ///
+ /// 病灶分裂或合并
+ ///
+ public enum SplitOrMergeType
+ {
+ ///
+ /// 分裂
+ ///
+ Split = 0,
- ///
- /// 分裂
- ///
- Split = 0,
+ ///
+ /// 合并
+ ///
+ Merge = 1,
- ///
- /// 合并
- ///
- Merge = 1
- }
+ ///
+ /// 分裂主病灶
+ ///
+ SplitMain = 2,
- ///
- /// 是否存在或者NA
- ///
- public enum ExistOrNA
+ }
+
+ ///
+ /// 是否存在或者NA
+ ///
+ public enum ExistOrNA
{
///
/// NA