From f17f0e88169ac3de83b4bfa17cd127e39a3fd5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Mon, 11 May 2026 11:18:16 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#501:=20=E3=80=90=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E7=AB=99-=E5=8C=BB=E5=98=B1=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E3=80=91=E5=8C=BB=E5=98=B1=E6=89=A7=E8=A1=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=82=B9=E5=87=BB"=E5=8F=96=E6=B6=88=E6=89=A7?= =?UTF-8?q?=E8=A1=8C"=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 adviceCancel 方法中两处复制粘贴错误： 1. 长期已发放药品处理中误用 tempMedDispensedList 替代 longMedDispensedList 2. 长期未发放药品处理中误用 tempMedUndispenseList 替代 longMedUndispenseList 导致取消执行时数据处理混乱，引发 SQL 异常 Co-Authored-By: Claude Opus 4.7 --- .../appservice/impl/AdviceProcessAppServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index 7aa6c437..fe40a2fe 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -523,7 +523,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 处理长期已发放的药品 if (!longMedDispensedList.isEmpty()) { // 生成退药单 - this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap); + this.creatRefundMedicationList(longMedDispensedList, procedureIdMap); } // 处理临时已发放药品 if (!tempMedDispensedList.isEmpty()) { @@ -653,7 +653,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { if (!longMedUndispenseList.isEmpty()) { // 排除已汇总的药品 List medicationDispenseList - = tempMedUndispenseList.stream().filter(x -> x.getSummaryNo() == null).toList(); + = longMedUndispenseList.stream().filter(x -> x.getSummaryNo() == null).toList(); medicationDispenseService .removeByIds(medicationDispenseList.stream().map(MedicationDispense::getId).toList()); }