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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-02-15 14:14:20 +08:00
parent 1f7459259b 03d5e93c55
commit 8cd5d3ba9b
4 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,6 +525,13 @@
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetTrialReadingCriterionCanExportDocumentList(System.Guid)">
<summary>
获取阅片标准可以导出的列表
</summary>
<param name="trialReadingCriterionId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetOverallTumorEvaluationList_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
整体肿瘤评估 （目前仅仅 RECIST1.1 多个标准一个接口 Excel 列是一样的 ）

62
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -1,4 +1,5 @@
using IRaCIS.Application.Contracts;
using DocumentFormat.OpenXml.Office2010.ExcelAc;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Interfaces;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Service.Reading.Dto;
@ -33,7 +34,7 @@ namespace IRaCIS.Core.Application.Service.Common
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<IActionResult> CRCVisitListExport(CRCVisitSearchDTO visitSearchDTO,
public async Task<IActionResult> CRCVisitList_Export(CRCVisitSearchDTO visitSearchDTO,
[FromServices] IRepository<CommonDocument> _commonDocumentRepository,
[FromServices] IDictionaryService _dictionaryService,
[FromServices] IRepository<SubjectVisit> _subjectVisitRepository,
@ -157,6 +158,7 @@ namespace IRaCIS.Core.Application.Service.Common
/// <param name="_commonDocumentRepository"></param>
/// <param name="_dictionaryService"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> GetSubjectReadingPeriod_Export(GetReadModuleDto dto,
[FromServices] IRepository<CommonDocument> _commonDocumentRepository,
[FromServices] IDictionaryService _dictionaryService,
@ -188,6 +190,7 @@ namespace IRaCIS.Core.Application.Service.Common
/// </summary>
/// <param name="param"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> GetReadingPeriodList_Export(ReadPeriodQuery param,
[FromServices] IRepository<CommonDocument> _commonDocumentRepository,
[FromServices] IDictionaryService _dictionaryService,
@ -613,7 +616,7 @@ namespace IRaCIS.Core.Application.Service.Common
cloneObj.AgainUserName = item.UserName;
cloneObj.AgainEvaluateResult = item.EvaluateResult;
cloneObj.ArmEnum = item.ArmEnum;
cloneObj.AgainArmEnum = item.ArmEnum;
cloneObj.IsGroupAnalysisDiffToOriginalData = cloneObj.ArmEnum == Arm.DoubleReadingArm1 ? item.IsGroupDiffArm1 : item.IsGroupDiffArm2;
@ -634,6 +637,58 @@ namespace IRaCIS.Core.Application.Service.Common
}
public class ExportDocumentDes
{
public string Code { get; set; }
public string FileName { get; set; }
public ExportCatogory ExportCatogory { get;set; }
}
public enum ExportCatogory
{
// 整体肿瘤评估
OverallTumorEvaluation =1,
//肿瘤疗效评估
EvaluationOfTumorEfficacy = 2,
//评估病灶明细
DetailedOfEvaluatedLesion = 3,
}
/// <summary>
/// 获取阅片标准可以导出的列表
/// </summary>
/// <param name="trialReadingCriterionId"></param>
/// <returns></returns>
public async Task<List<ExportDocumentDes>> GetTrialReadingCriterionCanExportDocumentList(Guid trialReadingCriterionId)
{
var list = new List<ExportDocumentDes>();
var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == trialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
if (criterionType == CriterionType.RECIST1Pointt1)
{
list.Add( new ExportDocumentDes() { Code= StaticData.Export.OverallTumorEvaluation_Export ,ExportCatogory=ExportCatogory.OverallTumorEvaluation} );
list.Add(new ExportDocumentDes() { Code = StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, ExportCatogory = ExportCatogory.EvaluationOfTumorEfficacy });
list.Add(new ExportDocumentDes() { Code = StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion });
}
var result = _repository.Where<CommonDocument>(t => list.Select(c=>c.Code).Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = c.Name }).ToList();
foreach (var item in list)
{
item.FileName = result.Where(t => t.Code == item.Code).FirstOrDefault()?.FileName;
}
return list;
}
@ -701,6 +756,7 @@ namespace IRaCIS.Core.Application.Service.Common
/// <param name="_trialRepository"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
[HttpPost]
public async Task<IActionResult> GetEvaluationOfTumorEfficacy_Export(VisitTaskQuery queryVisitTask,
[FromServices] IRepository<CommonDocument> _commonDocumentRepository,
[FromServices] IDictionaryService _dictionaryService,

2
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -626,7 +626,7 @@ namespace IRaCIS.Core.Application.Contracts
{
[DictionaryTranslateAttribute("ArmEnum")]
public Arm AgainArmEnum { get; set; }
public Arm? AgainArmEnum { get; set; }
public string AgainUserName { get; set; }

4
IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
View File

@ -113,7 +113,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
var dbSV = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == sv.SubjectVisitId)).IfNullThrowException();
// 该访视 在ETC Excel中没有任何数据
// 该访视 在EDC Excel中没有任何数据
if (etcVisitStudyList.Count == 0)
{
dialogMsg.AppendLine($"<br/>");
@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
foreach (var item in sv.StudyList)
{
num++;
dialogMsg.AppendLine($"<br>{num}.{item.StudyDate}&nbsp;&nbsp;{item.Modality} 在导入文件中不存在");
dialogMsg.AppendLine($"<br>{num}.{item.StudyDate}的{item.Modality}影像检查(EDC 缺少) ");
}
dialogMsg.AppendLine($"<br/>");