|
@@ -33,7 +33,7 @@
|
|
FROM
|
|
FROM
|
|
tran_plan u
|
|
tran_plan u
|
|
LEFT JOIN tran_plan_detail pd ON pd.plan_id = u.id AND pd.status = 1 AND pd.is_deleted = 'N'
|
|
LEFT JOIN tran_plan_detail pd ON pd.plan_id = u.id AND pd.status = 1 AND pd.is_deleted = 'N'
|
|
- AND pd.parent_id = - 1
|
|
|
|
|
|
+ AND pd.parent_id = -1
|
|
WHERE
|
|
WHERE
|
|
u.is_deleted = 'N'
|
|
u.is_deleted = 'N'
|
|
<if test="hospitalId !=null">
|
|
<if test="hospitalId !=null">
|
|
@@ -50,6 +50,6 @@
|
|
AND u.plan_status = #{planStatus}
|
|
AND u.plan_status = #{planStatus}
|
|
</if>
|
|
</if>
|
|
GROUP BY u.id
|
|
GROUP BY u.id
|
|
- ORDER BY gmtCreate DESC
|
|
|
|
|
|
+ ORDER BY planStatus DESC , gmtCreate DESC
|
|
</select>
|
|
</select>
|
|
</mapper>
|
|
</mapper>
|