按上传状态和结算时间排序

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -358,6 +358,8 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
             "       outDeptName=(select rtrim(name) from zd_unit_code where code=isnull(zk_ward,small_dept))," +
             "       rtrim(isnull(zk_ward,small_dept)) as out_dept," +
             "       insuplc_admdvs,bmy_bz, " +
+            "       case when setl_list_id is null or setl_list_id=''" +
+            "        then 0 else 1 end upaload_Flag,"+
             "       setl_list_id,datediff(day ,b.admiss_date ,b.dis_date) as act_ipt_days,b.operation,b.dec_type," +
             "       id,req_op_id,rtrim(req_op_name) req_op_name,req_op_date,req_remark," +
             " audit_staff,audit_name,audit_date,audit_remark,audit_flag," +
@@ -367,7 +369,7 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
             " left join batj_ba2 bb on a.pat_no = bb.bah and a.times = bb.zycs"+
             " where revoked = 0 and " +
             " ${ew.sqlSegment} " +
-            ") temp where rowNumber > ${pageSize} * (${currentPage} - 1)")
+            ") temp where rowNumber > ${pageSize} * (${currentPage} - 1)  order by upaload_Flag ,setl_time  ")
     List<SiSetlinfoTemp> huoQuJieSuanRenYuan(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper,
                                              @Param("currentPage") long currentPage,
                                              @Param("pageSize") long pageSize);