|
@@ -731,7 +731,10 @@
|
|
|
LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
|
|
|
WHERE
|
|
|
TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
|
|
|
- <if test="orderType!=null">
|
|
|
+ <if test="orderType!=null and orderType==21">
|
|
|
+ AND OO.ORDER_TYPE IN (21,11)
|
|
|
+ </if>
|
|
|
+ <if test="orderType!=null and orderType!=21">
|
|
|
AND OO.ORDER_TYPE=#{orderType}
|
|
|
</if>
|
|
|
<include refid="orderBy">
|