From 594df1086262c3d71253db682dd0777478ce195d Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 7 Aug 2024 12:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetQueueRegisterListByRoomIdDto.cs          | 10 ++++++++++
 .../QueueRegisters/QueueRegisterAppService.cs   | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/QueueRegisters/GetQueueRegisterListByRoomIdDto.cs b/src/Shentun.Peis.Application.Contracts/QueueRegisters/GetQueueRegisterListByRoomIdDto.cs
index 2f776a1..779b12d 100644
--- a/src/Shentun.Peis.Application.Contracts/QueueRegisters/GetQueueRegisterListByRoomIdDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/QueueRegisters/GetQueueRegisterListByRoomIdDto.cs
@@ -47,5 +47,15 @@ namespace Shentun.Peis.QueueRegisters
         /// 排队号码
         /// </summary>
         public int QueueRegisterNumber { get; set; }
+
+        /// <summary>
+        /// 人员ID
+        /// </summary>
+        public Guid PatientRegisterId { get; set; }
+
+        /// <summary>
+        /// 人员条码号
+        /// </summary>
+        public string PatientRegisterNo { get; set; }
     }
 }
diff --git a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
index a2ca324..ec588c7 100644
--- a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
@@ -353,6 +353,7 @@ namespace Shentun.Peis.QueueRegisters
                             queueRegisterId = queueRegister.Id,
                             queueRegisterNumber = queueRegister.DisplayOrder,
                             patientRegisterId = queueRegister.PatientRegisterId,
+                            patientRegisterNo = patientRegister.PatientRegisterNo,
                             roomId = queueRegister.RoomId,
                             asbitemId = roomDetail.AsbitemId,
                             lastModificationTime = queueRegister.LastModificationTime,
@@ -390,7 +391,9 @@ namespace Shentun.Peis.QueueRegisters
                 isVip = s.FirstOrDefault().isVip,
                 queueRegisterId = s.Key,
                 queueRegisterNumber = s.FirstOrDefault().queueRegisterNumber,
-                lastModificationTime = s.FirstOrDefault().lastModificationTime
+                lastModificationTime = s.FirstOrDefault().lastModificationTime,
+                patientRegisterId = s.FirstOrDefault().patientRegisterId,
+                patientRegisterNo = s.FirstOrDefault().patientRegisterNo,
             }).ToList();
 
 
@@ -400,7 +403,9 @@ namespace Shentun.Peis.QueueRegisters
                     IsVip = s.isVip,
                     PatientName = s.patientName,
                     QueueRegisterId = s.queueRegisterId,
-                    QueueRegisterNumber = s.queueRegisterNumber
+                    QueueRegisterNumber = s.queueRegisterNumber,
+                    PatientRegisterId = s.patientRegisterId,
+                    PatientRegisterNo = s.patientRegisterNo
                 }).ToList();
 
             entDto.AlreadyCalledDetail = roomGroup.Where(m => m.completeFlag == QueueRegisterCompleteFlag.AlreadyCalled).OrderByDescending(o => o.lastModificationTime)
@@ -409,7 +414,9 @@ namespace Shentun.Peis.QueueRegisters
                     IsVip = s.isVip,
                     PatientName = s.patientName,
                     QueueRegisterId = s.queueRegisterId,
-                    QueueRegisterNumber = s.queueRegisterNumber
+                    QueueRegisterNumber = s.queueRegisterNumber,
+                    PatientRegisterId = s.patientRegisterId,
+                    PatientRegisterNo = s.patientRegisterNo
                 }).ToList();
 
             entDto.OverNumberDetail = roomGroup.Where(m => m.completeFlag == QueueRegisterCompleteFlag.OverNumber).OrderByDescending(o => o.lastModificationTime)
@@ -418,7 +425,9 @@ namespace Shentun.Peis.QueueRegisters
                     IsVip = s.isVip,
                     PatientName = s.patientName,
                     QueueRegisterId = s.queueRegisterId,
-                    QueueRegisterNumber = s.queueRegisterNumber
+                    QueueRegisterNumber = s.queueRegisterNumber,
+                    PatientRegisterId = s.patientRegisterId,
+                    PatientRegisterNo = s.patientRegisterNo
                 }).ToList();
 
             return entDto;