修改
This commit is contained in:
+19
-11
@@ -181,20 +181,28 @@ namespace IRaCIS.Application.Services
|
||||
|
||||
}).ToList();
|
||||
|
||||
x.AgreeOrNot = new List<GlobalQuestionInfo>()
|
||||
if (criterionType != CriterionType.PCWG3)
|
||||
{
|
||||
new GlobalQuestionInfo()
|
||||
{
|
||||
Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? string.Empty,
|
||||
QuestionName = "",
|
||||
Type = "input",
|
||||
GlobalAnswerType=GlobalAnswerType.AgreeOrNot,
|
||||
GlobalReadingShowType= GlobalReadingShowType.AllShow,
|
||||
}
|
||||
x.AgreeOrNot = new List<GlobalQuestionInfo>()
|
||||
{
|
||||
new GlobalQuestionInfo()
|
||||
{
|
||||
Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? string.Empty,
|
||||
QuestionName = "",
|
||||
Type = "input",
|
||||
GlobalAnswerType=GlobalAnswerType.AgreeOrNot,
|
||||
GlobalReadingShowType= GlobalReadingShowType.AllShow,
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
x.AgreeOrNot = new List<GlobalQuestionInfo>() { };
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
List<GetGlobalQuestionType> questionTypes = new List<GetGlobalQuestionType>()
|
||||
{
|
||||
|
||||
@@ -1205,7 +1205,7 @@ namespace IRaCIS.Application.Services
|
||||
BlindName = rowInfo.BlindName,
|
||||
IsDicomReading = rowInfo.IsDicomReading,
|
||||
IsCurrentTaskAdd = isCurrentTaskAdd,
|
||||
FristAddTaskNum = rowInfo.FristAddTaskNum,
|
||||
|
||||
OrganInfoId=rowInfo.OrganInfoId,
|
||||
PicturePath = rowInfo.PicturePath,
|
||||
NumberOfFrames=rowInfo.NumberOfFrames,
|
||||
|
||||
Reference in New Issue
Block a user