修改
This commit is contained in:
@@ -314,40 +314,7 @@ namespace IRaCIS.Core.Domain.Models
|
||||
&& t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
|
||||
).Any();
|
||||
|
||||
//[NotMapped]
|
||||
public List<CrterionDictionaryGroup> CrterionDictionaryGroup
|
||||
{
|
||||
get
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
var isConverted= Subject.SubjectVisitTaskList.Where(t => (t.TrialReadingCriterionId == TrialReadingCriterionId
|
||||
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
|
||||
&& t.TaskState == TaskState.Effect &&
|
||||
t.VisitTaskNum < VisitTaskNum
|
||||
&& t.IsSelfAnalysis == IsSelfAnalysis
|
||||
&& t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
|
||||
).Any();
|
||||
|
||||
if (isConverted)
|
||||
{
|
||||
return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.Converted };
|
||||
}
|
||||
else
|
||||
{
|
||||
return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.BeforeConvert };
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
return new List<CrterionDictionaryGroup>();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user