From 5a3b6a5f93dcd440313380dfb8ff2ddb7a202502 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 9 Apr 2024 16:06:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=EF=BC=8C=E5=85=AC=E5=8F=B8=E5=90=8Dbug=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/SiteSurvey/TrialSiteSurveyService.cs                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 7033ada86..a19b5b6f8 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -626,6 +626,8 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 var templateInfo = SourceReader.ReadToEnd();
 
+                templateInfo = templateInfo.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN)
+                .Replace("{company abbreviation}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN);
 
                 builder.HtmlBody = string.Format(templateInfo,
                      (user == null ? survey.UserName : user.LastName + "/ " + user.FirstName),

From c822d20d0dbdae1433460fc18926e3780f3b58e8 Mon Sep 17 00:00:00 2001
From: helongjun <helongjun713@126.com>
Date: Wed, 10 Apr 2024 14:46:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/LuganoCalculateService.cs     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 865bcaabf..42424c3dc 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -513,6 +513,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             List<ReadingCalculateData> calculateList = new List<ReadingCalculateData>()
             {
+                /*
+                 * 保存影像质量问题
+                 * 如果：不正常：PET-CT不能融合， FDG-PET的评估设置为NE
+                 * 
+                 * 保存二维页面病灶
+                 * 
+                 * 保存
+                 * 
+                 * 
+                 * 
+                 */
+
                    // 是否存在Pet
                  new ReadingCalculateData (){QuestionType=QuestionType.ExistPET,GetStringFun=GetExistPET},
 
@@ -2476,6 +2488,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<string> GetPET5PS(ReadingCalculateDto inDto)
         {
+            //病灶最大SUVmax、肝脏血池、纵膈血池SUVmax未发生改变时，不用计算
 			//if (inDto.IsBaseLine)
 			//{
 			//    return SpleenAssessment.Stabilization.GetEnumInt();
@@ -2564,6 +2577,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 		/// <returns></returns>
 		public async Task<string> GetUptakeChange(ReadingCalculateDto inDto)
         {
+            //PET5ps评分改变时，才计算
             if (inDto.IsBaseLine)
             {
                 return SUVChangeVSBaseline.NA.GetEnumInt();