Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r13497 -r13668 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 13497) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 13668) @@ -530,6 +530,9 @@ updateSqlList.add(String.format("update %s set tousseName='%s' where tousseDefinitionId=%s",CssdHandleTousses.class.getSimpleName(), targetTousseName,td.getId())); // GoodsStock updateSqlList.add(String.format("update %s set name='%s' where tousseDefinitionId=%s",GoodsStock.class.getSimpleName(), targetTousseName,td.getId())); + + //供应室处理器械包配置 + updateSqlList.add(String.format("update %s set tousseName='%s' where tousseDefinitionId=%s",CssdHandleTousses.class.getSimpleName(), targetTousseName,td.getId())); for(String updateSql : updateSqlList){ objectDao.excuteSQL(updateSql); } @@ -1936,7 +1939,7 @@ CssdHandleTousses.class.getSimpleName() + " where orgUnitCode = '" + cssdOrgUnit.getOrgUnitCoding() + "')"; sql += " and (spelling like '%" + spell + "%' or wbCode like '%" + spell + "%' or externalCode like '%" + spell - + "%' or name like '%" + spell + "%')"; + + "%' or name like '%" + spell + "%') and (isDisable is null or isDisable = '"+TousseDefinition.STR_NO+"')"; return objectDao.findByHql(sql); }