From 8ae0ae96e373e445c5ba38fefd1ac639bb22330c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 09:42:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=A0=B8=E6=9F=A5=E8=AF=9D=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/ExcelExportService.cs | 2 +- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 2 +- .../_MediatR/Handlers/ConsistencyVerificationHandler.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 59371f6d9..24a25329f 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -613,7 +613,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; diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 59444cbb8..9514c6324 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -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; } diff --git a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs index 55b056bcf..56c2464c4 100644 --- a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs +++ b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs @@ -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($"
"); @@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers foreach (var item in sv.StudyList) { num++; - dialogMsg.AppendLine($"
{num}.{item.StudyDate}  {item.Modality} 在导入文件中不存在"); + dialogMsg.AppendLine($"
{num}.{item.StudyDate}的{item.Modality}影像检查(EDC 缺少) "); } dialogMsg.AppendLine($"
"); From cf0bf46f7e9967b54c41b7bb8a500172cb314d11 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 11:14:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 7 ++++ .../Service/Common/ExcelExportService.cs | 33 ++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 90e23482e..285f89791 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -525,6 +525,13 @@ + + + 获取阅片标准可以导出的列表 + + + + 整体肿瘤评估 （目前仅仅 RECIST1.1 多个标准一个接口 Excel 列是一样的 ） diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 24a25329f..981fed1c8 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -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; @@ -634,6 +635,36 @@ namespace IRaCIS.Core.Application.Service.Common } + public class ExportDocumentDes + { + public string Code { get; set; } + + public string FileName { get; set; } + } + + /// + /// 获取阅片标准可以导出的列表 + /// + /// + /// + public async Task> GetTrialReadingCriterionCanExportDocumentList(Guid trialReadingCriterionId) + { + + var list = new List(); + var criterionType = await _repository.Where(t => t.Id == trialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync(); + + if (criterionType == CriterionType.RECIST1Pointt1) + { + list.Add(StaticData.Export.OverallTumorEvaluation_Export); + list.Add(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export); + list.Add(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export); + } + + var result = _repository.Where(t => list.Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = c.Name }).ToList(); + + return result; + + } From a4396c07d99cf6563431faca8d246fe2ddb45a48 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 11:40:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 981fed1c8..7ca77e695 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -640,6 +640,23 @@ namespace IRaCIS.Core.Application.Service.Common public string Code { get; set; } public string FileName { get; set; } + + public ExportCatogory ExportCatogory { get;set; } + } + + + public enum ExportCatogory + { + // 整体肿瘤评估 + OverallTumorEvaluation =1, + + //肿瘤疗效评估 + EvaluationOfTumorEfficacy = 2, + + //评估病灶明细 + DetailedOfEvaluatedLesion = 3, + + } /// @@ -650,19 +667,24 @@ namespace IRaCIS.Core.Application.Service.Common public async Task> GetTrialReadingCriterionCanExportDocumentList(Guid trialReadingCriterionId) { - var list = new List(); + var list = new List(); var criterionType = await _repository.Where(t => t.Id == trialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync(); if (criterionType == CriterionType.RECIST1Pointt1) { - list.Add(StaticData.Export.OverallTumorEvaluation_Export); - list.Add(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export); - list.Add(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export); + 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(t => list.Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = c.Name }).ToList(); + var result = _repository.Where(t => list.Select(c=>c.Code).Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = c.Name }).ToList(); - return result; + foreach (var item in list) + { + item.FileName = result.Where(t => t.Code == item.Code).FirstOrDefault()?.FileName; + } + + return list; } From 91c2425ff838d45b6c68c11a3d6da55cd179943e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 13:34:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/ExcelExportService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 7ca77e695..493d93e42 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -754,6 +754,7 @@ namespace IRaCIS.Core.Application.Service.Common /// /// /// + [HttpPost] public async Task GetEvaluationOfTumorEfficacy_Export(VisitTaskQuery queryVisitTask, [FromServices] IRepository _commonDocumentRepository, [FromServices] IDictionaryService _dictionaryService, From 03d5e93c55f34f0eff65dbc044ce8799a8c375a1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 14:02:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/ExcelExportService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 493d93e42..6382d5498 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.Service.Common /// [HttpPost] [AllowAnonymous] - public async Task CRCVisitListExport(CRCVisitSearchDTO visitSearchDTO, + public async Task CRCVisitList_Export(CRCVisitSearchDTO visitSearchDTO, [FromServices] IRepository _commonDocumentRepository, [FromServices] IDictionaryService _dictionaryService, [FromServices] IRepository _subjectVisitRepository, @@ -158,6 +158,7 @@ namespace IRaCIS.Core.Application.Service.Common /// /// /// + [HttpPost] public async Task GetSubjectReadingPeriod_Export(GetReadModuleDto dto, [FromServices] IRepository _commonDocumentRepository, [FromServices] IDictionaryService _dictionaryService, @@ -189,6 +190,7 @@ namespace IRaCIS.Core.Application.Service.Common /// /// /// + [HttpPost] public async Task GetReadingPeriodList_Export(ReadPeriodQuery param, [FromServices] IRepository _commonDocumentRepository, [FromServices] IDictionaryService _dictionaryService,