Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java =================================================================== diff -u -r20103 -r20120 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java (.../ReAppTableSqlHandler.java) (revision 20103) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java (.../ReAppTableSqlHandler.java) (revision 20120) @@ -78,7 +78,7 @@ String tousseGroupId = sqlWhereParamMap.get("tousseGroupId"); if (StringUtils.isNotBlank(tousseGroupId) && tousseGroupId.indexOf("all") == -1) { String ids = SqlBuilder.build_IN_Statement("tg.id", SqlBuilder.IN, tousseGroupId.split(Constants.IDS_SEPARATOR_COMMA)); - sqlBuilder.append(String.format(" and (po.id in (select ti.invoicePlan.id from TousseItem ti,TousseDefinition td,TousseGroup tg where ti.tousseDefinitionId = td.id and td.tousseGroupID = tg.id and ti.tousseType = '器械包' and %s))", ids)); + sqlBuilder.append(String.format(" and (po.id in (select ti.invoicePlan.id from TousseItem ti,TousseDefinition td,TousseGroup tg where ti.tousseDefinitionId = td.id and td.tousseGroupID = tg.id and %s))", ids)); } } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r20037 -r20120 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 20037) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 20120) @@ -2685,6 +2685,9 @@ td.setAutoOutStockForPacking(ancestorTD.getAutoOutStockForPacking()); td.setIntoBasketMaxAmount(ancestorTD.getIntoBasketMaxAmount()); td.setHidePackingTask(ancestorTD.getHidePackingTask()); + //器械包分组 + td.setTousseGroupID(ancestorTD.getTousseGroupID()); + td.setTousseGroupName(ancestorTD.getTousseGroupName()); List diposableGoodsItems = new ArrayList(); for (DiposableGoodsInstance item : ancestorTD .getDiposableGoodsItems()) {