Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r32947 -r32976 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 32947) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 32976) @@ -3781,7 +3781,9 @@ String querySql = "select case when aer.id is null then ip.id else null end ipId, ip.serialNumber,ip.type,ip.depart,ip.applicationTime,ti.id,ti.tousseName,ti.isRecycling," + " ti.amount,ti.recyclingAmount,ti.unit,ip.recyclingStatus " + " from invoicePlan ip join TousseItem ti on ip.id=ti.recyclingApplication_ID " - + " left join " + AdverseEventRecord.class.getSimpleName() + " aer on aer.recyclingApplication_ID=ip.id " + + " left join " + AdverseEventRecord.class.getSimpleName() + " aer on aer.recyclingApplication_ID=ip.id and aer.eventCode='"+ + AdverseEventRecord.EVENTNAME_RECYCLINGTIMEOUTCODE + +"' " + " where ip.handleDepartCoding='"+ AcegiHelper.getCurrentOrgUnitCode() +"' and ti.timeoutprocesstype is null " + " and (ip.type='"+ InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION +"' and ip.recyclingStatus in ('"+ InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE +"','"+ InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE +"') " + " or (ip.type<>'"+ InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION +"' and ip.recyclingStatus in ('"+ InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE +"','"+ InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE +"'))) "