Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r29225 -r29260 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29225) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29260) @@ -735,9 +735,13 @@ } //外部代理灭菌 sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable " + - "from tousseInstance i,tousseDefinition d where i.toussedefinition_id = d.id and d.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') " + "from tousseInstance i,tousseDefinition d where i.toussedefinition_id = d.id and d.id=t.tousseDefinitionId and d.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') " + "and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and " + dateQueryAdapter.dateConverAdapter2(endDateTime, fmt) + + " and t.taskGroup = '" + + taskGroup + + "' and t.orgUnitCode = '" + + orgUnitCode + " and i.orgUnitCoding = '" + orgUnitCode + "' ";