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..691a1faa5 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..eeb45c831 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..cdbe91678 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 new file mode 100644 index 000000000..62ef194a1 Binary files /dev/null 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 new file mode 100644 index 000000000..b208c57e4 Binary files /dev/null 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 new file mode 100644 index 000000000..bf0db5967 Binary files /dev/null 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 b0f6fdca0..429ceaf6a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -22,6 +22,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate [ApiExplorerSettings(GroupName = "Reading")] public class IRECIST1Point1CalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, + IRepository _hIRHospitalRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, IRepository _readingTableAnswerRowInfoRepository, @@ -259,11 +260,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { assessmentResult = $"整体肿瘤评估结果为{_generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, inDto.VisitTaskId, QuestionType.Tumor)}"; } + + var hIRHospital = await _hIRHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync(); var value = new Dictionary() { // { "Logo" ,await _generalCalculateService.GetWordPictureMaxWL(_options.CurrentValue.MinIO.viewEndpoint+_hospital.CurrentValue.HospitalLogoPath ,System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}"),110,100) }, - { "HospitalName",_hospital.CurrentValue.HospitalName } ,// 医院名称 + { "HospitalName",hIRHospital.HospitalName } ,// 医院名称 { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index a9a4fd746..2f9603394 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -18,6 +18,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate [ApiExplorerSettings(GroupName = "Reading")] public class PCWG3CalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, + IRepository _hIRHospitalRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, IRepository _readingTableAnswerRowInfoRepository, @@ -197,11 +198,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var subjectPatientList = await _subjectPatientRepository.Where(x => x.SubjectId == subjectInfo.Id).Include(x => x.Patient).ToListAsync(); - + var hIRHospital = await _hIRHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync(); var value = new Dictionary() { // { "Logo" ,await _generalCalculateService.GetWordPictureMaxWL(_options.CurrentValue.MinIO.viewEndpoint+_hospital.CurrentValue.HospitalLogoPath ,System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}"),110,100) }, - { "HospitalName",_hospital.CurrentValue.HospitalName } ,// 医院名称 + { "HospitalName",hIRHospital.HospitalName } ,// 医院名称 { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 5348f814b..8b3762ec8 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -24,6 +24,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate [ApiExplorerSettings(GroupName = "Reading")] public class RECIST1Point1CalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, + IRepository _hIRHospitalRepository, IRepository _dicomInstanceRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -429,12 +430,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { assessmentResult = $"整体肿瘤评估结果为{_generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, inDto.VisitTaskId, QuestionType.Tumor)}"; } + var hIRHospital =await _hIRHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync(); var value = new Dictionary() { // { "Logo" ,await _generalCalculateService.GetWordPictureMaxWL(_options.CurrentValue.MinIO.viewEndpoint+_hospital.CurrentValue.HospitalLogoPath ,System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}"),110,100) }, - { "HospitalName",_hospital.CurrentValue.HospitalName } ,// 医院名称 + { "HospitalName",hIRHospital.HospitalName } ,// 医院名称 { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index 233ad6e6a..26501988d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -20,6 +20,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate [ApiExplorerSettings(GroupName = "Reading")] public class RECIST1Point1_BMCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, + IRepository _hIRHospitalRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, IRepository _readingTableAnswerRowInfoRepository, @@ -219,11 +220,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate assessmentResult = $"整体肿瘤评估结果为{_generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, inDto.VisitTaskId, QuestionType.Tumor)}"; } + var hIRHospital =await _hIRHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync(); + var value = new Dictionary() { // { "Logo" ,await _generalCalculateService.GetWordPictureMaxWL(_options.CurrentValue.MinIO.viewEndpoint+_hospital.CurrentValue.HospitalLogoPath ,System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}"),110,100) }, - { "HospitalName",_hospital.CurrentValue.HospitalName } ,// 医院名称 + { "HospitalName",hIRHospital.HospitalName } ,// 医院名称 { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