Browse Source

fix 修复一些问题

A17404李放 3 years ago
parent
commit
1ff4160e6d

+ 1 - 0
nb-system/src/main/java/com/nb/bus/controller/BusHospitalController.java

@@ -1,6 +1,7 @@
 package com.nb.bus.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.util.ObjectUtil;

+ 0 - 1
nb-system/src/main/java/com/nb/bus/hospital/his/HisScriptSession.java

@@ -178,7 +178,6 @@ public class HisScriptSession {
             }
             hisRequestMap.remove(messageId);
         });
-        //将数据存储到数据库
         sendRequest(channelContext,request);
         return result;
     };

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

@@ -411,9 +411,6 @@
                     and undo_time <=  #{query.undoTimeRange[1]}
                 </if>
             </if>
-            <if test="query.deviceRunState != null">
-                and run_state = #{query.deviceRunState}
-            </if>
             <if test="query.deviceType != null">
                 and type =  #{query.deviceType}
             </if>
@@ -449,6 +446,9 @@
             <if test="query.warnFlow !=null">
                 and warn_flow= #{query.warnFlow}
             </if>
+            <if test="query.deviceRunState != null">
+                and run_state = #{query.deviceRunState}
+            </if>
             <if test="query.deviceAlarm != null">
                 and alarm_state = #{query.deviceAlarm}
             </if>