Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r27137 -r27152 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 27137) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 27152) @@ -6497,31 +6497,32 @@ * @param tousseInstance 操作的器械包 */ private void validateSterilingMode(List scannedBarcodeJArray, TousseInstance tousseInstance){ - List sterilingModeList = null; + Set sterilingModeSet = null; //扫完灭菌篮筐条码及至少一个包后,判断新扫入的包与原有包的灭菌方式是否一致 if(CollectionUtils.isNotEmpty(scannedBarcodeJArray)){ List scannedTousseInstanceList = objectDao.getCollection(TousseInstance.class.getSimpleName(), "barcode", scannedBarcodeJArray); if(CollectionUtils.isNotEmpty(scannedTousseInstanceList)){ for (TousseInstance tousse : scannedTousseInstanceList) { if(StringUtils.isNotBlank(tousse.getSterilingMode())){ - if(sterilingModeList == null){ - sterilingModeList = new ArrayList(); + if(sterilingModeSet == null){ + sterilingModeSet = new HashSet(); } - sterilingModeList.add(tousse.getSterilingMode()); + sterilingModeSet.add(tousse.getSterilingMode()); } } } - int sterilingModeSize = CollectionUtils.size(sterilingModeList); + int sterilingModeSize = CollectionUtils.size(sterilingModeSet); if(sterilingModeSize > 1){ - throw new SterilingModeNotTheSameException("当前审核列表已经存在了多种不同灭菌方式的包"); + throw new SterilingModeNotTheSameException("已经存在了多种不同灭菌方式的包"); } if(sterilingModeSize == 1){ String sterilingMode = tousseInstance.getSterilingMode(); + String existSterilingMode = sterilingModeSet.iterator().next(); if(StringUtils.isNotBlank(sterilingMode) - && !StringUtils.equals(sterilingMode, sterilingModeList.get(0))){ + && !StringUtils.equals(sterilingMode, sterilingModeSet.iterator().next())){ throw new SterilingModeNotTheSameException(String.format("【%s】的灭菌方式为【%s】,原有物品的灭菌方式为【%s】,灭菌方式不同,不能载入!", - tousseInstance.getTousseName() , sterilingMode , sterilingModeList.get(0))); + tousseInstance.getTousseName() , sterilingMode , existSterilingMode)); } } }