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()); }