From 92ac1c6cae8ce7f08a0d618936b11e4d91f9358e Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 14 Aug 2024 18:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BA=BA=E7=9A=84=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=BB=BC=E5=90=88=E5=AD=A6=E4=B9=A0=E3=80=81?=
 =?UTF-8?q?=E8=80=83=E8=AF=95=E3=80=81=E5=8F=8D=E9=A6=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index c244464d..1ca07829 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -211,7 +211,7 @@ namespace Tiobon.Core.Services
                                A.ExamDateType,
                                A.AfterHowLong,
                                A.StudyProgress,
-                               A.ExamId
+                               A.ExamId,A.ExamStatus
                         FROM Ghre_StudyRecord_V A";
 
             string conditions = $" WHERE UserId={App.User.ID} ";
@@ -330,9 +330,13 @@ namespace Tiobon.Core.Services
                     x.ShowFeedbackBtn = false;
 
                 #region 处理学习进度
+
+                if(x.ExamId.IsNull())
+                    x.ShowExamBtn = false;
+
                 if (!x.ExamId.IsNull() && x.FeedbackOrderId.IsNull())
                 {
-                    if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.WAIT)
+                    if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.WAIT || x.ExamStatus.IsNull())
                         x.StudyProgress = x.StudyProgress / 2;
                     else if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.EXAMING)
                         x.StudyProgress = 75;