Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r34734 -r34735 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 34734) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 34735) @@ -803,7 +803,7 @@ result = "该化学监测包已使用,不能重复使用"; } } else if(barcodeDevice instanceof DisposableGoodsBatch){ - result = sterilizationRecordManager.getBarcodeTypeByDisposableGoodsBatch(barcodeDevice); + result = sterilizationRecordManager.getBarcodeTypeByDisposableGoodsBatch(barcodeDevice).toString(); }else { result = "barcodeInvalid"; } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r34734 -r34735 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 34734) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 34735) @@ -700,5 +700,5 @@ * @param barcodeDevice * @return */ - public String getBarcodeTypeByDisposableGoodsBatch(BarcodeDevice barcodeDevice); + public JSONObject getBarcodeTypeByDisposableGoodsBatch(BarcodeDevice barcodeDevice); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r34734 -r34735 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 34734) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 34735) @@ -8236,15 +8236,15 @@ return arr; } @Override - public String getBarcodeTypeByDisposableGoodsBatch( + public JSONObject getBarcodeTypeByDisposableGoodsBatch( BarcodeDevice barcodeDevice) { DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch)barcodeDevice; DisposableGoods disposableGoods = disposableGoodsBatch.getDiposableGoods(); if(Constants.STR_YES.equals(disposableGoods.getIsDisable())){ - return JSONUtil.buildJsonObject(false, disposableGoods.getShowNameForSmallestUnit() + "已禁用").toString(); + return JSONUtil.buildJsonObject(false, disposableGoods.getShowNameForSmallestUnit() + "已禁用"); } if(!DisposableGoods.CONSUMPTIVE_MATERIAL_USE_STERILIZER.equals(disposableGoods.getConsumptiveMaterialUse())){ - return JSONUtil.buildJsonObject(false, disposableGoods.getShowNameForSmallestUnit() + "的耗材用途不是" + DisposableGoods.CONSUMPTIVE_MATERIAL_USE_STERILIZER).toString(); + return JSONUtil.buildJsonObject(false, disposableGoods.getShowNameForSmallestUnit() + "的耗材用途不是" + DisposableGoods.CONSUMPTIVE_MATERIAL_USE_STERILIZER); } /*String sql = " select count(*) from "+ SteriliPurposeDisposableGoods.class.getSimpleName() + " where disposableGoodsId="+ @@ -8258,15 +8258,15 @@ //检查库存 WareHouse wareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); if(wareHouse == null){ - return JSONUtil.buildJsonObject(false, "当前登录用户所在科室无默认仓库").toString(); + return JSONUtil.buildJsonObject(false, "当前登录用户所在科室无默认仓库"); } String sql = " select ds from " + DisposableGoodsBatchStock.class.getSimpleName() + " ds where warehouseID="+ wareHouse.getId() +" and storage>0 and disposableGoodsBatchId=" + disposableGoodsBatch.getId() + " order by id asc"; List disposableGoodsBatchStocks = objectDao.findByHql(sql); if(CollectionUtils.isEmpty(disposableGoodsBatchStocks)){ - return JSONUtil.buildJsonObject(false, "库存不足").toString(); + return JSONUtil.buildJsonObject(false, "库存不足"); } JSONObject resultObj = JSONUtil.buildJsonObject(true); resultObj.put("dataType", "disposableGoodsBatchStock"); @@ -8279,6 +8279,6 @@ obj.put("specification", disposableGoods.getSpecification()); obj.put("barcode", disposableGoodsBatch.getBarcode()); resultObj.put("data", obj); - return resultObj.toString(); + return resultObj; } }