Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r16436 -r16501 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16436) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16501) @@ -201,11 +201,16 @@ } } private boolean doDelete(TousseDefinition tousseDefinition){ - - appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_BASEDATA, Log.TYPE_DELETE, "器械包定义[id:" - + tousseDefinition.getId() + ",名称:" + tousseDefinition.getName() + "]"); - objectDao.delete(tousseDefinition); - return true; + if( tousseDefinition != null){ + // 删除供应室处理器械包配置 + String sql = String.format(" delete from %s where tousseDefinitionId = %s ", CssdHandleTousses.class.getSimpleName(),tousseDefinition.getId()); + objectDao.excuteSQL(sql); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_BASEDATA, Log.TYPE_DELETE, "器械包定义[id:" + + tousseDefinition.getId() + ",名称:" + tousseDefinition.getName() + "]"); + objectDao.delete(tousseDefinition); + return true; + } + return false; } @Override public boolean deleteTousseDefinitionById(String id) {