Explorar o código

修改脚本数据
添加重设参数值

18339543638 hai 11 meses
pai
achega
5f84e25dfe

+ 4 - 2
nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -501,9 +501,11 @@ public class DeviceInfoListener implements IIotMsgHandler {
         }
         //判断临床是否已结束,若临床已结束,则采用当前输注作为主输注开启临床
         BusPatientEntity patient = patientService.getById(device.getPatientId());
-        if(clinicFinished){
+        if(clinicFinished||ObjectUtil.isNull(patient)){
             clinicService.resetClinic(device.getClinicId());
-            patient.setInfusionId(device.getInfusionId());
+            if(ObjectUtil.isNotNull(patient)){
+                patient.setInfusionId(device.getInfusionId());
+            }
             PatientOperator patientOperator = patientRegistry.getOperator(device.getTenantId(), device.getPatientCode());
             device.setMaster(true);
             device.setResetClinic(true);

+ 4 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/registry/patient/ClusterPatientOperator.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.bus.registry.patient;
 
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
@@ -98,6 +99,9 @@ public class ClusterPatientOperator implements PatientOperator {
                 return null;
             }
             BusInfusionHistoryEntity infusion = infusionHistoryService.getById(patient.getInfusionId());
+            if(ObjectUtil.isNull(infusion)){
+                return null;
+            }
             value=Value.simple(infusion.getDeviceId());
             setBindDeviceId(infusion.getDeviceId());
         }