Uat_Study
parent
011189564a
commit
432a2bca21
|
@ -314,7 +314,7 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
&& t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
|
&& t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
|
||||||
).Any();
|
).Any();
|
||||||
|
|
||||||
[NotMapped]
|
//[NotMapped]
|
||||||
public List<CrterionDictionaryGroup> CrterionDictionaryGroup
|
public List<CrterionDictionaryGroup> CrterionDictionaryGroup
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
@ -322,7 +322,16 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (this.IsConvertedTask)
|
|
||||||
|
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 };
|
return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.Converted };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue