From c303f6677bd7a4c7b0f800b781865de101c40b04 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 13 Jan 2025 11:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/DTO/InternationalizationViewModel.cs | 2 ++ .../Service/Common/ExcelExportService.cs | 8 ++------ .../Service/Common/InternationalizationService.cs | 5 ++++- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 7 +++++-- IRaCIS.Core.Application/Service/QC/_MapConfig.cs | 8 +++++--- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs index 86c3a9e6b..76722ca91 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs @@ -110,6 +110,8 @@ namespace IRaCIS.Core.Application.ViewModel public string Module { get; set; } = string.Empty; + public int? State { get; set; } + } public class BatchAddInternationalizationDto : BatchInternationalizationDto diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 46948b9c0..d51e51d19 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -2265,7 +2265,7 @@ namespace IRaCIS.Core.Application.Service.Common //阅片结果表 export_Template = StaticData.Export.CommonReading_Export; } - + else if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export) { //OCT @@ -2415,7 +2415,7 @@ namespace IRaCIS.Core.Application.Service.Common //通过问题标识取并集 - var dynamicTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct(); + var dynamicTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct().ToList(); //最终的病灶列表 要把裁判的也要加进去，需要处理裁判标记 list = new List(); @@ -2426,18 +2426,14 @@ namespace IRaCIS.Core.Application.Service.Common { foreach (var lession in item.LesionList.OrderBy(t => t.LessionType).ThenBy(t => t.LessionCode)) { - var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode }); - //有三部分组成 外层问题+ 没有配置病灶编号和类型+ 动态的表格问题 var dynamicLessionInfoList = item.QuestionAnswerList.Union(dynamicPartialLessionInfoList).ToList(); - var cloneItem = item.Clone(); cloneItem.QuestionAnswerList = dynamicLessionInfoList; list.Add(cloneItem); - } } else diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs index 2aaa66db6..809aa0dd0 100644 --- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs +++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs @@ -73,11 +73,14 @@ namespace IRaCIS.Core.Application.Service } else { + + var frontState = item.State == null ? 0 : (int)item.State; + var mapItem = _mapper.Map(item); mapItem.InternationalizationType = 0; // 0 是预翻译 1是已确认 2是后端废弃 - mapItem.State = 0; + mapItem.State = frontState; find = await _internationalizationRepository.AddAsync(mapItem); } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 2f24ecf3c..58f5c0a80 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1230,9 +1230,12 @@ namespace IRaCIS.Core.Application.Contracts #region CDISC_阅片结果表 - public string TrialCode { get; set; } + public string ResearchProgramNo { get; set; } = string.Empty; - public string TrialSiteSubjectCode => TrialCode + SubjectCode; + public string VisitName { get; set; } + + + public string TrialSiteSubjectCode => ResearchProgramNo + SubjectCode; //最晚拍片日期 public DateTime? LatestScanDate { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index 0800d8851..42104e360 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -265,7 +265,8 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.SubjectCriterionReadingPeriodVisitNumList, t => t.MapFrom(u => u.Subject.ReadModuleList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading).Select(c => c.SubjectVisit.VisitNum))) - .ForMember(o => o.TrialCode, t => t.MapFrom(u => u.Trial.TrialCode)) + .ForMember(o => o.ResearchProgramNo, t => t.MapFrom(u => u.Trial.ResearchProgramNo)) + .ForMember(o => o.VisitName, t => t.MapFrom(u => u.SourceSubjectVisit.VisitName)) .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode)) .ForMember(o => o.LatestScanDate, t => t.MapFrom(u => u.SourceSubjectVisit.LatestScanDate)) .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code)) @@ -283,8 +284,9 @@ namespace IRaCIS.Core.Application.Service }))) ; - CreateMap().IncludeBase() - .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList)); + CreateMap() + .IncludeBase() + .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList.Where(c => c.ReadingQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString())))); CreateMap() .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark))