From 41083f7d9b14a839e59189021a1f2e5dba7b0f6f Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Tue, 30 Apr 2024 13:16:36 +0800 Subject: [PATCH] =?UTF-8?q?lis=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintReports/PrintReportAppService.cs | 2 +- .../ChargeRequests/ChargeRequestManager.cs | 34 +++++++++---------- .../LisRequests/LisRequestManager.cs | 34 +++++++++---------- .../RegisterCheckItemManager.cs | 2 +- .../ChargeRequestAppServiceTest.cs | 2 +- .../DiagnosisFunctionAppServiceTest.cs | 20 +++++------ 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index 39b9f82..2c258f5 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -164,7 +164,7 @@ namespace Shentun.Peis.PrintReports //生成LIS条码 var lisRequests = await _lisRequestManager.SetLisRequestAsync(input.PatientRegisterId); await _unitOfWorkManager.Current.SaveChangesAsync(); - await _unitOfWorkManager.Current.CompleteAsync(); + //await _unitOfWorkManager.Current.CompleteAsync(); //检索条码数据 diff --git a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs index 73bee83..e1a63c5 100644 --- a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs +++ b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs @@ -66,25 +66,25 @@ namespace Shentun.Peis.ChargeRequests public async Task SendThirChargeRequestAsync(Guid id,string funName) { - var patientRegisterEntity = await (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() - 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 chargeRequest in await _repository.GetQueryableAsync() - on registerCheckAsbitem.LisRequestId equals chargeRequest.Id - where chargeRequest.Id == id - select new - { - patientRegister - }).FirstOrDefaultAsync(); - if (patientRegisterEntity == null) - { - return; - } + //var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() + // 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 chargeRequest in await _repository.GetQueryableAsync() + // on registerCheckAsbitem.LisRequestId equals chargeRequest.Id + // where chargeRequest.Id == id + // select new + // { + // patientRegister + // }).ToList().FirstOrDefault(); + //if (patientRegisterEntity == null) + //{ + // return; + //} var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.ChargeRequest - && o.MedicalCenterId == patientRegisterEntity.patientRegister.MedicalCenterId)) + )) .OrderBy(o => o.DisplayOrder).ToList(); foreach (var thirdInterface in thirdInterfaces) { diff --git a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs index 65e6ffe..0291636 100644 --- a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs +++ b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs @@ -323,24 +323,24 @@ namespace Shentun.Peis.LisRequests public async Task SendThirdLisRequestAsync(Guid id) { - var patientRegisterEntity = await (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() - 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 lisRequest in await _lisRequestRepository.GetQueryableAsync() - on registerCheckAsbitem.LisRequestId equals lisRequest.Id - where lisRequest.Id == id - select new - { - patientRegister - }).FirstOrDefaultAsync(); - if(patientRegisterEntity == null) - { - return; - } + //var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() + // 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 lisRequest in await _lisRequestRepository.GetQueryableAsync() + // on registerCheckAsbitem.LisRequestId equals lisRequest.Id + // where lisRequest.Id == id + // select new + // { + // patientRegister + // }).ToList().FirstOrDefault(); + // if(patientRegisterEntity == null) + // { + // return; + // } var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest - && o.MedicalCenterId == patientRegisterEntity.patientRegister.MedicalCenterId)) + )) .OrderBy(o => o.DisplayOrder).ToList(); foreach (var thirdInterface in thirdInterfaces) { diff --git a/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs b/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs index 24018af..6f1884d 100644 --- a/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs +++ b/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs @@ -150,7 +150,7 @@ namespace Shentun.Peis.RegisterCheckItems referenceRangeValue = referenceRangeValue.Replace("≧", ">=") .Replace("≥", ">=").Replace("≤", "<=").Replace("≦", "<="); var pos = referenceRangeValue.IndexOf("--");//兼容老系统 - if (pos == 0) + if (pos <= 0) { pos = referenceRangeValue.IndexOf("-"); } diff --git a/test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs b/test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs index 54a57a5..189e878 100644 --- a/test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs +++ b/test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs @@ -47,7 +47,7 @@ namespace Shentun.Peis }; var newEntity = await _appService.CreateAsync(entity); - await unitOfWork.CompleteAsync(); + //await unitOfWork.CompleteAsync(); } } } diff --git a/test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs b/test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs index 091504a..94e0532 100644 --- a/test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs +++ b/test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs @@ -156,35 +156,35 @@ namespace Shentun.Peis { var getDiagnosisResultRequestDto = new GetDiagnosisResultRequestDto() { - RegisterCheckId = new Guid("3a11ee70-034c-1ce6-40f9-7eabb02830a9"), + RegisterCheckId = new Guid("3a123c55-07a8-b330-ac9c-52e2a05e1dba"), Items = new List { new GetDiagnosisResultRequest_Item() { - ItemId = new Guid("3a0d2916-3706-a22a-69dd-bd80be509d07"), + ItemId = new Guid("3a1203c2-fde9-6f64-d268-54c7817fc9a4"), Result = "30.5" }, new GetDiagnosisResultRequest_Item() { - ItemId = new Guid("3a0d2919-49d5-30d3-4373-b3dc1e806732"), + ItemId = new Guid("3a1203c2-fefd-b6cd-2933-84860f5af7b9"), Result = "9" }, new GetDiagnosisResultRequest_Item() { - ItemId = new Guid("3a0d2917-40e2-2f81-ebfc-267a9a98b02e"), + ItemId = new Guid("3a1203c3-0017-e959-3735-5a3c71a9c70a"), Result = "91.3" }, new GetDiagnosisResultRequest_Item() { - ItemId = new Guid("3a0d291a-6ab5-8642-9cd3-30353ecb5d15"), + ItemId = new Guid("3a1203c3-012e-1a2e-66a8-1829caf0cd64"), Result = "90" }, - new GetDiagnosisResultRequest_Item() - { - ItemId = new Guid("3a0d2918-344b-0373-a53c-b4888bd6b9a6"), - Result = "13" - }, + //new GetDiagnosisResultRequest_Item() + //{ + // ItemId = new Guid("3a0d2918-344b-0373-a53c-b4888bd6b9a6"), + // Result = "13" + //}, } }; var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);