Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r24092 -r24100 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 24092) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 24100) @@ -1700,8 +1700,8 @@ List sterilingModeList = null; //判断现有篮筐实例里的包实例的灭菌方式与本次要灭菌装载的器械包实例的灭菌方式是否一致(排除掉不追溯的包),如果不一致则抛出异常 rs = objectDao.executeSql("select distinct sterilingMode from " + TousseInstance.class.getSimpleName() - + " join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id " - + " where td.isTraceable='"+ Constants.STR_NO +"' and ReviewBasket_id = "+ basket.getId()); + + " ti join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id " + + " where td.isTraceable='"+ Constants.STR_YES +"' and ReviewBasket_id = "+ basket.getId()); String sterilingMode = null; while(rs.next()){ if(sterilingModeList == null){ @@ -1721,7 +1721,7 @@ if(CollectionUtils.isNotEmpty(sterilingModeList) && CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){ if(sterilingModeList.size() > 1){ - throw new SystemException("该篮筐有多种不同灭菌方式的物品,不能装载器械包,请先将框内灭菌方式不同的物品移除!"); + throw new RuntimeException("该篮筐有多种不同灭菌方式的物品,不能装载器械包,请先将框内灭菌方式不同的物品移除!"); }else{ //否则判断要灭菌装载的包的灭菌方式与篮筐内已有的包的灭菌方式是否一致(排除不追溯的包) //判断现有篮筐实例里的包实例的灭菌方式与本次要灭菌装载的器械包实例的灭菌方式是否有不一致的包(排除掉不追溯的包),如果有不一致则抛出异常 @@ -1734,8 +1734,9 @@ } } } - }catch (Exception e){ - + }catch (SQLException e){ + logger.error(e); + throw new RuntimeException("操作失败,请联系管理员."); }finally{ DatabaseUtil.closeResultSetAndStatement(rs); }