add 新增 输注运行状态查询和输注报警状态查询

nb-system/src/main/java/com/nb/bus/service/dto/CombineQuery.java

@@ -134,6 +134,11 @@ public class CombineQuery {
     @NotNull(message = "分页参数不可为空")
     private Page<CombineResult> page;
 
+    @ApiModelProperty(value = "设备运行状态",hidden = true)
+    private Integer deviceRunState;
+
+    @ApiModelProperty(value = "设备报警状态",hidden = true)
+    private Integer deviceAlarm;
 
     @ApiModelProperty("按照输注开始时间排序")
     private Boolean infusionStartTimeDesc;

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

@@ -328,6 +328,12 @@
             <if test="query.deviceId != null">
                 and device_id like concat('%',#{query.deviceId},'%')
             </if>
+            <if test="query.deviceRunState != null">
+                and run_state = #{query.deviceRunState}
+            </if>
+            <if test="query.deviceAlarm != null">
+                and alarm = #{query.deviceAlarm}
+            </if>
             <if test="query.validPcaCountRange != null and query.validPcaCountRange.size > 0">
                 and pca_valid_count &gt;=  #{query.validPcaCountRange[0]}
                 <if test="query.validPcaCountRange.size >1 ">