Compare commits

..

No commits in common. "8a24b33757215672ac1a5db6a93aa743978fe00a" and "4dfeb653b11ad8883902f983326c96b1b01efc3a" have entirely different histories.

2 changed files with 3 additions and 14 deletions

View File

@ -300,17 +300,6 @@ public static class ExcelExportHelper
{
public Guid Id { get; set; }
public string Name { get; set; }
public override bool Equals(object obj)
{
if (obj is not ColumItem other) return false;
return Id == other.Id && Name == other.Name;
}
public override int GetHashCode()
{
return HashCode.Combine(Id, Name);
}
}
public List<string> ColumnIdList => ColumnIdNameList == null ? new List<string>() : ColumnIdNameList.Select(t => t.Id.ToString()).ToList();

View File

@ -2400,7 +2400,7 @@ namespace IRaCIS.Core.Application.Service.Common
{
Id = Guid.Empty,
Name = (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.Tumor) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName
}).Distinct().ToList();
}).ToList();
@ -2413,7 +2413,7 @@ namespace IRaCIS.Core.Application.Service.Common
{
Id = Guid.Empty,
Name = (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.ImgOncology) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName
}).Distinct().ToList();
}).ToList();
}
else if (criterion.CriterionType == CriterionType.PCWG3)
@ -2422,7 +2422,7 @@ namespace IRaCIS.Core.Application.Service.Common
{
Id = Guid.Empty,
Name = t.QuestionName
}).Distinct().ToList();
}).ToList();
}