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
/// 排队号码
///
public int QueueRegisterNumber { get; set; }
+
+ ///
+ /// 人员ID
+ ///
+ public Guid PatientRegisterId { get; set; }
+
+ ///
+ /// 人员条码号
+ ///
+ 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;