Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/dao/his/inpatient/charge/CashierProcessDao.java

@@ -26,7 +26,7 @@ public interface CashierProcessDao {
 
     @Select("<script>" +
             " select top ${pageSize} * from ( " +
-            "                       SELECT    ROW_NUMBER() OVER (ORDER BY  zy_actpatient.inpatient_no  ) AS rowNumber, " +
+            "                       SELECT    ROW_NUMBER() OVER (ORDER BY  zy_actpatient.inpatient_no,zy_actpatient.admiss_times desc   ) AS rowNumber, " +
             "                              zy_actpatient.inpatient_no, " +
             "                              zy_actpatient.admiss_times, " +
             "                              zy_actpatient.name, " +