From 52ee64b679ccd0f4a2d98b1cb1d404cf2ab0e2dc Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 12 Mar 2025 11:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Common/Helper/ExamHelper.cs               | 7 +++++--
 Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs  | 2 +-
 Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Tiobon.Core.Common/Helper/ExamHelper.cs b/Tiobon.Core.Common/Helper/ExamHelper.cs
index a6ffb480..ddfe5655 100644
--- a/Tiobon.Core.Common/Helper/ExamHelper.cs
+++ b/Tiobon.Core.Common/Helper/ExamHelper.cs
@@ -74,9 +74,12 @@ public class ExamHelper
 
                     break;
                 default:
-                    var questionAnswerIds = recordAnswers.Where(x => x.ExamRecordDetailId == detail.Id && x.QuestionAnswerId != null && answerIds.Contains(x.QuestionAnswerId.Value)).Select(m => m.QuestionAnswerId).ToList();
+                    var questionAnswerIds = recordAnswers.Where(x =>
+                    x.ExamRecordDetailId == detail.Id && x.QuestionAnswerId != null &&
+                    answerIds.Contains(x.QuestionAnswerId.Value)).Select(m => m.QuestionAnswerId).ToList();
 
-                    if (questionAnswerIds.Count == answers.Where(x => x.QuestionId == detail.QuestionId).Count())
+                    if (questionAnswerIds.Count == answers.Where(x => x.QuestionId == detail.QuestionId).Count() &&
+                    answers.Where(x => x.QuestionId == detail.QuestionId).Count() == recordAnswers.Where(x => x.ExamRecordDetailId == detail.Id).Count())
                     {
                         score += exampaperQuestion?.Score;
                         detail.Score = exampaperQuestion?.Score;
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
index f4264fdb..9cbe95b6 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
@@ -1104,7 +1104,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
         #endregion
 
         record.UpdateTime = DateTime.Now;
-        await Update(record, new List<string> { "Status", "Score", "AdjustScore", "ActualEndTime", "ScoreStatus", "UpdateTime", "ExamDate" }, null, $"Id='{record.Id}'");
+        await Update(record, new List<string> { "Status", "Score", "AdjustScore", "ActualEndTime", "ScoreStatus", "UpdateTime", "ExamDate", "AnswerCount" }, null, $"Id='{record.Id}'");
 
         if (exampaper.ScoreMethod == DIC_EXAM_PAPER_SCORE_METHOD.SYSTEM)
             await Task.Factory.StartNew(async () => await DealPass(Db, studyRecordId));
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 8696a42c..c662b636 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -3,6 +3,7 @@ using NPOI.HSSF.UserModel;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
+using Org.BouncyCastle.Crypto;
 using static Tiobon.Core.DataAccess.ReportHelper;
 using static Tiobon.Core.Model.Consts;
 
@@ -1882,6 +1883,11 @@ ORDER BY {filter.orderBy}";
     #endregion
 
     #region 批量删除
+
+    public override async Task<bool> DeleteById1(object id)
+    {
+        return await DeleteByIds1([id.ObjToLong()]);
+    }
     /// <summary>
     /// 删除指定ID集合的数据(批量删除)
     /// </summary>