Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r16413 -r16414 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16413) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16414) @@ -1767,10 +1767,14 @@ BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcode); - + String barcodeType = null; + String barcodeName = null; // 篮筐 if (barcodeDevice instanceof Container) { Container container = (Container) barcodeDevice; + barcodeType = container.getPurpose(); + barcodeName = container.getContainerName(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); if (!Container.CONTAINERTYPE_BASKET.equals(container .getContainerType())) { return JSONUtil.buildErrorMsgJsonResult("此容器非篮筐"); @@ -1798,7 +1802,6 @@ // 器械包 } else if (barcodeDevice instanceof TousseInstance) { - // 验证器械包状态 Predicate predicate1 = new Predicate() { @Override @@ -1810,7 +1813,9 @@ Collection resultTousseInstanceList; TousseInstance tousseInstance = (TousseInstance) barcodeDevice; - + barcodeType = tousseInstance.getType(); + barcodeName = tousseInstance.getTousseName(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); TousseDefinition tousseDefinition = tousseInstance .getTousseDefinition(); @@ -1847,6 +1852,10 @@ .value("tousseInstanceList").key("data") .value(datasJSONArray).endObject().toString(); } else { + if(barcodeDevice != null){ + barcodeType = barcodeDevice.getType(); + } + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILELOADING, barcodeType, barcode, barcodeName); return JSONUtil.buildErrorMsgJsonResult("查无此物品"); }