Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r12862 -r12892 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12862) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12892) @@ -1899,9 +1899,10 @@ @SuppressWarnings("unchecked") @Override public List getCssdHandleTousseDefinitionList( - OrgUnit cssdOrgUnit) { + OrgUnit cssdOrgUnit,String spell) { String sql = "from " + TousseDefinition.class.getSimpleName() + " where id in (select tousseDefinitionId from " + CssdHandleTousses.class.getSimpleName() + " where orgUnitCode = '" + cssdOrgUnit.getOrgUnitCoding() + "')"; + sql += " and (spelling like '%" + spell + "%' or wbCode like '%" + spell + "%' or externalCode like '%" + spell + "%')"; return objectDao.findByHql(sql); } Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r12871 -r12892 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 12871) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 12892) @@ -619,7 +619,7 @@ var foundNode = null; var rootNode = treeStore.getRootNode(); rootNode.cascade(function(n) { - if(n.get('id') == id){ + if(n.get('tousseDefinitionID') == id){ // 是根结点的直接节点,不是消毒物品的材料 if (n.parentNode == rootNode){ foundNode = n; @@ -652,7 +652,6 @@ function addItems(tousseDefinitionID,name,count,diposable,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount){ var foundNode = null; foundNode = getExsistNodeByTousseDefinitionID(leftTemplateStore, tousseDefinitionID); - if (foundNode != null){ updateNode('tousseTreeGrid', foundNode, count, price); if(tousseType == tousseType_disinfectGoods){ Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java =================================================================== diff -u -r12862 -r12892 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 12862) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 12892) @@ -169,7 +169,7 @@ * @param orgUnit * @return */ - public List getCssdHandleTousseDefinitionList(OrgUnit cssdOrgUnit); + public List getCssdHandleTousseDefinitionList(OrgUnit cssdOrgUnit,String spell); /** * 新建或修改科室处理器械包配置 Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r12862 -r12892 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 12862) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 12892) @@ -1303,7 +1303,7 @@ OrgUnit cssd = new OrgUnit(); cssd.setOrgUnitCoding(cssdOrgUnitCode); List tousseDefinitiionList = - tousseDefinitionManager.getCssdHandleTousseDefinitionList(cssd); + tousseDefinitionManager.getCssdHandleTousseDefinitionList(cssd,spell); if(CollectionUtils.isNotEmpty(tousseDefinitiionList)){ Map map = null;