From d79690a3712d2c1656846a6e46229bbe1867fdc5 Mon Sep 17 00:00:00 2001 From: guanyu Date: Sat, 25 Apr 2026 20:00:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D#442=E6=89=8B=E6=9C=AF?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E5=88=A0=E9=99=A4=E5=BE=85=E7=AD=BE=E5=8F=91?= =?UTF-8?q?=E8=80=97=E6=9D=90=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因: handleDel方法中使用iProcedureService.listByIds(requestIds)错误, requestIds是WOR_DEVICE_REQUEST/WOR_SERVICE_REQUEST表主键, 不是CLI_PROCEDURE表主键。 修复: 改用iProcedureService.getProcedureRecords(requestIds, serviceTable) 通过request_id字段正确关联执行记录。 --- .../appservice/impl/NurseBillingAppService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java index 8152b0d1..3c8bf7a9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java @@ -665,7 +665,7 @@ public class NurseBillingAppService implements INurseBillingAppService { // 1. 校验：待删除项是否已收费，已收费则抛出异常阻止删除 checkDeletedDeviceChargeStatus(requestIds); // 软删除执行记录 - List procedureList = iProcedureService.listByIds(requestIds); + List procedureList = iProcedureService.getProcedureRecords(requestIds, serviceTable); List procedureIds = procedureList.stream().filter(Objects::nonNull) // 过滤掉null的Procedure对象 .map(Procedure::getId).filter(Objects::nonNull) // 过滤掉id为null的记录（按需添加） .collect(Collectors.toList());