新增 产品编码查询

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/PatientMonitorQuery.java

@@ -44,6 +44,9 @@ public class PatientMonitorQuery  implements Serializable {
     @ApiModelProperty("WEB端请传输blurry-设备别名")
     private String deviceAlias;
 
+    @ApiModelProperty("WEB端请传输blurry-产品编码")
+    private String productNo;
+
     @ApiModelProperty("安卓端使用-麻醉医生")
     private String anaDoctor;
 
@@ -56,6 +59,7 @@ public class PatientMonitorQuery  implements Serializable {
     @ApiModelProperty("安卓端使用-麻醉方式")
     private String anaType;
 
+
     /**
      * @see  DeviceTypeEnum #value
      */
@@ -141,5 +145,6 @@ public class PatientMonitorQuery  implements Serializable {
         this.setCode(blurry);
         this.setDeviceId(blurry);
         this.setDeviceAlias(blurry);
+        this.setProductNo(blurry);
     }
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/PatientMonitorResult.java

@@ -53,6 +53,9 @@ public class PatientMonitorResult implements Serializable {
     @ApiModelProperty(value = "设备id")
     private String deviceId;
 
+    @ApiModelProperty(value = "设备产品编码")
+    private String productNo;
+
     @ApiModelProperty(value = "泵别名")
     private String deviceAlias;
 

nb-service/web-service/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -45,6 +45,7 @@
         <result column="append_lock_time" property="appendLockTime"/>
         <result column="max_dose" property="maxDose"/>
         <result column="last_upload_time" property="lastUploadTime"/>
+        <result column="product_no" property="productNo"/>
         <!--<result column="self_control_count" property="selfControlCount"/>-->
         <result column="self_control_lock_time" property="selfControlLockTime"/>
         <result column="pca_valid_count" property="pcaValidCount"/>
@@ -210,6 +211,7 @@
         i.type as device_type,
         i.last_upload_time as last_upload_time,
         d.alias as device_alias,
+        d.product_no as product_no ,
         c.patient_gender as patient_gender,
         c.`patient_name` as patient_name,
         c.finished as finished,
@@ -308,12 +310,15 @@
         </where>
         ) as i on p.infusion_id=i.id
         left join
-        (select device_id,alias
+        (select device_id,alias,product_no
         from bus_device
         <where>
             <if test="query.tenantId!=null">
                 and tenant_id=#{query.tenantId}
             </if>
+            <if test="query.productNo!=null">
+                or product_no LIKE concat('%', #{query.productNo}, '%')
+            </if>
         </where>
         ) as d on d.device_id=i.device_id
         join (select * from bus_clinic