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

修改导表bug

Uat_Study
hang 2023-02-23 15:21:50 +08:00
parent 18c81854d0
commit 0f55406cef
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IRaCIS.Core.Application/Helper/Attribute/DictionaryTranslateAttribute.cs
View File

@ -51,5 +51,18 @@ namespace IRaCIS.Core.Application.Helper
DependPropertyValueStr = dependPropertyValueStr; DependPropertyValueStr = dependPropertyValueStr;
} }
public DictionaryTranslateAttribute(string dicParentCode, CriterionType criterionType, string dependPropertyName, string dependPropertyValueStr)
{
DicParentCode = dicParentCode;
DependPropertyName = dependPropertyName;
CriterionType = criterionType;
DependPropertyValueStr = dependPropertyValueStr;
}
} }
} }

2
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.ViewModel
public bool? IsShowByTrialConfig { get; set; } public bool? IsShowByTrialConfig { get; set; }
public string ByTrialConfig { get; set; } = string.Empty; public string TrialConfigRelyFieldName { get; set; } = string.Empty;
/// <summary> /// <summary>

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

@ -795,15 +795,17 @@ namespace IRaCIS.Core.Application.Contracts
public decimal VisitTaskNum { get; set; } public decimal VisitTaskNum { get; set; }
public bool? IsBaseline { get; set; }
[DictionaryTranslateAttribute("ArmEnum")] [DictionaryTranslateAttribute("ArmEnum")]
public Arm ArmEnum { get; set; } public Arm ArmEnum { get; set; }
public string UserName { get; set; } public string UserName { get; set; }
//public CriterionType CriterionType { get; set; } [DictionaryTranslateAttribute("ExistDisease", CriterionType.RECIST1Pointt1, nameof(OverallTumorEvaluationExport.IsBaseline), "true")]
[DictionaryTranslateAttribute("OverallAssessment", CriterionType.RECIST1Pointt1, nameof(OverallTumorEvaluationExport.IsBaseline), "false")]
[DictionaryTranslateAttribute("OverallAssessment", CriterionType.RECIST1Pointt1)]
[DictionaryTranslateAttribute("VisitTumorEvaluation", CriterionType.PCWG3)] [DictionaryTranslateAttribute("VisitTumorEvaluation", CriterionType.PCWG3)]
//整体肿瘤评估结果 需要翻译 //整体肿瘤评估结果 需要翻译
public string OverallTumorEvaluationResult { get; set; } public string OverallTumorEvaluationResult { get; set; }

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

@ -167,10 +167,11 @@ namespace IRaCIS.Core.Application.Service
CriterionType? criterionType = null; CriterionType? criterionType = null;
CreateMap<VisitTask, OverallTumorEvaluationExport>() CreateMap<VisitTask, OverallTumorEvaluationExport>()
// .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName)) // .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
//.ForMember(o => o.CriterionType, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionType)) .ForMember(o => o.IsBaseline, t => t.MapFrom(u => u.SourceSubjectVisit.IsBaseLine))
.ForMember(o => o.OverallTumorEvaluationResult, t => t.MapFrom(u => .ForMember(o => o.OverallTumorEvaluationResult, t => t.MapFrom(u =>
criterionType == CriterionType.RECIST1Pointt1 ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault().Answer criterionType == CriterionType.RECIST1Pointt1 ?( u.SourceSubjectVisit.IsBaseLine==true ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).FirstOrDefault().Answer:
u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault().Answer)
: criterionType == CriterionType.PCWG3 ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstOrDefault().Answer : String.Empty : criterionType == CriterionType.PCWG3 ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstOrDefault().Answer : String.Empty
)) ))