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

生成肿瘤报告
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-03-24 16:15:21 +08:00
parent e7046173f8
commit 7e8995a7b2
18 changed files with 810 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx Normal file
View File

Binary file not shown.

162
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -4614,6 +4614,13 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.DownLoadTumorEvaluationStream(IRaCIS.Core.Application.Service.Reading.Dto.DownLoadReadReportInDto)">
<summary>
获取肿瘤评估报告
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.DownLoadReadReportStream(IRaCIS.Core.Application.Service.Reading.Dto.DownLoadReadReportInDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.DownLoadReadReportStream(IRaCIS.Core.Application.Service.Reading.Dto.DownLoadReadReportInDto)">
<summary> <summary>
下载阅片报告 下载阅片报告
@ -6781,6 +6788,161 @@
项目临床数据Id 项目临床数据Id
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportTumorEvaluationInfo.VisitList">
<summary>
所有访视的靶病灶列表
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportTumorEvaluationInfo.VisitOne">
<summary>
访视一
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportTumorEvaluationInfo.VisitTwo">
<summary>
访视二
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportTumorEvaluationInfo.VisitThree">
<summary>
访视三
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportTumorEvaluationInfo.TargetInfoList">
<summary>
靶病灶信息
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportTumorEvaluationInfo.NoTargetInfoList">
<summary>
非靶病灶信息
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.VisitName">
<summary>
访视名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.VisitNum">
<summary>
访视序号
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.CheckDate">
<summary>
检查日期
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.CheckInfoList">
<summary>
检查信息
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.CheckInfoStr">
<summary>
检查信息字符串
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.HaveNewLesion">
<summary>
是否有新病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.TargetResult">
<summary>
靶病灶结果
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.NoTargetResult">
<summary>
非靶病灶结果
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.OverallResult">
<summary>
总体结果
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.DoctorName">
<summary>
医生名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.SignTime">
<summary>
签名时间
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.DoctorSignTime">
<summary>
医生签名时间
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.VisitTargetInfoList">
<summary>
靶病灶信息
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.TargetSum">
<summary>
靶病灶总长度
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.VisitNoTargetInfoList">
<summary>
非靶病灶信息
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.RowMark">
<summary>
序号
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.Organ">
<summary>
器官
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.Part">
<summary>
部位
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.StudyCode">
<summary>
检查号
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.SeriesNumber">
<summary>
序列号
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.InstanceNumber">
<summary>
图像号
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.VisitImgNum">
<summary>
图像号
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.VisitLength">
<summary>
长度
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.DicomStudyInfo.Modalities">
<summary>
检查类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.DicomStudyInfo.BodyPartExamined">
<summary>
标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.TrialSiteCode"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.TrialSiteCode">
<summary> <summary>
项目中心Code 项目中心Code

254
IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs
View File

@ -9,6 +9,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class TumorEvaluationInfo public class TumorEvaluationInfo
{ {
public List<ExportTumorEvaluationInfo> VisitList { get; set; } public List<ExportTumorEvaluationInfo> VisitList { get; set; }
} }
@ -19,36 +21,124 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public List<ExportVisitData> VisitList { get; set; } public List<ExportVisitData> VisitList { get; set; }
/// <summary>
/// 受试者Code
/// </summary>
public string SubjectCode { get; set; } =string.Empty;
public string SubjectName { get; set; } = string.Empty;
public string ResearchProgramNo { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 访视一 /// 访视一
/// </summary> /// </summary>
public ExportVisitData VisitOne { get; set; } public ExportVisitData VisitOne
{
get
{
return VisitList[0];
}
}
/// <summary> /// <summary>
/// 访视二 /// 访视二
/// </summary> /// </summary>
public ExportVisitData VisitTwo { get; set; } public ExportVisitData VisitTwo
{
get
{
if (VisitList.Count >= 2)
{
return VisitList[1];
}
else
{
return new ExportVisitData();
}
}
}
/// <summary> /// <summary>
/// 访视三 /// 访视三
/// </summary> /// </summary>
public ExportVisitData VisitThree { get; set; } public ExportVisitData VisitThree
{
get
{
if (VisitList.Count >= 3)
{
return VisitList[2];
}
else
{
return new ExportVisitData();
}
}
}
/// <summary> /// <summary>
/// 靶病灶信息 /// 靶病灶信息
/// </summary> /// </summary>
public List<TargetInfo> TargetInfoList { get; set; } public List<TargetInfo> TargetInfoList
{
get
{
List<TargetInfo> targets=new List<TargetInfo>();
var index = 0;
foreach (var item in VisitOne.VisitTargetInfoList)
{
TargetInfo targetInfo = new TargetInfo()
{
Title = item.Title,
VisitOneImgNum = item.VisitImgNum,
VisitOneLength = item.VisitLength.ToString(),
VisitTwoImgNum = VisitList.Count >= 2 ? VisitTwo.VisitTargetInfoList[index].VisitImgNum : string.Empty,
VisitTwoLength = VisitList.Count >= 2 ? VisitTwo.VisitTargetInfoList[index].VisitLength.ToString() : string.Empty,
VisitThreeImgNum = VisitList.Count >= 3 ? VisitThree.VisitTargetInfoList[index].VisitImgNum : string.Empty,
VisitThreeLength = VisitList.Count >= 3 ? VisitThree.VisitTargetInfoList[index].VisitLength.ToString() : string.Empty
};
targets.Add(targetInfo);
index++;
}
return targets;
}
}
/// <summary> /// <summary>
/// 非靶病灶信息 /// 非靶病灶信息
/// </summary> /// </summary>
public List<NoTargetInfo> NoTargetInfoList { get; set; } public List<TargetInfo> NoTargetInfoList
{
get
{
List<TargetInfo> targets = new List<TargetInfo>();
var index = 0;
foreach (var item in VisitOne.VisitNoTargetInfoList)
{
TargetInfo targetInfo = new TargetInfo()
{
Title = item.Title,
VisitOneImgNum = item.VisitImgNum,
VisitOneLength = item.VisitLength.ToString(),
VisitTwoImgNum = VisitList.Count >= 2 ? VisitTwo.VisitNoTargetInfoList[index].VisitImgNum : string.Empty,
VisitTwoLength = VisitList.Count >= 2 ? VisitTwo.VisitNoTargetInfoList[index].VisitLength.ToString() : string.Empty,
VisitThreeImgNum = VisitList.Count >= 3 ? VisitThree.VisitNoTargetInfoList[index].VisitImgNum : string.Empty,
VisitThreeLength = VisitList.Count >= 3 ? VisitThree.VisitNoTargetInfoList[index].VisitLength.ToString() : string.Empty
};
targets.Add(targetInfo);
index++;
}
return targets;
}
}
} }
public class NoTargetInfo
{
}
public class TargetInfo public class TargetInfo
{ {
@ -74,6 +164,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string VisitName { get; set; } = string.Empty; public string VisitName { get; set; } = string.Empty;
/// <summary>
/// 访视序号
/// </summary>
public decimal VisitNum { get; set; }
/// <summary> /// <summary>
/// 检查日期 /// 检查日期
/// </summary> /// </summary>
@ -89,10 +184,149 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string CheckInfoStr => string.Join("/", CheckInfoList.Select(x => $"{x.Modalities}、{x.BodyPartExamined}")); public string CheckInfoStr => string.Join("/", CheckInfoList.Select(x => $"{x.Modalities}、{x.BodyPartExamined}"));
/// <summary>
/// 是否有新病灶
/// </summary>
public string HaveNewLesion { get; set; } = string.Empty;
/// <summary>
/// 靶病灶结果
/// </summary>
public string TargetResult { get; set; } = string.Empty;
/// <summary>
/// 非靶病灶结果
/// </summary>
public string NoTargetResult { get; set; } = string.Empty;
/// <summary>
/// 总体结果
/// </summary>
public string OverallResult { get; set; } = string.Empty;
/// <summary>
/// 医生名称
/// </summary>
public string DoctorName { get; set; } = string.Empty;
/// <summary>
/// 签名时间
/// </summary>
public string SignTime { get; set; } = string.Empty;
/// <summary>
/// 医生签名时间
/// </summary>
public string DoctorSignTime
{
get
{
return $"{DoctorName}/{SignTime}";
}
}
/// <summary>
/// 靶病灶信息
/// </summary>
public List<VisitLesionInfo> VisitTargetInfoList { get; set; } = new List<VisitLesionInfo>();
/// <summary>
/// 靶病灶总长度
/// </summary>
public decimal TargetSum
{
get
{
return VisitTargetInfoList.Sum(x => x.VisitLength);
}
}
/// <summary>
/// 非靶病灶信息
/// </summary>
public List<VisitLesionInfo> VisitNoTargetInfoList { get; set; } = new List<VisitLesionInfo>();
} }
public class VisitLesionInfo
{
/// <summary>
/// 序号
/// </summary>
public string RowMark { get; set; } = string.Empty;
/// <summary>
/// 器官
/// </summary>
public string Organ { get; set; } = string.Empty;
/// <summary>
/// 部位
/// </summary>
public string Part { get; set; } = string.Empty;
public int Number { get; set; }
public string Title {
get
{
if (RowMark != string.Empty)
{
return $"{Number}：{RowMark}，{Organ}：{Part}";
}
else
{
return $"{Number}";
}
}
}
/// <summary>
/// 检查号
/// </summary>
public int StudyCode { get; set; }
public Guid? RowId { get; set; }
/// <summary>
/// 序列号
/// </summary>
public int SeriesNumber { get; set; }
/// <summary>
/// 图像号
/// </summary>
public int InstanceNumber { get; set; }
/// <summary>
/// 图像号
/// </summary>
public string VisitImgNum
{
get
{
if (RowId == null)
{
return string.Empty;
}
else
{
return $"{StudyCode}/{SeriesNumber}/{InstanceNumber}";
}
}
}
/// <summary>
/// 长度
/// </summary>
public decimal VisitLength { get; set; }
}
public class DicomStudyInfo public class DicomStudyInfo
{ {
/// <summary> /// <summary>

27
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -92,6 +92,33 @@ namespace IRaCIS.Core.Application.Service
}); });
} }
/// <summary>
/// 下载瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<FileResult> DownTumorEvaluation(DownLoadReadReportInDto inDto)
{
return await _readingCalculateService.DownLoadTumorEvaluation(inDto);
}
/// <summary>
/// 获取肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<string> GetTumorEvaluationUrl(GenerateReadingReportInDto inDto)
{
return await _readingCalculateService.GetTumorEvaluationReportUrl(new CaGetVisitReadReportUrl()
{
VisitTaskId = inDto.VisitTaskId,
});
}
#region 计算 #region 计算

