Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordController.java =================================================================== diff -u -r24429 -r24498 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordController.java (.../UseRecordController.java) (revision 24429) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordController.java (.../UseRecordController.java) (revision 24498) @@ -382,18 +382,18 @@ if(barcodeDevice instanceof TousseInstance){ TousseInstance tousseInstance = (TousseInstance)barcodeDevice; dataJsonObject = new JSONObject(); - JSONUtil.addProperty(result, "actualUsed", tousseInstance.getActualUsed()); - JSONUtil.addProperty(result, "barcode", barcode); - JSONUtil.addProperty(result, "showTousseName", tousseInstance.getTousseName()); - JSONUtil.addProperty(result, "validUntil", tousseInstance.getValidUntil()); - //JSONUtil.addProperty(result, "batchNo", ); - JSONUtil.addProperty(result, "packageType", tousseInstance.getPackageType()); - JSONUtil.addProperty(result, "tousseType", tousseInstance.getTousseDefinition().getTousseType()); - //JSONUtil.addProperty(result, "idCardUseAmount", tousseInstance.getIdCardInstanceID()); - JSONUtil.addProperty(result, "amount", 1); + JSONUtil.addProperty(dataJsonObject, "actualUsed", tousseInstance.getActualUsed()); + JSONUtil.addProperty(dataJsonObject, "barcode", barcode); + JSONUtil.addProperty(dataJsonObject, "showTousseName", tousseInstance.getTousseName()); + JSONUtil.addProperty(dataJsonObject, "validUntil", tousseInstance.getValidUntil()); + //JSONUtil.addProperty(dataJsonObject, "batchNo", ); + JSONUtil.addProperty(dataJsonObject, "packageType", tousseInstance.getPackageType()); + JSONUtil.addProperty(dataJsonObject, "tousseType", tousseInstance.getTousseDefinition().getTousseType()); + //JSONUtil.addProperty(dataJsonObject, "idCardUseAmount", tousseInstance.getIdCardInstanceID()); + JSONUtil.addProperty(dataJsonObject, "amount", 1); //JSONUtil.addProperty(result, "usedAmount", 1); - JSONUtil.addProperty(result, "isUrgentForUseRecord", tousseInstance.getIsUrgentForUseRecord()); - JSONUtil.addProperty(result, "includeImplant", tousseInstance.getTousseDefinition().getIncludeImplantStr()); + JSONUtil.addProperty(dataJsonObject, "isUrgentForUseRecord", tousseInstance.getIsUrgentForUseRecord()); + JSONUtil.addProperty(dataJsonObject, "includeImplant", tousseInstance.getTousseDefinition().getIncludeImplantStr()); }else if(barcodeDevice instanceof IDCardInstance){ IDCardInstance idCardInstance = (IDCardInstance)barcodeDevice; Long lastTousseInstanceId = idCardInstance.getLastTousseInstanceId(); @@ -403,18 +403,18 @@ JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE, "未找到该标识牌绑定的器械包"); }else{ dataJsonObject = new JSONObject(); - JSONUtil.addProperty(result, "actualUsed", tousseInstance.getActualUsed()); - JSONUtil.addProperty(result, "barcode", barcode); - JSONUtil.addProperty(result, "showTousseName", tousseInstance.getTousseName()); - JSONUtil.addProperty(result, "validUntil", tousseInstance.getValidUntil()); - //JSONUtil.addProperty(result, "batchNo", ); - JSONUtil.addProperty(result, "packageType", tousseInstance.getPackageType()); - JSONUtil.addProperty(result, "tousseType", tousseInstance.getTousseDefinition().getTousseType()); - //JSONUtil.addProperty(result, "idCardUseAmount", tousseInstance.getIdCardInstanceID()); - JSONUtil.addProperty(result, "amount", 1); - //JSONUtil.addProperty(result, "usedAmount", 1); - JSONUtil.addProperty(result, "isUrgentForUseRecord", tousseInstance.getIsUrgentForUseRecord()); - JSONUtil.addProperty(result, "includeImplant", tousseInstance.getTousseDefinition().getIncludeImplantStr()); + JSONUtil.addProperty(dataJsonObject, "actualUsed", tousseInstance.getActualUsed()); + JSONUtil.addProperty(dataJsonObject, "barcode", barcode); + JSONUtil.addProperty(dataJsonObject, "showTousseName", tousseInstance.getTousseName()); + JSONUtil.addProperty(dataJsonObject, "validUntil", tousseInstance.getValidUntil()); + //JSONUtil.addProperty(dataJsonObject, "batchNo", ); + JSONUtil.addProperty(dataJsonObject, "packageType", tousseInstance.getPackageType()); + JSONUtil.addProperty(dataJsonObject, "tousseType", tousseInstance.getTousseDefinition().getTousseType()); + //JSONUtil.addProperty(dataJsonObject, "idCardUseAmount", tousseInstance.getIdCardInstanceID()); + JSONUtil.addProperty(dataJsonObject, "amount", 1); + //JSONUtil.addProperty(dataJsonObject, "usedAmount", 1); + JSONUtil.addProperty(dataJsonObject, "isUrgentForUseRecord", tousseInstance.getIsUrgentForUseRecord()); + JSONUtil.addProperty(dataJsonObject, "includeImplant", tousseInstance.getTousseDefinition().getIncludeImplantStr()); } }else{ JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE, "该标识牌未绑定器械包");