Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r26420 -r26445 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26420) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26445) @@ -4347,6 +4347,7 @@ + "join "+ TousseDefinition.class.getSimpleName() +" td on po.tousseDefinition_id=td.id " + "join "+ TousseDefinition.class.getSimpleName() +" tdAncestor on td.ancestorId=tdAncestor.id " + "where po.reviewBasket_id=" + reviewedBasket.getId()); + return tousseInstanceManager.getTousseVoDataFromDb(queryTousseSql.toString()); }else if(sterilizationRecord != null && DatabaseUtil.isPoIdValid(sterilizationRecord.getId())){ queryTousseSql.append("select b.barcode,tdAncestor.name definitionName,po.tousseName,po.depart,po.departCoding,po.sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.orgUnitCoding,po.orgUnitName,po.reviewTime,po.sterilingType,po.validUntil "); if(dbConnection.isOracle()){ @@ -4364,8 +4365,8 @@ + "join "+ TousseDefinition.class.getSimpleName() +" tdAncestor on td.ancestorId=tdAncestor.id " + "join sterilization_tousseInstance st on st.tousseInstance_id=po.id " + "where st.sterilizationRecord_id=" + sterilizationRecord.getId()); + return tousseInstanceManager.getTousseVoDataFromDb(queryTousseSql.toString()); } - list = tousseInstanceManager.getTousseVoDataFromDb(queryTousseSql.toString()); return list; }