Merge remote-tracking branch 'origin/dev/diagnose20210315' into dev/diagnose20210315

src/main/resources/mapper/KlDiagnoseMapper.xml

@@ -134,7 +134,7 @@
         <if test="status!=null">
             AND dia.status = #{status}
         </if>
-        ORDER BY dia.gmt_modified DESC
+        ORDER BY dia.status DESC ,dia.gmt_modified DESC
     </select>
     <select id="getByIdDiagnoses" resultType="com.diagbot.dto.KlDiagnoseByIdDTO">
         SELECT