Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r37801 -r37803 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 37801) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 37803) @@ -294,9 +294,15 @@ //sqlBuilder.append(String.format(" AND po.sterilizerName = '%s' " ,sterilizerName)); Sterilizer sterilizer = sterilizerManager.getSterilizerByName(sterilizerName); if(sterilizer != null){ - sqlBuilder.append(String.format(" AND po.sterilizationRecord_id in (select sr.id from %s sr where sr.sterilizer.id = %s) ", + String sterilizerNameSql = ""; + if(CssdUtils.isProject("gdsy")){ + //gdsy有聚力康推送的包实例,没有灭菌记录,只能通过灭菌炉名称过滤 + sterilizerNameSql = " or (po.sterilizationRecord_id is null and po.sterilizerName = '%s') "; + } + sqlBuilder.append(String.format(" AND (po.sterilizationRecord_id in (select sr.id from %s sr where sr.sterilizer.id = %s) %s) ", SterilizationRecord.class.getSimpleName(), - sterilizer.getId())); + sterilizer.getId(), + sterilizerNameSql)); } }else{ //灭菌炉分组