Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r16919 -r16929 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16919) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16929) @@ -577,7 +577,7 @@ if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType()) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType()) || TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType()) - || td.isDisinfection()){ + || td.isDisinfection() || td.isComboTousse()){ updateOtherEntityTousseName(td.getOrginalName() , td); } //器械包定义名称修改输出到日志 @@ -648,7 +648,8 @@ + " where itemType<>'材料' and toussedefinition_id in (select id from TousseDefinition where ancestorId="+ td.getId() +")"); }else if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType()) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType()) - || TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())){ + || TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType()) + || td.isComboTousse()){ //退物项ReturnGoodsItem updateSqlList.add("update ReturnGoodsItem set tousseName='"+ targetTousseName +"' where tousseDefinition_id="+ td.getId());