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

修改导表

Uat_Study
hang 2023-02-23 08:55:09 +08:00
parent e3519d47a6
commit 4e4336c461
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -868,7 +868,7 @@ namespace IRaCIS.Core.Application.Service.Common
//每次查询必须是单标准的 //每次查询必须是单标准的
var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync(); var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(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("当前标准导出还未支持"); throw new Exception("当前标准导出还未支持");
} }
@ -1055,7 +1055,7 @@ namespace IRaCIS.Core.Application.Service.Common
clone.LessionCode = u.LessionCode; clone.LessionCode = u.LessionCode;
clone.LessionType = u.LessionType; clone.LessionType = u.LessionType;
clone.LessionOrgan = u.LessionOrgan;
clone.LessionLocation = u.LessionLocation; clone.LessionLocation = u.LessionLocation;
clone.BodyPartDescription = u.BodyPartDescription; clone.BodyPartDescription = u.BodyPartDescription;

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

@ -784,6 +784,10 @@ namespace IRaCIS.Core.Application.Contracts
//所在部位 //所在部位
public string LessionLocation { get; set; } public string LessionLocation { get; set; }
//所在器官
[DictionaryTranslate("OrganType")]
public string LessionOrgan { get; set; }
//部位描述 //部位描述
public string BodyPartDescription { get; set; } public string BodyPartDescription { get; set; }
@ -811,6 +815,10 @@ namespace IRaCIS.Core.Application.Contracts
//所在部位 //所在部位
public string LessionLocation { get; set; } public string LessionLocation { get; set; }
//所在器官
public string LessionOrgan { get; set; }
//部位描述 //部位描述
public string BodyPartDescription { 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 LessionOrgan { get; set; }
//部位描述 //部位描述
public string BodyPartDescription { get; set; } public string BodyPartDescription { get; set; }

8
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Service
) )
.ForMember(o => o.LessionOrgan, t => .ForMember(o => o.LessionOrgan, t =>
//t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Organ).FirstOrDefault().Answer) //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 => .ForMember(o => o.BodyPartDescription, t =>
//t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer) //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 ? 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) 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 => .ForMember(o => o.BodyPartDescription, t =>
//t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer) //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 => isEn_Us ? u.OrganInfo.PartEN : u.OrganInfo.Part)