Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r33012 -r33014 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33012) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33014) @@ -779,7 +779,7 @@ //判断篮筐或者装配记录上面,灭菌方式是否相同 Set sterilizationModeSet = new HashSet(); for (TousseInstance ti : tis) { - sterilizationModeSet.add(ti.getSterilingMode()); + sterilizationModeSet.add(StringUtils.defaultString(ti.getSterilingMode())); if(sterilizationModeSet.size() > 1){ throw new SystemException("该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除"); } @@ -1042,7 +1042,7 @@ //判断篮筐或者装配记录上面,灭菌方式是否相同 Set sterilizationModeSet = new HashSet(); for (TousseInstance ti : tousseInstanceList) { - sterilizationModeSet.add(ti.getSterilingMode()); + sterilizationModeSet.add(StringUtils.defaultString(ti.getSterilingMode())); if(sterilizationModeSet.size() > 1){ if(StringUtils.equals(type, "容器")){ throw new SystemException("该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除");