fix

优化查询方式

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusPatientService.java

@@ -268,7 +268,9 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         if(ObjectUtil.isNotNull(device)){
             result.setDeviceAlias(device.getAlias());
             result.setProductNo(device.getProductNo());
-            return true;
+            if (StrUtil.isNotBlank(query.getDeviceId()) && StrUtil.isNotBlank(query.getDeviceAlias())) {
+                return true;
+            }
         }
 
         if(StrUtil.isNotBlank(query.getBlurry())){
@@ -282,16 +284,30 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         }
 
 
-        if (StrUtil.isNotBlank(query.getAnaDoctor())) {
+        if (StrUtil.isNotBlank(query.getBedNo())) {
+            search=true;
+            if(StrUtil.contains(result.getBedNo(),query.getBedNo())){
+                return true;
+            }
+        }
+
+        if (StrUtil.isNotBlank(query.getName())) {
+            search=true;
+            if(StrUtil.contains(result.getPatientName(),query.getName())){
+                return true;
+            }
+        }
+
+        if (StrUtil.isNotBlank(query.getCode())) {
             search=true;
-            if(StrUtil.contains(result.getAnaDoctor(),query.getAnaDoctor())){
+            if(StrUtil.contains(result.getPatientCode(),query.getCode())){
                 return true;
             }
         }
 
-        if (StrUtil.isNotBlank(query.getSurgeName())) {
+        if (StrUtil.isNotBlank(query.getDeviceId())) {
             search=true;
-            if(StrUtil.contains(result.getSurgeryName(),query.getSurgeName())){
+            if(StrUtil.contains(result.getDeviceId(),query.getDeviceId())){
                 return true;
             }
         }