Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r27453 -r27470 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 27453) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 27470) @@ -1350,7 +1350,7 @@ sql = "select ri.recyclingRecord_id id, ri.tousseName tousseName, ri.amount amount, ri.tousseType tousseType, " + "ri.urgentLevel urgentLevel, ri.urgentAmount urgentAmount, " + "ftp.supplierName supplierName, ftp.surgery surgery, ftp.patient patient " - + "from " + RecyclingItem.class.getSimpleName() + " ri left join " + ForeignTousseApplication.class.getSimpleName() + " ftp on ftp.id = " + + "from " + RecyclingItem.class.getSimpleName() + " ri left join " + ForeignTousseApplication.class.getSimpleName() + " ftp on ftp.id in " + "(select rcr.recyclingApplication_id from " + RecyclingRecord.class.getSimpleName() + " rcr where rcr.id = ri.recyclingRecord_id)"; sql += " where " + where1 + " order by id"; }else{ Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r27358 -r27470 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 27358) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 27470) @@ -182,7 +182,8 @@ + " order by A.recyclingTime desc "; } else if (dbConnection.isOracle()) { sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark,p.submitTime,p.recyclingStatus "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() - + " r left join " + InvoicePlan.class.getSimpleName() + " p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '" + + " r left join " + InvoicePlan.class.getSimpleName() + " p on r.recyclingApplication_id = p.id " + joinSqlOfUrgent + + "where r.orgUnitCoding = '" + orgUnitCodingFromSupplyRoomConfig + "' and " + filterSql