From d5711ac7d997c4862308262e608189ddbbecbe92 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Thu, 13 Jun 2024 18:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B7=B2=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SumSummaryReports/SumSummaryReportAppService.cs | 6 +++--- src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs b/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs index 2da004c..94a22ad 100644 --- a/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs +++ b/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs @@ -143,7 +143,7 @@ namespace Shentun.Peis.SumSummaryReports join itemType in await _itemTypeRepository.GetQueryableAsync() on asbitem.ItemTypeId equals itemType.Id where patient.Id == list.First().patient.Id - && (patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck || patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Audit) + && patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck && patientRegister.MedicalTimes < list.First().patientRegister.MedicalTimes && registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked && asbitem.IsCheck == 'Y' @@ -382,7 +382,7 @@ namespace Shentun.Peis.SumSummaryReports join itemType in await _itemTypeRepository.GetQueryableAsync() on asbitem.ItemTypeId equals itemType.Id where patient.Id == input.PatientId - && (patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck || patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Audit) + && patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck && registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked && asbitem.IsCheck == 'Y' select new @@ -459,7 +459,7 @@ namespace Shentun.Peis.SumSummaryReports join item in await _itemRepository.GetQueryableAsync() on registerCheckItem.ItemId equals item.Id where patient.Id == input.PatientId - && (patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck || patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Audit) + && patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck && registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked && asbitem.IsCheck == 'Y' && asbitem.Id == input.AsbitemId diff --git a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs index 5bda3f2..d152b78 100644 --- a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs +++ b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs @@ -89,7 +89,6 @@ namespace Shentun.Peis.LisRequests where patientRegister.Id == patientRegisterId && patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && patientRegister.CompleteFlag != PatientRegisterCompleteFlag.SumCheck - && patientRegister.CompleteFlag != PatientRegisterCompleteFlag.Audit && itemType.CheckTypeFlag == CheckTypeFlag.Laboratory && registerCheck.CompleteFlag == RegisterCheckCompleteFlag.UnChecked select new