|
|
@@ -106,8 +106,8 @@ public class ClusterDeviceOperator implements DeviceOperator {
|
|
|
Value value = getValue(DeviceKeyConstant.INFUSION_TENANT_ID);
|
|
|
if(value==null){
|
|
|
BusInfusionHistoryEntity lastInfusion = getLastInfusion();
|
|
|
- if(lastInfusion==null){
|
|
|
- //当输注不存在时,采用设备绑定的医院id
|
|
|
+ if(lastInfusion==null||Boolean.TRUE.equals(lastInfusion.getFinished())){
|
|
|
+ //当输注不存在时或已结束时,采用设备绑定的医院id
|
|
|
String tenantId = getTenantId();
|
|
|
value=Value.simple(tenantId);
|
|
|
setInfusionTenantId(tenantId);
|