|
@@ -179,8 +179,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
FROM
|
|
FROM
|
|
|
z_assay za
|
|
z_assay za
|
|
|
LEFT JOIN biz_device bd ON za.device_no = bd.device_no
|
|
LEFT JOIN biz_device bd ON za.device_no = bd.device_no
|
|
|
|
|
+ LEFT JOIN z_assay_result zar on zar.assay_no = za.assay_no
|
|
|
WHERE
|
|
WHERE
|
|
|
- 1 = 1
|
|
|
|
|
|
|
+ 1 = 1 AND zar.assay_item in (1,2,3,4,5,6,7,8)
|
|
|
AND bd.type = #{type}
|
|
AND bd.type = #{type}
|
|
|
AND za.assay_date between #{timeBegin} and #{timeEnd}
|
|
AND za.assay_date between #{timeBegin} and #{timeEnd}
|
|
|
<if test="deviceNo != null and deviceNo != ''"> and za.device_no = #{deviceNo}</if>
|
|
<if test="deviceNo != null and deviceNo != ''"> and za.device_no = #{deviceNo}</if>
|
