Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r29266 -r29268 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29266) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29268) @@ -698,7 +698,7 @@ String fmt = "yyyy-MM-dd HH24:MI:SS"; SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); String sql = "select alias.name , alias.reviewer , alias.isTraceable ,count(alias.name) amount from"; - //聚合包及不属于任务聚合包实例的普通器械包、消毒物品、敷料包的查询 + //聚合包及不属于任务聚合包实例的普通器械包、消毒物品、敷料包,外部代理灭菌的查询 sql += "(select d.name,i.reviewer as reviewer,d.isTraceable " + "from tousseInstance i,tousseDefinition d,cssdHandleTousses t where i.toussedefinition_id = d.id and d.id=t.tousseDefinitionId " + "and i.comboTousseInstanceId is null and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and " @@ -733,18 +733,6 @@ + orgUnitCode + "' "; } - //外部代理灭菌 - sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable " + - "from tousseInstance i,tousseDefinition d,cssdHandleTousses t 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 - + "' "; sql += ") alias group by alias.name,alias.reviewer, alias.isTraceable"; ResultSet rs = objectDao.executeSql(sql); List returnValue = new ArrayList();