From 7f4e111f7d50fb76a6a1fae1f41e0183c68e7017 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Sun, 7 Apr 2024 14:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 1 + .../Service/QC/DTO/QCListViewModel.cs | 6 ++++-- IRaCIS.Core.Application/Service/QC/_MapConfig.cs | 11 ++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 6ccb8d139..d04754b20 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1369,6 +1369,7 @@ namespace IRaCIS.Core.Application.Service.Common var clone = c.Clone(); clone.LessionCode = u.LessionCode; clone.LessionType = u.LessionType; + clone.BeforeTranslateLessionTypeValue = u.LessionType; clone.IsLymph = u.IsLymph; diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 99da29c06..77fe44405 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -977,7 +977,7 @@ namespace IRaCIS.Core.Application.Contracts //病灶类型 public string LessionType { get; set; } - + public string BeforeTranslateLessionTypeValue { get; set; } //是否淋巴结 [DictionaryTranslateAttribute("IsLymph")] @@ -1002,7 +1002,9 @@ namespace IRaCIS.Core.Application.Contracts //短径 public string ShortDiameter { get; set; } - [DictionaryTranslateAttribute("TargetState")] + [DictionaryTranslateAttribute("TargetState", nameof(RECIST1Point1DetailedOfEvaluatedLesionExport.BeforeTranslateLessionTypeValue), "0")] + [DictionaryTranslateAttribute("NoTargetState", nameof(RECIST1Point1DetailedOfEvaluatedLesionExport.BeforeTranslateLessionTypeValue), "1")] + [DictionaryTranslateAttribute("NewLesionState", nameof(RECIST1Point1DetailedOfEvaluatedLesionExport.BeforeTranslateLessionTypeValue), "2")] //病灶状态 public string LessionState { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index a6b198f4a..ff6418185 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -206,17 +206,18 @@ namespace IRaCIS.Core.Application.Service //位置可能是自己填写的 .ForMember(o => o.LessionLocation, t => //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer) - t.MapFrom(u => u.OrganInfo.IsCanEditPosition? - u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault()!.Answer: isEn_Us ? u.OrganInfo.TULATEN : u.OrganInfo.TULAT) + t.MapFrom(u => isEn_Us ? u.OrganInfo.PartEN : u.OrganInfo.Part) + ) .ForMember(o => o.LessionOrgan, t => //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Organ).FirstOrDefault().Answer) t.MapFrom(u => isEn_Us ? u.OrganInfo.TULOCEN : u.OrganInfo.TULOC) ) .ForMember(o => o.BodyPartDescription, t => - //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer) - t.MapFrom(u => isEn_Us? u.OrganInfo.PartEN : u.OrganInfo.Part) - + //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer) + t.MapFrom(u => u.OrganInfo.IsCanEditPosition ? + u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault()!.Answer : isEn_Us ? u.OrganInfo.TULATEN : u.OrganInfo.TULAT) + ) //.ForMember(o => o.MeasurementResult, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer))