新增 产品编码查询

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

@@ -316,9 +316,6 @@
             <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
@@ -341,9 +338,12 @@
             </if>
         </where>
         ) c on p.clinic_id=c.id
-        <if test="query.bedNo!=null || query.name!=null || query.code!=null || query.anaDoctor!=null || query.surgeName!=null ||query.gender!=null ||query.anaType!=null || query.deviceId != null">
+        <if test="query.bedNo!=null || query.name!=null || query.code!=null || query.anaDoctor!=null || query.surgeName!=null ||query.gender!=null ||query.anaType!=null || query.deviceId != null || query.productNo!=null">
             <where>
                 (1=0
+                <if test="query.productNo!=null">
+                    or d.product_no LIKE concat('%', #{query.productNo}, '%')
+                </if>
                 <if test="query.bedNo!=null">
                     or c.bed_no LIKE concat('%', #{query.bedNo}, '%')
                 </if>