From d149d5a5d5db3485bc309122cdd80ff3e0518ac9 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 8 Mar 2024 11:32:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=84=BE=E8=84=8F=E7=8A=B6=E6=80=81?= 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 9008dd605..60a69116a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -2106,7 +2106,7 @@ 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) + if (spleenLength < 0) { return SpleenAssessment.NotEvaluable.GetEnumInt(); } From 6aa8628c0c65b0f8fa73e0265269638f15f58dc5 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 8 Mar 2024 11:49:25 +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 --- .../Reading/Dto/ReadingImageTaskViewModel.cs | 30 ------------------- 1 file changed, 30 deletions(-) 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 From 62b76220d4ba4c78c5364c571f05bfcf49286df9 Mon Sep 17 00:00:00 2001 From: helongjun Date: Fri, 8 Mar 2024 12:51:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html | 2 +- .../wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html | 2 +- .../wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html | 2 +- .../wwwroot/EmailTemplate/TrialUserExistJoin_US.html | 2 +- .../wwwroot/EmailTemplate/TrialUserFirstJoin_US.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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} From d772ea527ae640b9b8a8de64100cf0489f28a283 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 8 Mar 2024 13:14:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LuganoCalculateService.cs | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 60a69116a..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); - + 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;