diff --git a/src/Shentun.Peis.Application.Contracts/QueueRegisters/QueueRegisterByPatientRegisterIdDto.cs b/src/Shentun.Peis.Application.Contracts/QueueRegisters/QueueRegisterByPatientRegisterIdDto.cs index ef24e0f..2eed3e9 100644 --- a/src/Shentun.Peis.Application.Contracts/QueueRegisters/QueueRegisterByPatientRegisterIdDto.cs +++ b/src/Shentun.Peis.Application.Contracts/QueueRegisters/QueueRegisterByPatientRegisterIdDto.cs @@ -13,6 +13,11 @@ namespace Shentun.Peis.QueueRegisters /// public string RoomName { get; set; } + /// + /// 病人姓名 + /// + public string PatientName { get; set; } + /// /// 候诊人数 /// diff --git a/src/Shentun.Peis.Application.Contracts/QueueRegisters/YesTriageAsbitemListDto.cs b/src/Shentun.Peis.Application.Contracts/QueueRegisters/YesTriageAsbitemListDto.cs index afaa98d..0c45700 100644 --- a/src/Shentun.Peis.Application.Contracts/QueueRegisters/YesTriageAsbitemListDto.cs +++ b/src/Shentun.Peis.Application.Contracts/QueueRegisters/YesTriageAsbitemListDto.cs @@ -38,5 +38,11 @@ namespace Shentun.Peis.QueueRegisters /// 分诊人 /// public string TriageName { get; set; } + + + /// + /// 分诊时间 + /// + public string TriageTime { get; set; } } } diff --git a/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs b/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs index a88c6a8..97e4a15 100644 --- a/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs +++ b/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs @@ -527,7 +527,7 @@ namespace Shentun.Peis.LisRequests /// /// 追加项目到检验单 生成新的条码号 /// - /// RegisterAsbitem表Id/param> + /// RegisterAsbitem表Id /// [HttpPost("api/app/LisRequest/AddLisRequest")] public async Task AddLisRequestAsync(List RegisterAsbitemIds) diff --git a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs index bde9d96..a2ca324 100644 --- a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs +++ b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs @@ -76,23 +76,26 @@ namespace Shentun.Peis.QueueRegisters { var queueRegisterEnt = (from queueRegister in await _queueRegisterRepository.GetQueryableAsync() join room in await _roomRepository.GetQueryableAsync() on queueRegister.RoomId equals room.Id + join patientRegister in await _patientRegisterRepository.GetQueryableAsync() on queueRegister.PatientRegisterId equals patientRegister.Id where queueRegister.PatientRegisterId == input.PatientRegisterId && queueRegister.CreationTime >= DateTime.Now.Date orderby queueRegister.CreationTime descending select new { queueRegister, - room + room, + patientName = patientRegister.PatientName }).FirstOrDefault(); if (queueRegisterEnt != null) { var queueCount = await _queueRegisterRepository.CountAsync(c => c.RoomId == queueRegisterEnt.queueRegister.RoomId - && c.CompleteFlag == QueueRegisterCompleteFlag.Wait); + && c.CompleteFlag == QueueRegisterCompleteFlag.Wait && c.CreationTime >= DateTime.Now.Date && c.DisplayOrder < queueRegisterEnt.queueRegister.DisplayOrder); var entDto = new QueueRegisterByPatientRegisterIdDto { CompleteFlag = queueRegisterEnt.queueRegister.CompleteFlag, RoomName = queueRegisterEnt.room.DisplayName, - QueueCount = queueCount + QueueCount = queueCount, + PatientName = queueRegisterEnt.patientName }; return entDto; @@ -211,7 +214,8 @@ namespace Shentun.Peis.QueueRegisters AsbitemName = asbitem.DisplayName, CompleteFlag = queueRegister.CompleteFlag, RoomName = room.DisplayName, - TriageName = _cacheService.GetSurnameAsync(queueRegister.CreatorId).Result + TriageName = _cacheService.GetSurnameAsync(queueRegister.CreatorId).Result, + TriageTime = queueRegister.CreationTime.ToString("HH:mm:ss") }).ToList();