diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx index c29fad509..341d45808 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_EN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_EN_V1.docx index a16842aa8..5beca7391 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_EN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_EN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_CN_V1.docx index 3e3b655f5..3a116b82b 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_EN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_EN_V1.docx index 6732858a1..743c75d32 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_EN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_EN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_CN_V1.docx index 7b9997ecc..e139d1726 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_EN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_EN_V1.docx index 9ae4a0e05..b40670716 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_EN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_EN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_IRECIST_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_IRECIST_CN_V1.docx index f1d72bc73..639c53989 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_IRECIST_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_IRECIST_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_PCWG3_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_PCWG3_CN_V1.docx index 1e4fdae97..b2aae8908 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_PCWG3_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_PCWG3_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_RECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_RECIST1.1_CN_V1.docx index ff9e09478..202f0d3e8 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_RECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/上海中山医院/ReportTemplate_RECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_IRECIST_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_IRECIST_CN_V1.docx index c29fad509..dfeeb226e 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_IRECIST_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_IRECIST_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_PCWG3_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_PCWG3_CN_V1.docx index 3e3b655f5..8a077c0b5 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_PCWG3_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_PCWG3_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_RECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_RECIST1.1_CN_V1.docx index 7b9997ecc..b39caf529 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_RECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/协和/ReportTemplate_RECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_IRECIST_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_IRECIST_CN_V1.docx index 691a1faa5..097f147b9 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_IRECIST_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_IRECIST_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_PCWG3_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_PCWG3_CN_V1.docx index eeb45c831..af98690c2 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_PCWG3_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_PCWG3_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_RECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_RECIST1.1_CN_V1.docx index cdbe91678..3438c76dd 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_RECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/同济/ReportTemplate_RECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_IRECIST_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_IRECIST_CN_V1.docx index 62ef194a1..b2a8738ad 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_IRECIST_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_IRECIST_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_PCWG3_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_PCWG3_CN_V1.docx index b208c57e4..11ba4de3f 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_PCWG3_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_PCWG3_CN_V1.docx differ diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_RECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_RECIST1.1_CN_V1.docx index bf0db5967..541ff0266 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_RECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_RECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 321645eaa..d62d88e18 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -302,8 +302,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate - - { "Result",getQuestionAnswerList(resultList)}, // 评估结果 + { "TNMValue",taskinfo.TNMValue}, // TNM分期 + { "Result",getQuestionAnswerList(resultList)}, // 评估结果 { "Curative",getQuestionAnswerList(new List() { new ExportReportQuestion (){ QuestionName="靶病灶评估",QuestionType=QuestionType.TargetLesion}, new ExportReportQuestion (){ QuestionName="非靶病灶评估",QuestionType=QuestionType.NoTargetLesion}, diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index 1944e2e3f..48fb27833 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -459,6 +459,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "TargetImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.TargetLesion,inDto.DownLoadGuid)}, // 靶病灶图片 { "NoTargetImage",await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NonTargetLesions,inDto.DownLoadGuid)}, // 非靶病灶图片 { "NewImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NewLesions,inDto.DownLoadGuid)}, // 新病灶图片 + + { "TNMValue",taskinfo.TNMValue}, // TNM分期 { "Result",getQuestionAnswerList(new List() { new ExportReportQuestion (){ QuestionName="靶病灶径线之和（SOD）",QuestionType=QuestionType.SOD}, new ExportReportQuestion (){ QuestionName="非淋巴结靶病灶长径之和",QuestionType=QuestionType.SumOfDiameter}, diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index d5b7024c2..509a47ec6 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -223,6 +223,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "BaselineLesionsImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.BaselineLesions, inDto.DownLoadGuid)}, // 基线病灶 { "AlwaysNewLesionsImage",await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.AlwaysNewLesions, inDto.DownLoadGuid)}, // 既往新病灶 { "NewImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NewLesions, inDto.DownLoadGuid)}, // 新病灶图片 + + { "TNMValue",taskinfo.TNMValue}, // TNM分期 { "Result",getQuestionAnswerList(new List() { new ExportReportQuestion (){ QuestionName="基线病灶计数",QuestionType=QuestionType.BaseLineLesionsCount}, new ExportReportQuestion (){ QuestionName="新病灶计数",QuestionType=QuestionType.NewLesionsCount}, diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 413722723..2a26b6b48 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -474,6 +474,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "TargetImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.TargetLesion,inDto.DownLoadGuid)}, // 靶病灶图片 { "NoTargetImage",await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NonTargetLesions,inDto.DownLoadGuid)}, // 非靶病灶图片 { "NewImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NewLesions,inDto.DownLoadGuid)}, // 新病灶图片 + + { "TNMValue",taskinfo.TNMValue}, // TNM分期 { "Result",getQuestionAnswerList(new List() { new ExportReportQuestion (){ QuestionName="靶病灶径线之和（SOD）",QuestionType=QuestionType.SOD}, new ExportReportQuestion (){ QuestionName="非淋巴结靶病灶长径之和",QuestionType=QuestionType.SumOfDiameter}, diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index 0d334834e..bbfa9ac77 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -469,6 +469,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "TargetImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.TargetLesion,inDto.DownLoadGuid)}, // 靶病灶图片 { "NoTargetImage",await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NonTargetLesions,inDto.DownLoadGuid)}, // 非靶病灶图片 { "NewImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NewLesions,inDto.DownLoadGuid)}, // 新病灶图片 + + { "TNMValue",taskinfo.TNMValue}, // TNM分期 { "Result",getQuestionAnswerList(new List() { new ExportReportQuestion (){ QuestionName="靶病灶径线之和（SOD）",QuestionType=QuestionType.SOD}, new ExportReportQuestion (){ QuestionName="非淋巴结靶病灶长径之和",QuestionType=QuestionType.SumOfDiameter},