From 24f64e9d599ef1e49a2ca7be741cab7c336fe174 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 15 Jan 2024 16:36:32 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/ReadingCalculate/LuganoCalculateService.cs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 3c8c3b8e1..835a51250 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2008,7 +2008,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//{
// return SpleenAssessment.Stabilization.GetEnumInt();
//}
- Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl);
if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
{
return PET5PSScore.NE.GetEnumInt();
@@ -2040,22 +2039,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
// 本访视病灶的 max SUVmax（所有病灶中最大的）> 2 * 肝脏血池SUVmax
- else if (maxSUVmax >2* LiverSUVmax)
+ else if (maxSUVmax >2* LiverSUVmax&& LiverSUVmax!=0)
{
result = PET5PSScore.Five;
}
//本访视病灶的SUVmax（所有病灶中最大的）>肝脏血池SUVmax
- else if (maxSUVmax > LiverSUVmax)
+ else if (maxSUVmax > LiverSUVmax && LiverSUVmax != 0)
{
result = PET5PSScore.Four;
}
//纵隔血池SUVmax<本访视点病灶的max SUVmax（所有病灶中最大的）≤1*肝脏血池SUVmax
- else if (MediastinumSUVmax < maxSUVmax&& maxSUVmax <= LiverSUVmax)
+ else if (MediastinumSUVmax < maxSUVmax&& maxSUVmax <= LiverSUVmax&& LiverSUVmax!=0)
{
result = PET5PSScore.Three;
}
//本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax
- else if (maxSUVmax < MediastinumSUVmax)
+ else if (maxSUVmax < MediastinumSUVmax && MediastinumSUVmax!=0)
{
result = PET5PSScore.Two;
}
From dcb9d7b7fcab069e41c0d9ee7447384c7c11db5f Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 16 Jan 2024 09:52:31 +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/ReadingOncologyTaskService.cs | 3 +++
.../Service/ReadingCalculate/LuganoCalculateService.cs | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index 436fb0362..a4ad78707 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -149,6 +149,9 @@ namespace IRaCIS.Application.Services
}).ToListAsync();
var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).ToListAsync();
+ // 上一次肿瘤学阅片
+
+
oncologyVisits.ForEach(x =>
{
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 835a51250..4a3a6accd 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2039,12 +2039,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
// 本访视病灶的 max SUVmax（所有病灶中最大的）> 2 * 肝脏血池SUVmax
- else if (maxSUVmax >2* LiverSUVmax&& LiverSUVmax!=0)
+ else if (maxSUVmax >2* LiverSUVmax&& maxSUVmax != 0)
{
result = PET5PSScore.Five;
}
//本访视病灶的SUVmax（所有病灶中最大的）>肝脏血池SUVmax
- else if (maxSUVmax > LiverSUVmax && LiverSUVmax != 0)
+ else if (maxSUVmax > LiverSUVmax && maxSUVmax != 0)
{
result = PET5PSScore.Four;
}
From c11f4a5dc72b967e8e4867b5d82b2a1a71b0a72c Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 16 Jan 2024 10:23:24 +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
---
IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 2a2b795b1..ef7a47d5c 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -925,7 +925,7 @@ namespace IRaCIS.Core.Application.Image.QA
return new GetNextIQCQualityOutDto() { };
break;
case TrialQCProcess.SingleAudit:
- visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
+ visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x=>x.VisitNum).FirstOrDefault();
if(subjectVisit!=null)
@@ -952,7 +952,7 @@ namespace IRaCIS.Core.Application.Image.QA
break;
case TrialQCProcess.DoubleAudit:
- visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId &&
+ visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId &&
((x.CurrentActionUserId == _userInfo.Id)||(!x.IsTake&& x.AuditState != AuditStateEnum.QCPassed&& (x.PreliminaryAuditUserId != _userInfo.Id)))
).Include(x => x.Subject).ToListAsync();
if (subjectVisit != null)
From 3d0f0b0f52bce92642c0287f73a3ef56f6d34210 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 16 Jan 2024 10:30:38 +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/ReadingCalculate/LuganoCalculateService.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 4a3a6accd..a1db4fa27 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2039,22 +2039,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
// 本访视病灶的 max SUVmax（所有病灶中最大的）> 2 * 肝脏血池SUVmax
- else if (maxSUVmax >2* LiverSUVmax&& maxSUVmax != 0)
+ else if (maxSUVmax >2* LiverSUVmax&& LiverSUVmax != 0)
{
result = PET5PSScore.Five;
}
//本访视病灶的SUVmax（所有病灶中最大的）>肝脏血池SUVmax
- else if (maxSUVmax > LiverSUVmax && maxSUVmax != 0)
+ else if (maxSUVmax > LiverSUVmax && LiverSUVmax != 0)
{
result = PET5PSScore.Four;
}
//纵隔血池SUVmax<本访视点病灶的max SUVmax（所有病灶中最大的）≤1*肝脏血池SUVmax
- else if (MediastinumSUVmax < maxSUVmax&& maxSUVmax <= LiverSUVmax&& LiverSUVmax!=0)
+ else if (MediastinumSUVmax < maxSUVmax&& maxSUVmax <= LiverSUVmax&& MediastinumSUVmax != 0)
{
result = PET5PSScore.Three;
}
//本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax
- else if (maxSUVmax < MediastinumSUVmax && MediastinumSUVmax!=0)
+ else if (maxSUVmax < MediastinumSUVmax && maxSUVmax != 0)
{
result = PET5PSScore.Two;
}
From b179a2fa494c3936174b32cf37ce1552f2230864 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 16 Jan 2024 10:40:35 +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
---
.../Service/ReadingCalculate/LuganoCalculateService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index a1db4fa27..5f1f755de 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2039,7 +2039,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
// 本访视病灶的 max SUVmax（所有病灶中最大的）> 2 * 肝脏血池SUVmax
- else if (maxSUVmax >2* LiverSUVmax&& LiverSUVmax != 0)
+ else if (maxSUVmax >2* LiverSUVmax&& LiverSUVmax != 0m)
{
result = PET5PSScore.Five;
}
From 5bb0f30c775d6b958463020af485a3cd48c65515 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 16 Jan 2024 10:47:00 +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
---
.../ReadingCalculate/LuganoCalculateService.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 5f1f755de..e5d2b4fb5 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2004,11 +2004,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
public async Task GetPET5PS(ReadingCalculateDto inDto)
{
- //if (inDto.IsBaseLine)
- //{
- // return SpleenAssessment.Stabilization.GetEnumInt();
- //}
- if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
+ //if (inDto.IsBaseLine)
+ //{
+ // return SpleenAssessment.Stabilization.GetEnumInt();
+ //}
+ Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl);
+ if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
{
return PET5PSScore.NE.GetEnumInt();
}
From 4bbfacd7de0ddffb242fb366a58040a0cb208719 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 16 Jan 2024 10:48:30 +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/ReadingCalculate/LuganoCalculateService.cs | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index e5d2b4fb5..b7391d8a3 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2008,7 +2008,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//{
// return SpleenAssessment.Stabilization.GetEnumInt();
//}
- Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl);
+
if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
{
return PET5PSScore.NE.GetEnumInt();
@@ -2062,9 +2062,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//无需标记，自主选择
else
{
- return string.Empty;
+ Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl + "当前结果");
+ return string.Empty;
}
- return result.GetEnumInt();
+
+ Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl+"当前结果"+ result.GetEnumInt());
+ return result.GetEnumInt();
}
#endregion