Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r16414 -r16418 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16414) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16418) @@ -2041,12 +2041,16 @@ if (extraParam == null) { return JSONUtil.buildErrorMsgJsonResult("缺失参数extraParam"); } - + String barcodeType = null; + String barcodeName = null; BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcode); if (barcodeDevice instanceof Sterilizer) { // 灭菌炉 Sterilizer sterilizer = (Sterilizer) barcodeDevice; + barcodeType = sterilizer.getType(); + barcodeName = sterilizer.getName(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); if (!sterilizationRecordManager.isAllSterilizationEnd(sterilizer .getName())) { return JSONUtil.buildErrorMsgJsonResult("当前灭菌炉正在灭菌"); @@ -2058,16 +2062,24 @@ .endObject().toString(); } else if (barcodeDevice instanceof Sterilisation) { + Sterilisation sterilisation = (Sterilisation) barcodeDevice; + barcodeType = sterilisation.getType(); + barcodeName = sterilisation.getSterilisation(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); // 灭菌程序 return new JSONStringer().object().key("success").value(true) .key("barcode").value(barcode).key("type") .value("sterileMethod").key("data") - .value(sterileMethodToJson((Sterilisation) barcodeDevice)) + .value(sterileMethodToJson(sterilisation)) .endObject().toString(); // 篮筐 } else if (barcodeDevice instanceof Container) { - return buildJsonResultForSterileContainer((Container) barcodeDevice); + Container container = (Container) barcodeDevice; + barcodeType = container.getType(); + barcodeName = container.getContainerName(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); + return buildJsonResultForSterileContainer(container); // 器械包 } else if (barcodeDevice instanceof TousseInstance) { @@ -2076,7 +2088,9 @@ TousseInstance tousseInstance = (TousseInstance) barcodeDevice; TousseDefinition tousseDefinition = tousseInstance .getTousseDefinition(); - + barcodeType = tousseInstance.getType(); + barcodeName = tousseInstance.getTousseName(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); if (TousseDefinition.STR_NO.equals(tousseDefinition.getIsTraceable())) { Collection sqlWheres = new ArrayList(); @@ -2128,8 +2142,19 @@ .value(datasJSONArray).endObject().toString(); } else if(barcodeDevice instanceof Position){ - return positionManager.getPositionJsonType((Position)barcodeDevice, false).toString(); + Position position = (Position)barcodeDevice; + barcodeType = position.getType(); + barcodeName = position.getPositionName(); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, barcodeType, barcode, barcodeName); + + return positionManager.getPositionJsonType(position, false).toString(); } else { + if(barcodeDevice != null){ + barcodeType = barcodeDevice.getType(); + }else{ + barcodeType = LogManager.BARCODE_TYPE_INVALID; + } + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION,barcodeType, barcode, barcodeName); return JSONUtil.buildErrorMsgJsonResult("条码无效"); } }