fix 输注监控

coffee-system/src/main/java/com/coffee/bus/service/dto/PatientMonitorResult.java

@@ -153,7 +153,7 @@ public class PatientMonitorResult {
 
     @ApiModelProperty(value = "当前病人是否已结束临床，根据此参数+监护开始时间计算总监护时间",
             notes = "false:监护时长=当前时间-监护开始时间 ,true:监护时长=监护结束时间-监护开始时间")
-    private Boolean clinicFinished;
+    private boolean clinicFinished;
 
     @ApiModelProperty("当前病人监护结束时间")
     private Date monitorEndTime;

coffee-system/src/main/java/com/coffee/bus/websocket/listener/DeviceInfoListener.java

@@ -395,7 +395,7 @@ public class DeviceInfoListener {
      * @param cacheOperation 缓存操作
      */
     private BusInfusionHistoryEntity handleInfusion(BusDeviceRunningEntity device, DeviceOperator<DeviceCacheInfo> deviceOperator, AtomicBoolean newInfusion, List<Supplier<?>> cacheOperation) {
-        PatientOperator<PatientCacheInfo> operator = patientRegistry.getOperator(device.getPatientCode(), device.getTenantId());
+        PatientOperator<PatientCacheInfo> operator = patientRegistry.getOperator(device.getTenantId(), device.getPatientCode());
         device.setClinicId(operator.getClinicId());
 
         BusInfusionHistoryEntity infusionHistory = handleInfusionHistory(device, deviceOperator, newInfusion, cacheOperation);

coffee-system/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -179,7 +179,7 @@
         r.alias as device_alias,
         c.finished as finished,
         c.monitor_start_time as monitor_start_time,
-        c.monitor_end_time as monitor_end_time,
+        c.end_time as monitor_end_time,
         c.ana_doctor as ana_doctor,
         c.patient_age as patient_age,
         c.ana_type as ana_type,
@@ -334,7 +334,7 @@
         r.alias as device_alias,
         c.finished as finished,
         c.monitor_start_time as monitor_start_time,
-        c.monitor_end_time as monitor_end_time,
+        c.end_time as monitor_end_time,
         c.ana_doctor as ana_doctor,
         c.patient_age as patient_age,
         c.ana_type as ana_type,