合并问题
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
4b0d6fe8b9
commit
f192219621
|
@ -1619,8 +1619,6 @@ namespace IRaCIS.Core.Application.Service.Common
|
||||||
|
|
||||||
exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
|
exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
|
||||||
|
|
||||||
exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
|
|
||||||
|
|
||||||
if (inQuery.IsRandomOrderList == true)
|
if (inQuery.IsRandomOrderList == true)
|
||||||
{
|
{
|
||||||
list = list.OrderBy(t => t.RandomOrder).ToList();
|
list = list.OrderBy(t => t.RandomOrder).ToList();
|
||||||
|
|
|
@ -3867,15 +3867,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
{
|
{
|
||||||
extraIdentification = "/Nontumorous";
|
extraIdentification = "/Nontumorous";
|
||||||
}
|
}
|
||||||
|
|
||||||
string extraIdentification = string.Empty;
|
|
||||||
|
|
||||||
var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x => x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
|
|
||||||
if (readingQuestion.ReadingQuestionCriterionTrial.CriterionGroup == CriterionGroup.Nontumorous)
|
|
||||||
{
|
|
||||||
extraIdentification = "/Nontumorous";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (readingQuestion.ReadingQuestionCriterionTrial.CriterionType == CriterionType.SelfDefine)
|
if (readingQuestion.ReadingQuestionCriterionTrial.CriterionType == CriterionType.SelfDefine)
|
||||||
{
|
{
|
||||||
extraIdentification = "/SelfDefine";
|
extraIdentification = "/SelfDefine";
|
||||||
|
|
Loading…
Reference in New Issue