diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs index ea0f2f3e..e8c45839 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs @@ -118,5 +118,6 @@ public class Ghre_StudyRecordESS public long? FeedbackOrderId { get; set; } public bool? IsRequireStudy { get; set; } = true; + public string StudyFinishedRule { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index ac7de56f..210e813b 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -920,7 +920,7 @@ public class Ghre_StudyRecordServices : BaseServices dt || dt > x.ExamEndDate)) x.DisableExamBtn = true; + if (x.StudyFinishedRule == DIC_EXAM_STUDY_FINISHED_RULE.NO_STUDY_EXAM_PASS) + x.DisableExamBtn = false; + if (x.FeedbackOrderId.IsNull()) x.ShowFeedbackBtn = false;