|
|
@@ -192,7 +192,7 @@ public class DeviceInfoListener {
|
|
|
* @param deviceOperator
|
|
|
* @return void
|
|
|
*/
|
|
|
- private void handleIntelligent(BusDeviceRunningEntity device, DeviceOperator deviceOperator) {
|
|
|
+ private void handleIntelligent(BusDeviceRunningEntity device, DeviceOperator deviceOperator, List<Supplier<?>> cacheOperation) {
|
|
|
if(DeviceTypeEnum.intelligent.equals(device.getType())
|
|
|
&&null!=device.getWarnFlow()
|
|
|
&& Boolean.FALSE.equals(device.isNewInfusion())){
|
|
|
@@ -209,6 +209,11 @@ public class DeviceInfoListener {
|
|
|
device.setWarnFlow(null);
|
|
|
}
|
|
|
}
|
|
|
+ cacheOperation.add(()->{
|
|
|
+ deviceOperator.setContinueDose(device.getContinueDose());
|
|
|
+ return null;
|
|
|
+ });
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -317,7 +322,7 @@ public class DeviceInfoListener {
|
|
|
device.setClinicId(patientOperator.getClinicId());
|
|
|
device.setPatientId(patientOperator.getPatientId());
|
|
|
//处理智能泵数据
|
|
|
- handleIntelligent(device,deviceOperator);
|
|
|
+ handleIntelligent(device,deviceOperator,cacheOperation);
|
|
|
//处理追加量数据
|
|
|
handleAppendDose(device,deviceOperator,cacheOperation);
|
|
|
BusInfusionHistoryEntity infusionHistory = BusInfusionHistoryEntity.parseRunningInfo(device);
|
|
|
@@ -350,7 +355,6 @@ public class DeviceInfoListener {
|
|
|
deviceOperator.setInfusionId(device.getInfusionId());
|
|
|
deviceOperator.setClassification(device.getClassification());
|
|
|
deviceOperator.setStartTime(infusionHistory.getStartTime());
|
|
|
- deviceOperator.setContinueDose(device.getContinueDose());
|
|
|
deviceOperator.setInfusionTenantId(device.getTenantId());
|
|
|
}
|
|
|
patientOperator.setExist(true);
|