|
@@ -39,7 +39,7 @@
|
|
|
ppkg.score_package_name AS rel_pkg_name,
|
|
ppkg.score_package_name AS rel_pkg_name,
|
|
|
pkg.start_time,
|
|
pkg.start_time,
|
|
|
pkg.end_time,
|
|
pkg.end_time,
|
|
|
- pkg.prov_abbr,
|
|
|
|
|
|
|
+ ppkg.prov_abbr,
|
|
|
pkg.drugtable
|
|
pkg.drugtable
|
|
|
FROM wm_task AS t
|
|
FROM wm_task AS t
|
|
|
LEFT JOIN wm_score_package AS pkg ON pkg.id = t.score_package_id
|
|
LEFT JOIN wm_score_package AS pkg ON pkg.id = t.score_package_id
|
|
@@ -59,7 +59,7 @@
|
|
|
pkg.start_time >= #{pkgIssueDate} AND pkg.end_time <= #{pkgExpiryDate}
|
|
pkg.start_time >= #{pkgIssueDate} AND pkg.end_time <= #{pkgExpiryDate}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="prov != null and prov != ''">
|
|
<if test="prov != null and prov != ''">
|
|
|
- AND pkg.prov_abbr = #{prov}
|
|
|
|
|
|
|
+ AND ppkg.prov_abbr = #{prov}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="vendorIds != null and vendorIds.size > 0">
|
|
<if test="vendorIds != null and vendorIds.size > 0">
|
|
|
AND pkg.dept_id IN
|
|
AND pkg.dept_id IN
|
