From 77228d50347617225dcb6cc72e8a5c521812aeb3 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Wed, 17 Jul 2024 17:38:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintReports/PrintReportAppService.cs | 37 ++++++++++++------- .../PrintReports/LisRequestReportDto.cs | 5 +++ .../PrintReports/PacsNoReportDto.cs | 5 +++ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index 549dff1..9bd520e 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -362,7 +362,8 @@ namespace Shentun.Peis.PrintReports SignInOrder = o.lisRequest.SignInOrder, SignInPerson = o.lisRequest.SignInPerson, SignInTime = o.lisRequest.SignInTime, - SampleGroupName = o.sampleGroupName + SampleGroupName = o.sampleGroupName, + MobileTelephone = o.patient.MobileTelephone }).ToList(); var entlist = lisRequestReportDtoList.GroupBy(g => new @@ -385,7 +386,8 @@ namespace Shentun.Peis.PrintReports g.SamplingTime, g.SignInOrder, g.SignInPerson, - g.SignInTime + g.SignInTime, + g.MobileTelephone }) .Select(s => new LisRequestReportDto { @@ -409,7 +411,8 @@ namespace Shentun.Peis.PrintReports SignInOrder = s.Key.SignInOrder, SignInPerson = s.Key.SignInPerson, SignInTime = s.Key.SignInTime, - SampleGroupName = s.FirstOrDefault().SampleGroupName + SampleGroupName = s.FirstOrDefault().SampleGroupName, + MobileTelephone = s.Key.MobileTelephone }).ToList(); await uow.CompleteAsync(); @@ -420,6 +423,11 @@ namespace Shentun.Peis.PrintReports } + /// + /// 单个打印检验条码 + /// + /// + /// [HttpPost("api/app/PrintReport/GetLisRequestReportByLisRequestId")] public async Task GetLisRequestReportByLisRequestIdAsync(LisRequestIdInputDto input) { @@ -484,7 +492,8 @@ namespace Shentun.Peis.PrintReports AsbitemNames = string.Join(",", list.OrderBy(o => o.asbitem.DisplayOrder).Select(o => o.asbitem.DisplayName).Distinct()), CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(lisRequestInfo.patientRegister.CustomerOrgId).Result.DisplayName, DepartmentName = _cacheService.GetCustomerOrgNameAsync(lisRequestInfo.patientRegister.CustomerOrgId).Result, - SampleGroupName = lisRequestInfo.sampleGroupName + SampleGroupName = lisRequestInfo.sampleGroupName, + MobileTelephone = lisRequestInfo.patient.MobileTelephone }; return lisRequestDto; @@ -709,6 +718,7 @@ namespace Shentun.Peis.PrintReports { var query = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() + join patient in await _patientRepository.GetQueryableAsync() on patientRegister.PatientId equals patient.Id join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id into asbitemTemp @@ -729,9 +739,9 @@ namespace Shentun.Peis.PrintReports PatientRegisterNo = patientRegister.PatientRegisterNo, SexName = _cacheService.GetSexNameAsync(patientRegister.SexId).Result, IsCheckRequest = itemTypeHaveEmpty != null ? itemTypeHaveEmpty.IsCheckRequest : 'N', - BarcodeMode = asbitemHaveEmpty != null ? asbitemHaveEmpty.BarcodeMode : '0' - //CustomerOrgName = _cacheService.GetTopCustomerOrgNameAsync(patientRegister.CustomerOrgId).Result, - //DepartmentName = _cacheService.GetCustomerOrgNameAsync(patientRegister.CustomerOrgId).Result + BarcodeMode = asbitemHaveEmpty != null ? asbitemHaveEmpty.BarcodeMode : '0', + CustomerOrgId= patientRegister.CustomerOrgId, + MobileTelephone = patient.MobileTelephone }).ToList(); @@ -753,8 +763,9 @@ namespace Shentun.Peis.PrintReports PatientName = s.FirstOrDefault().PatientName, PatientRegisterNo = s.FirstOrDefault().PatientRegisterNo, SexName = s.FirstOrDefault().SexName, - CustomerOrgName = "", - DepartmentName = "" + CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(s.FirstOrDefault().CustomerOrgId).Result.DisplayName, + DepartmentName = _cacheService.GetCustomerOrgNameAsync(s.FirstOrDefault().CustomerOrgId).Result, + MobileTelephone= s.FirstOrDefault().MobileTelephone }); } else if (s.Where(m => m.BarcodeMode == '1').Count() > 0) @@ -768,8 +779,9 @@ namespace Shentun.Peis.PrintReports PatientName = s.FirstOrDefault().PatientName, PatientRegisterNo = s.FirstOrDefault().PatientRegisterNo, SexName = s.FirstOrDefault().SexName, - CustomerOrgName = "", - DepartmentName = "" + CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(s.FirstOrDefault().CustomerOrgId).Result.DisplayName, + DepartmentName = _cacheService.GetCustomerOrgNameAsync(s.FirstOrDefault().CustomerOrgId).Result, + MobileTelephone = s.FirstOrDefault().MobileTelephone }); } } @@ -779,8 +791,7 @@ namespace Shentun.Peis.PrintReports return pacsNoReportDtos; } - - + /// /// 打印Pacs条码数据 单个条码打印 /// diff --git a/src/Shentun.Peis.Domain/PrintReports/LisRequestReportDto.cs b/src/Shentun.Peis.Domain/PrintReports/LisRequestReportDto.cs index 4b05ef1..8824ad1 100644 --- a/src/Shentun.Peis.Domain/PrintReports/LisRequestReportDto.cs +++ b/src/Shentun.Peis.Domain/PrintReports/LisRequestReportDto.cs @@ -112,6 +112,11 @@ namespace Shentun.Peis.PrintReports /// 条码分组名称 /// public string SampleGroupName { get; set; } + + /// + /// 手机号 + /// + public string MobileTelephone { get; set; } } diff --git a/src/Shentun.Peis.Domain/PrintReports/PacsNoReportDto.cs b/src/Shentun.Peis.Domain/PrintReports/PacsNoReportDto.cs index 77287cd..e6277e2 100644 --- a/src/Shentun.Peis.Domain/PrintReports/PacsNoReportDto.cs +++ b/src/Shentun.Peis.Domain/PrintReports/PacsNoReportDto.cs @@ -58,5 +58,10 @@ namespace Shentun.Peis.PrintReports /// 部门名称 /// public string DepartmentName { get; set; } + + /// + /// 手机号 + /// + public string MobileTelephone { get; set; } } }