Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC
continuous-integration/drone/push Build is passing
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -169,6 +169,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
/// <param name="item"></param>
|
||||
/// <param name="questions"></param>
|
||||
/// <param name="tableQuestions"></param>
|
||||
/// <param name="answers"></param>
|
||||
/// <param name="tableAnswers"></param>
|
||||
public void FindChildQuestion(ClinicalQuestionPreviewDto item, List<ClinicalQuestionPreviewDto> questions, List<ClinicalTablePreviewDto> tableQuestions,List<ClinicalFormQuestionAnswer> answers, List<ClinicalFormTableQuestionAnswer> tableAnswers)
|
||||
{
|
||||
item.Childrens = questions.Where(x => (x.ParentId == item.Id)||(x.GroupId== item.Id&&x.ParentId==null)).OrderBy(x => x.ShowOrder).ToList();
|
||||
|
||||
@@ -485,11 +485,12 @@ namespace IRaCIS.Application.Services
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 验证计算关系
|
||||
/// 验证计算关系
|
||||
/// </summary>
|
||||
/// <param name="relationList"></param>
|
||||
/// <param name="QuestionId"></param>
|
||||
/// <param name="originalId"></param>
|
||||
/// <param name="count"></param>
|
||||
/// <exception cref="BusinessValidationFailedException"></exception>
|
||||
private void VerifyCalculateRelation(List<CalculateRelationDto> relationList,Guid QuestionId,Guid originalId,int count=1)
|
||||
{
|
||||
|
||||
+10
-1
@@ -737,6 +737,8 @@ namespace IRaCIS.Application.Services
|
||||
/// </summary>
|
||||
/// <param name="trialReadingCriterionId"></param>
|
||||
/// <param name="visitTaskId"></param>
|
||||
/// <param name="questionClassify"></param>
|
||||
/// <param name="groupClassifyList"></param>
|
||||
/// <returns></returns>
|
||||
[NonDynamicMethod]
|
||||
public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify, List<GroupClassify>? groupClassifyList)
|
||||
@@ -1188,11 +1190,18 @@ namespace IRaCIS.Application.Services
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取子元素
|
||||
/// 获取子元素
|
||||
/// </summary>
|
||||
/// <param name="item"></param>
|
||||
/// <param name="questionlists"></param>
|
||||
/// <param name="tableQuestionLists"></param>
|
||||
/// <param name="tableAnswers"></param>
|
||||
/// <param name="tableAnsweRowInfos"></param>
|
||||
/// <param name="organInfos"></param>
|
||||
/// <param name="baseLineTableAnswer"></param>
|
||||
/// <param name="isFirstChangeTask"></param>
|
||||
/// <param name="lastTaskTableAnswer"></param>
|
||||
/// <param name="TaskId"></param>
|
||||
private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer,bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer,Guid? TaskId)
|
||||
{
|
||||
item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (x.GroupId == item.Id && x.ParentId == null)).ToList();
|
||||
|
||||
Reference in New Issue
Block a user