92
IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
View File

@ -208,6 +208,98 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
/// <summary>
/// 下载肿瘤评估流
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
var service = await this.GetService(inDto.VisitTaskId);
if (service != null)
{
inDto.DownLoadGuid = Guid.NewGuid();
var result = await service.DownLoadTumorEvaluationStream(inDto);
this.DeleteFile(inDto);
return result;
}
else
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
}
/// <summary>
/// 获取肿瘤并生成报告URL
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<string> GetTumorEvaluationReportUrl(CaGetVisitReadReportUrl inDto)
{
var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
if (taskinfo.ReportExportUrl != string.Empty)
{
return taskinfo.ReportExportUrl;
}
else
{
var stream = await DownLoadTumorEvaluationStream(new DownLoadReadReportInDto()
{
VisitTaskId = inDto.VisitTaskId,
});
var url = await _oSSService.UploadToOSSAsync(stream, $"ReadingReport/{taskinfo.TrialId.ToString()}/{taskinfo.Id.ToString()}", $"TumorEvaluation_{taskinfo.Subject.Code}_{taskinfo.SourceSubjectVisit.VisitName}.pdf", false);
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
{
TumorEvaluationUrl = url
});
return url;
}
}
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
public async Task<FileResult> DownLoadTumorEvaluation(DownLoadReadReportInDto inDto)
{
var service = await this.GetService(inDto.VisitTaskId);
if (service != null)
{
inDto.DownLoadGuid = Guid.NewGuid();
Stream stream = await service.DownLoadTumorEvaluationStream(inDto);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
FileStreamResult actionResult = new FileStreamResult(stream, new Microsoft.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream"));
actionResult.FileDownloadName = "ReadReoprtTemplateTumorEvaluation.docx";
this.DeleteFile(inDto);
return actionResult;
}
else
{
FileStreamResult actionResult = new FileStreamResult(stream, new Microsoft.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream"));
actionResult.FileDownloadName = "ReadReoprtTemplateTumorEvaluation.pdf";
this.DeleteFile(inDto);
return actionResult;
}
}
else
{
throw new BusinessValidationFailedException("error");
}
}
/// <summary> /// <summary>
/// 自动计算 并修改值 /// 自动计算 并修改值

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

@ -56,6 +56,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
} }
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告
/// </summary> /// </summary>

