update 病号结束判定

nb-admin/src/main/resources/application-dev.yml

@@ -120,6 +120,6 @@ aliyun:
   # iotInstanceId：企业版实例请填写实例ID，公共实例请填空字符串""。
   iotInstanceId: ""
   server-subscription:
-    enable: false  # 是否开启阿里云物联网服务端订阅
+    enable: true  # 是否开启阿里云物联网服务端订阅
   product:
     productKey: a1ALlsBa2ZK

nb-system/src/main/java/com/coffee/bus/hospital/config/HospitalFunctionExtraConfigHandler.java

@@ -148,10 +148,13 @@ public class HospitalFunctionExtraConfigHandler  extends  AbstractHospitalConfig
                 .set(BusInfusionHistoryEntity::getRunState, DeviceStatusEnum.NoSignal));
         //报警/提醒缓存重置
         if(update){
+            log.info("消息【】处理成功，输注【】变为【不在服务区】状态",source.getId(),source.getInfusionId());
             wsPublishUtils.publishPatientMonitor(infusionHistory.getPatientId(), infusionHistory.getTenantId());
             //不在服务区
             monitorConfigHandler.judgeNoSignalAutoFinish(infusionHistory.getPatientId(),deviceId,source.getPatientCode(),source.getTenantId(),source.getInfusionId(),source.getUploadTime());
             autoUndoConfigHandler.judgeNoSignalAutoUndo(deviceId,source.getPatientCode(),source.getTenantId(),source.getInfusionId());
+        }else {
+            log.info("消息【】处理失败，输注【】变为【不在服务区】状态失败",source.getInfusionId());
         }
     }
 

nb-system/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -40,6 +40,9 @@
             <if test="query.uploadTimeMax!=null">
                 and upload_time &lt;= #{query.uploadTimeMax}
             </if>
+            <if test="query.type != null">
+                AND device_type = #{query.type}
+            </if>
         </where>
         ) AS da
         left JOIN (
@@ -51,9 +54,6 @@
             <if test="query.uploadTimeMax != null">
                 AND update_time &lt;= #{query.uploadTimeMax}
             </if>
-            <if test="query.type != null">
-                AND type = #{query.type}
-            </if>
         </where>
         ) AS d ON da.device_id = d.device_id
         GROUP BY
@@ -76,15 +76,13 @@
             <if test="query.uploadTimeMax!=null">
                 and upload_time &lt;= #{query.uploadTimeMax}
             </if>
+            <if test="query.type != null">
+                AND device_type = #{query.type}
+            </if>
         </where>
         ) AS da
         JOIN (
         select * from bus_device
-        <where>
-            <if test="query.type != null">
-                AND type = #{query.type}
-            </if>
-        </where>
         )AS d ON da.device_id = d.device_id
         GROUP BY
         da.tenant_id,