diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index e146f52c8..f11c1996e 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -868,7 +868,7 @@ namespace IRaCIS.Core.Application.Service.Common //每次查询必须是单标准的 var criterion = await _repository.Where(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync(); - if (criterion.CriterionType != CriterionType.RECIST1Pointt1 || criterion.CriterionType != CriterionType.PCWG3) + if (criterion.CriterionType != CriterionType.RECIST1Pointt1 && criterion.CriterionType != CriterionType.PCWG3) { throw new Exception("当前标准导出还未支持"); } @@ -1055,7 +1055,7 @@ namespace IRaCIS.Core.Application.Service.Common clone.LessionCode = u.LessionCode; clone.LessionType = u.LessionType; - + clone.LessionOrgan = u.LessionOrgan; clone.LessionLocation = u.LessionLocation; clone.BodyPartDescription = u.BodyPartDescription; diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 6a45b247f..3635d4e38 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -784,6 +784,10 @@ namespace IRaCIS.Core.Application.Contracts //所在部位 public string LessionLocation { get; set; } + //所在器官 + [DictionaryTranslate("OrganType")] + public string LessionOrgan { get; set; } + //部位描述 public string BodyPartDescription { get; set; } @@ -811,6 +815,10 @@ namespace IRaCIS.Core.Application.Contracts //所在部位 public string LessionLocation { get; set; } + //所在器官 + + public string LessionOrgan { get; set; } + //部位描述 public string BodyPartDescription { get; set; } @@ -849,7 +857,7 @@ namespace IRaCIS.Core.Application.Contracts //所在器官 - [DictionaryTranslate("OrganType")] + public string LessionOrgan { get; set; } //部位描述 public string BodyPartDescription { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index 7aad40019..01c259078 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Service ) .ForMember(o => o.LessionOrgan, t => //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Organ).FirstOrDefault().Answer) - t.MapFrom(u => isEn_Us ? (int?)u.OrganInfo.OrganType : (int?) u.OrganInfo.OrganType) + 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) @@ -233,7 +233,11 @@ namespace IRaCIS.Core.Application.Service 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.LessionOrgan, t => + 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)