11
IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
View File

@ -45,6 +45,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
} }
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告
/// </summary> /// </summary>

2
IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs
View File

@ -62,6 +62,8 @@ namespace IRaCIS.Core.Application.Service
/// <returns></returns> /// <returns></returns>
Task<Stream> DownLoadReadReportStream(DownLoadReadReportInDto inDto); Task<Stream> DownLoadReadReportStream(DownLoadReadReportInDto inDto);
Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto);
} }

22
IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs
View File

@ -80,5 +80,27 @@ namespace IRaCIS.Core.Application.Service
Task<string> GetVisitReadReportUrl(CaGetVisitReadReportUrl inDto); Task<string> GetVisitReadReportUrl(CaGetVisitReadReportUrl inDto);
/// <summary>
/// 下载阅片报告
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
Task<FileResult> DownLoadTumorEvaluation(DownLoadReadReportInDto inDto);
/// <summary>
/// 获取肿瘤评估流
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto);
/// <summary>
/// 获取并生成肿瘤评估URl
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
Task<string> GetTumorEvaluationReportUrl(CaGetVisitReadReportUrl inDto);
} }
} }

10
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -55,6 +55,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
} }
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告
/// </summary> /// </summary>

10
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
View File

@ -29,6 +29,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService, ILuganoCalculateService IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService, ILuganoCalculateService
{ {
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告
/// </summary> /// </summary>

11
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -28,6 +28,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
ILogger<IRECIST1Point1CalculateService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService ILogger<IRECIST1Point1CalculateService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
{ {
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告
/// </summary> /// </summary>

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

@ -52,6 +52,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
} }
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告

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

@ -1,8 +1,10 @@
using IRaCIS.Application.Contracts; 
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infra.EFCore.Common;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
@ -11,6 +13,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using MiniSoftware; using MiniSoftware;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace IRaCIS.Core.Application.Service.ReadingCalculate namespace IRaCIS.Core.Application.Service.ReadingCalculate
@ -19,6 +22,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
[ApiExplorerSettings(GroupName = "Reading")] [ApiExplorerSettings(GroupName = "Reading")]
public class RECIST1Point1CalculateService(IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository, public class RECIST1Point1CalculateService(IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
IRepository<VisitTask> _visitTaskRepository, IRepository<VisitTask> _visitTaskRepository,
IRepository<DicomInstance> _dicomInstanceRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository, IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository, IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository, IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
@ -50,55 +54,185 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
} }
///// <summary> /// <summary>
///// 获取肿瘤评估报告 /// 获取肿瘤评估报告
///// </summary> /// </summary>
///// <param name="inDto"></param> /// <param name="inDto"></param>
///// <returns></returns> /// <returns></returns>
//public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto) public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
//{ {
// var downFile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}"); var downFile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}");
// Directory.CreateDirectory(downFile); Directory.CreateDirectory(downFile);
// var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId && x.ReadingCategory == ReadingCategory.Visit) var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId && x.ReadingCategory == ReadingCategory.Visit)
// .Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); .Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
// var visitInfo = await _subjectVisitRepository.Where(x => x.Id == taskinfo.SourceSubjectVisitId).Include(x => x.StudyList).FirstNotNullAsync(); var visitInfo = await _subjectVisitRepository.Where(x => x.Id == taskinfo.SourceSubjectVisitId).Include(x => x.StudyList).FirstNotNullAsync();
// var subjectInfo = await _subjectRepository.Where(x => x.Id == taskinfo.SubjectId).Include(x=>x.Trial).Include(x => x.SubjectPatientList).FirstNotNullAsync(); var subjectInfo = await _subjectRepository.Where(x => x.Id == taskinfo.SubjectId).Include(x => x.Trial).Include(x => x.SubjectPatientList).FirstNotNullAsync();
// var subjectPatientList = await _subjectPatientRepository.Where(x => x.SubjectId == subjectInfo.Id).Include(x => x.Patient).ToListAsync(); var subjectPatientList = await _subjectPatientRepository.Where(x => x.SubjectId == subjectInfo.Id).Include(x => x.Patient).ToListAsync();
var trialQuestion = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId).ToListAsync();
var tableQuestion = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionTrial.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId).ToListAsync();
var dicotionCode = trialQuestion.Where(x => x.DictionaryCode != string.Empty).Select(x => x.DictionaryCode).Distinct().ToList();
dicotionCode.AddRange(tableQuestion.Where(x => x.DictionaryCode != string.Empty).Select(x => x.DictionaryCode).Distinct());
var dictionList = await _dictionaryRepository.Where(x => dicotionCode.Contains(x.Code)).Include(x => x.ChildList).ToListAsync();
var unitDictionary = await _dictionaryRepository.Where(x => x.Code == "ValueUnit").Include(x => x.ChildList).ToListAsync();
// var value = new Dictionary<string, object>() var relatedVisitTask = await ServiceProvider.GetService<IReadingImageTaskService>().GetRelatedVisitTask(new GetRelatedVisitTaskInDto()
// { {
// { "ResearchProgramNo" ,subjectInfo.Trial.ResearchProgramNo }, // 试验方案号 VisitTaskId = inDto.VisitTaskId
// { "SubjectName",subjectInfo.ShortName }, //患者姓名 });
// { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
var relatedTaskIds = relatedVisitTask.Item1.Select(x => x.VisitTaskId).ToList();
var answerList = await _readingTaskQuestionAnswerRepository.Where(x => relatedTaskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
var rowinfoList = await _readingTableAnswerRowInfoRepository.Where(x => relatedTaskIds.Contains(x.VisitTaskId)).Include(x => x.VisitTask).Include(x => x.ReadingQuestionTrial).ToListAsync();
var instanceIdList = rowinfoList.Select(x => x.InstanceId).ToList();
var instanceList = await _dicomInstanceRepository.Where(x => instanceIdList.Contains(x.Id)).Include(x => x.DicomSerie.DicomStudy).ToListAsync();
var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => relatedTaskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync();
var taskinfoList = await _visitTaskRepository.Where(x => relatedTaskIds.Contains(x.Id))
.Include(x => x.SourceSubjectVisit).Include(x => x.SourceSubjectVisit.StudyList)
.Include(x => x.DoctorUser).ToListAsync();
List<ExportVisitData> exportVisitDatas = taskinfoList
.Select(x => new ExportVisitData()
{
VisitName = x.SourceSubjectVisit.VisitName,
VisitNum = x.VisitTaskNum,
CheckDate = string.Join(",", x.SourceSubjectVisit.StudyList.Where(x => x.StudyTime != null).Select(x => x.StudyTime.Value.ToString("yyyy-MM-dd"))),
CheckInfoList = x.SourceSubjectVisit.StudyList.Select(x => new DicomStudyInfo()
{
BodyPartExamined = x.BodyPartExamined,
Modalities = x.Modalities
}).ToList(),
HaveNewLesion = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.NewLesions),
TargetResult = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.TargetLesion),
NoTargetResult = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.NoTargetLesion),
OverallResult = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.Tumor),
DoctorName = x.DoctorUser.LastName + x.DoctorUser.FirstName,
SignTime = x.SignTime?.ToString("yyyy-MM-dd HH:mm:ss"),
VisitTargetInfoList = getLesionInfo(LesionType.TargetLesion),
VisitNoTargetInfoList = getLesionInfo(LesionType.NonTargetLesions),
}).OrderBy(x=>x.VisitNum).ToList();
#region 两个函数
List<VisitLesionInfo> getLesionInfo(LesionType lesionType)
{
var targetFocus = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).OrderBy(x => x.RowIndex).ToList();
var targetInfo = new List<VisitLesionInfo>();
int num = 1;
foreach (var item in targetFocus)
{
VisitLesionInfo target = new VisitLesionInfo
{
RowMark = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == item.RowIndex && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowMark).FirstIsNullReturnEmpty(),
Organ = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, inDto.VisitTaskId, lesionType, QuestionMark.Organ, item.RowIndex),
Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, inDto.VisitTaskId, lesionType, QuestionMark.Part, item.RowIndex),
Number = num,
StudyCode = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.Code).FirstOrDefault(),
RowId = item.Id,
SeriesNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.SeriesNumber).FirstOrDefault(),
InstanceNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.InstanceNumber).FirstOrDefault(),
VisitLength = getStateInfo(item.VisitTaskId, item.RowIndex, lesionType),
};
targetInfo.Add(target);
num++;
}
if (lesionType == LesionType.TargetLesion)
{
for (int i = num; i <= 5; i++)
{
VisitLesionInfo target = new VisitLesionInfo
{
Number = i,
};
targetInfo.Add(target);
i++;
}
}
return targetInfo;
}
decimal getStateInfo(Guid visitTaskid, decimal item, LesionType lesionType)
{
// 非淋巴结取长径 淋巴结取长短径
var state = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.State, item);
var majorAxis = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.MajorAxis, item);
var isLymph = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.IsLymph, item);
var shortAxis = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.ShortAxis, item);
var result = string.Empty;
if (!majorAxis.IsNullOrEmpty())
{
result = majorAxis;
}
if (isLymph.EqEnum(YesOrNoOrNa.Yes) && !shortAxis.IsNullOrEmpty())
{
result = shortAxis;
}
return result.IsNullOrEmptyReturn0();
}
#endregion
var researchProgramNo = subjectInfo.Trial.ResearchProgramNo;
var subjectName = subjectInfo.ShortName;
var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty();
// { "SubjectName","" }, //患者姓名 List<ExportTumorEvaluationInfo> resultdata = new List<ExportTumorEvaluationInfo>();
// { "SubjectSex", "" }, //患者性别
// { "SubjectAge", "" }, //患者年龄 for (int i = 0; i < (int)Math.Ceiling((double)exportVisitDatas.Count() / 3); i++)
// { "SubjectCode", "" }, //患者编号 {
// { "VisitName", "" }, //访视名称 ExportTumorEvaluationInfo export = new ExportTumorEvaluationInfo
// { "LatestScanDate", "" }, //随访日期 {
// { "CriterionName", "" }, //评估标准 ResearchProgramNo = researchProgramNo,
// { "AssessmentResult", "" }, //评估结果 SubjectName = subjectName,
// { "DoctorName", "" }, //医生姓名 SubjectCode = subjectCode,
// { "SignTime", "" }, //签名时间 VisitList= exportVisitDatas.Skip(i*3).Take(3).ToList(),
// { "StudyInfo", new List<Dictionary<string, object>>() }, // 检查信息 };
// { "FirstVisit", "" }, }
// { "SecondVisit", "" },
// { "ThirdlyVisit", "" },
// { "TargetInfo", new List<Dictionary<string, object>>() }, // 靶病灶
// { "NoTargetInfo", new List<Dictionary<string, object>>() }, // 非把病灶
// { "NewTargetInfo", new List<Dictionary<string, object>>() },// 新病灶 var templatePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx");
// { "TargetImage", "" }, // 靶病灶图片 var outputFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}.docx");
// { "NoTargetImage", "" }, // 非靶病灶图片
// { "NewImage", "" }, // 新病灶图片
// { "Result", new List<Dictionary<string, object>>() }, // 评估结果 MiniWord.SaveAsByTemplate(outputFilePath, templatePath, resultdata);
// { "Curative", new List<Dictionary<string, object>>() }, // 疗效结果
// { "ReportNo", "" } ,
// }; //// 获取文件夹中的所有文件路径
//} Directory.Delete(downFile, true);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
Stream stream = _generalCalculateService.ReadAndReturnStream(outputFilePath);
return stream;
}
else
{
var pdfurl = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"wwwroot/ReadReoprtTemplate/downLoad");
FileConvertHelper.ConvertWordToPdf(outputFilePath, pdfurl);
Stream stream = _generalCalculateService.ReadAndReturnStream(pdfurl + $"/{inDto.DownLoadGuid}.pdf");
return stream;
}
}
/// <summary> /// <summary>

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

@ -51,6 +51,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}; };
} }
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告
/// </summary> /// </summary>

9
IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
View File

@ -25,6 +25,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
{ {
/// <summary>
/// 下载肿瘤评估
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<Stream> DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
{
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
}
/// <summary> /// <summary>
/// 下载阅片报告 /// 下载阅片报告

2
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -342,6 +342,8 @@ public class VisitTask : BaseFullAuditEntity
public string ReportExportUrl { get; set; } = string.Empty; public string ReportExportUrl { get; set; } = string.Empty;
public string TumorEvaluationUrl { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 是否确认提醒 /// 是否确认提醒
/// </summary> /// </summary>