From d05bbf081d96b26e3d57a813a676a73a32840169 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 13 Mar 2026 16:21:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E6=97=A7=E5=8D=A1?=
 =?UTF-8?q?=E5=8F=B7=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ElevatorAcsDeviceTaskToDeviceByDeviceResponse.cs     | 5 +++++
 .../Services/Implements/AssignmentService.cs             | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/ElevatorAcsDeviceTaskToDeviceByDeviceResponse.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/ElevatorAcsDeviceTaskToDeviceByDeviceResponse.cs
index f4ef8dc9..0708c60f 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/ElevatorAcsDeviceTaskToDeviceByDeviceResponse.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/ElevatorAcsDeviceTaskToDeviceByDeviceResponse.cs
@@ -10,6 +10,11 @@ public class ElevatorAcsDeviceTaskToDeviceByDeviceResponse
 
     public string CardNo { get; set; }
 
+    /// <summary>
+    /// 老卡号,换卡时才有值
+    /// </summary>
+    public string OldCardNo { get; set; }
+
     public List<long> TaskIds { get; set; }
 
     public List<int> FloorAcsValues { get; set; }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
index 540f6962..b73e388b 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
@@ -271,11 +271,20 @@ public class AssignmentService : IAssignmentService
             .Select(x => new { UserId = x.Id, UserCode = x.Code, UserName = x.Name, x.CardNo })
             .FirstAsync();
 
+        var oldCardNo = await _dbContext.Queryable<GainfoCardRecordEntity>()
+                .Where(x => x.UserNo == userInfo.UserCode)
+                .Where(x => x.CardNo != userInfo.CardNo)
+                .Where(x => SqlFunc.Subqueryable<GainfoEntity>().Where(p => !string.IsNullOrEmpty(p.CardNo) && p.CardNo == x.CardNo).NotAny())
+                .OrderByDescending(x => x.Id)
+                .Select(x => x.CardNo)
+                .FirstAsync();
+
         return new ElevatorAcsDeviceTaskToDeviceByDeviceResponse
         {
             DeviceUniqueNo = deviceUniqueNo,
             UserId = userInfo.UserId,
             UserCode = userInfo.UserCode,
+            OldCardNo = oldCardNo,
             CardNo = userInfo.CardNo,
             UserName = userInfo.UserName,
             FloorAcsValues = floorAcsValues,