Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r36471 -r36484 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 36471) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 36484) @@ -2672,6 +2672,8 @@ .key("barcode").value(barcode).key("type") .value("tousseInstanceList").key("data") .value(datasJSONArray).endObject().toString(); + } else if (StringUtils.equals(barcodeDevice.getType(), BarcodeDevice.BARCODE_TYPE_TOUSSEINSTANCESETCODE)) { + return JSONUtil.buildErrorMsgJsonResult("暂不支持使用器械包集合码,请扫描器械包条码进行加载操作"); } else { if(barcodeDevice != null){ barcodeType = barcodeDevice.getType(); @@ -3033,7 +3035,7 @@ } else if(StringUtils.equals(((BarcodeDevice)barcodeDevice).getType(),BarcodeDevice.BARCODE_TYPE_TOUSSEINSTANCESETCODE)){ List resultTousseInstanceList = tousseInstanceManager.getTousseInstancesBySetCode(barcode); resultTousseInstanceList = resultTousseInstanceList.stream().filter(ti -> { - return ti.isReviewed(); + return ti.isReviewed() && !DatabaseUtil.isPoIdValid(ti.getReviewBasket_id()); }).collect(Collectors.toList()); JSONArray datasJSONArray = JSONArray.fromObject( resultTousseInstanceList,