update

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusPatientService.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.enums.ClinicManageEnum;
 import com.nb.web.api.feign.IPatientClient;
@@ -474,15 +475,17 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
 
         BusClinicEntity clinic = clinicService.getById(patient.getClinicId());
         String infusionId=patient.getInfusionId();
-
-        BusInfusionHistoryEntity infusion =infusionService.getById(infusionId);
-
-        Optional.ofNullable(deviceService.getByDeviceId(infusion.getDeviceId()))
-                .map(device-> {
-                    //填充泵别名
+        BusInfusionHistoryEntity infusion=null;
+        if(StrUtil.isNotEmpty(infusionId)){
+            infusion =infusionService.getById(infusionId);
+            if(ObjectUtil.isNotNull(infusion)&&StrUtil.isNotEmpty(infusion.getId())){
+                BusDeviceEntity device = deviceService.getByDeviceId(infusion.getDeviceId());
+                if(ObjectUtil.isNotNull(device)){
                     infusion.setAlias(device.getAlias());
-                    return device;
-                });
+                }
+            }
+        }
+
 
         clinic.setPatientCode(patient.getCode());