diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/service/impl/LogisticsDirectivePlanServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/service/impl/LogisticsDirectivePlanServiceImpl.java index 599825af..b69c6d85 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/service/impl/LogisticsDirectivePlanServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/service/impl/LogisticsDirectivePlanServiceImpl.java @@ -63,11 +63,15 @@ public class LogisticsDirectivePlanServiceImpl extends ServiceImpl { if ("Y".equals(item.getIzPackage())) { - List directives = packageMap.get(item.getDirectiveId()).getDirectives(); - if (CollectionUtils.isEmpty(directives)) { - directives = List.of(); + CareDirectivePackageEntity packageEntity = packageMap.get(item.getDirectiveId()); + if (packageEntity != null) { + List directives = packageEntity.getDirectives(); + // 处理 directives + if (CollectionUtils.isEmpty(directives)) { + directives = List.of(); + } + item.setDirectivesList(BeanUtil.copyToList(directives, LogisticsDirectivePlan.class)); } - item.setDirectivesList(BeanUtil.copyToList(directives, LogisticsDirectivePlan.class)); } }); }