From 6294e1d2903b94c00757aacb426c0d9730587a59 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Sun, 30 Mar 2025 15:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E6=B6=B2=E6=A8=A1=E5=9D=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutpatientInfusionRecordServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java index 184d4691..daf8da50 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java @@ -354,16 +354,17 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.COMPLETED.getValue()); //筛选当前ID的患者历史执行记录 queryWrapper.eq(CommonConstants.FieldName.PatientId,patientId); + //执行次数大于0 + queryWrapper.gt("done_num", 0); - List infusionPerformList = editRecords(queryWrapper); - List medicationIds = checkServiceRequestIsCompleted(infusionPerformList); - // 未产生执行历史 - if (medicationIds == null || medicationIds.isEmpty()) { - return infusionPerformList; - } - // 筛选一下执行的药品 - queryWrapper.in(CommonConstants.FieldName.MedicationId, medicationIds); - +// List infusionPerformList = editRecords(queryWrapper); +// List medicationIds = checkServiceRequestIsCompleted(infusionPerformList); +// // 未产生执行历史 +// if (medicationIds == null || medicationIds.isEmpty()) { +// return infusionPerformList; +// } +// // 筛选一下执行的药品 +// queryWrapper.in(CommonConstants.FieldName.MedicationId, medicationIds); return editRecords(queryWrapper); // 门诊输液待执行记录查询