diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
index 302210a88..1558db0a4 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
@@ -25,7 +25,7 @@
Protocol ID: {2}
- Study name: {1}
+ Study Name: {1}
User ID: {4}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
index 16ffaaeb4..56f832794 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
@@ -25,7 +25,7 @@
Protocol ID: {2}
- Study name: {1}
+ Study Name: {1}
User ID: {4}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html
index 077163e5f..4a7064460 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html
@@ -22,7 +22,7 @@
Protocol ID: {2}
- Study name: {3}
+ Study Name: {3}
Site ID: {4}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
index 519e9ab19..f965bf8b5 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
@@ -25,7 +25,7 @@
Protocol ID: {2}
- Study name: {1}
+ Study Name: {1}
User ID: {4}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
index 8bbd27dc5..8a047db59 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
@@ -25,7 +25,7 @@
Protocol ID: {2}
- Study name: {1}
+ Study Name: {1}
User ID: {4}
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index a97afcfed..dc1c15b6c 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -770,36 +770,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string RowMark { get; set; } = string.Empty;
- ///
- /// InstanceId
- ///
- public Guid? OtherInstanceId { get; set; }
-
- ///
- /// SeriesId
- ///
- public Guid? OtherSeriesId { get; set; }
-
-
- ///
- /// StudyId
- ///
- public Guid? OtherStudyId { get; set; }
-
- public string? OtherMarkTool { get; set; }
-
- public string? OtherPicturePath { get; set; }
-
- public int? OtherNumberOfFrames { get; set; }
-
-
-
-
-
-
- public string? OtherMeasureData { get; set; } = string.Empty;
-
-
}
public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 9008dd605..1dae4b96b 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2105,30 +2105,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
ReadingCalculateDto inDto = await _generalCalculateService.GetReadingCalculateDto(visitTaskId);
-
- if (spleenLength == 0)
+ var result = SpleenAssessment.NotEvaluable;
+ if (spleenLength < 0)
{
return SpleenAssessment.NotEvaluable.GetEnumInt();
}
-
- if (inDto.IsBaseLine)
+ else if (0 < spleenLength && spleenLength <= 130)
{
- if (spleenLength <= 130)
- {
- return SpleenAssessment.Normal.GetEnumInt();
- }
- else
- {
- return SpleenAssessment.Swelling.GetEnumInt();
- }
-
- }
+ return SpleenAssessment.Normal.GetEnumInt();
+
+ }
+ else if (inDto.IsBaseLine)
+ {
+ return SpleenAssessment.Swelling.GetEnumInt();
+ }
var lowSpleenLength = await this.GetLowSpleenLength(taskinfo);
- var result = SpleenAssessment.Stabilization;
+
var presentSpd = spleenLength;