XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-03-27 16:30:50 +08:00
parent 95fe14fece cfaf14ed65
commit 89574e05bc
10 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx
View File

Binary file not shown.

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_PCWG3_CN_V1.docx
View File

Binary file not shown.

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_CN_V1.docx
View File

Binary file not shown.

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_IRECIST_CN_V1.docx Normal file
View File

Binary file not shown.

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_PCWG3_CN_V1.docx Normal file
View File

Binary file not shown.

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/医院模板/复旦大学肿瘤附属医院/ReportTemplate_RECIST1.1_CN_V1.docx Normal file
View File

Binary file not shown.

5
IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
View File

@ -22,6 +22,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
[ApiExplorerSettings(GroupName = "Reading")]
public class IRECIST1Point1CalculateService(IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
IRepository<VisitTask> _visitTaskRepository,
IRepository<HIRHospital> _hIRHospitalRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
IRepository<ReadingTableAnswerRowInfo> _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<string, object>()
{
// { "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 +"岁" }, //患者年龄

5
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -18,6 +18,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
[ApiExplorerSettings(GroupName = "Reading")]
public class PCWG3CalculateService(IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
IRepository<VisitTask> _visitTaskRepository,
IRepository<HIRHospital> _hIRHospitalRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
IRepository<ReadingTableAnswerRowInfo> _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<string, object>()
{
// { "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 +"岁" }, //患者年龄

4
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -24,6 +24,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
[ApiExplorerSettings(GroupName = "Reading")]
public class RECIST1Point1CalculateService(IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
IRepository<VisitTask> _visitTaskRepository,
IRepository<HIRHospital> _hIRHospitalRepository,
IRepository<DicomInstance> _dicomInstanceRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IRepository<ReadingTableQuestionTrial> _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<string, object>()
{
// { "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 +"岁" }, //患者年龄

5
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
View File

@ -20,6 +20,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
[ApiExplorerSettings(GroupName = "Reading")]
public class RECIST1Point1_BMCalculateService(IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
IRepository<VisitTask> _visitTaskRepository,
IRepository<HIRHospital> _hIRHospitalRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
IRepository<ReadingTableAnswerRowInfo> _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<string, object>()
{
// { "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 +"岁" }, //患者年龄