Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r20657 -r20786
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20657)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20786)
@@ -1709,9 +1709,6 @@
 			TousseInstance tousseInstance = (TousseInstance)barcodeDevice;
 			TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
 			JSONObject result = new JSONObject();
-			String tousseBarcode = tousseInstance.getBarcode();
-			String cutOut = tousseBarcode.substring(tousseBarcode.length()-8,tousseBarcode.length());//截取后8位
-			result.put("id", cutOut);
 			String sql = "where po.tousseDefinition.id = '"
 					   + tousseDefinition.getId()
 					   + "' and po.unTraceableTousse = 1 and po.tousseFixedBarcode = 1 order by id asc";
@@ -1736,8 +1733,8 @@
 				int amount = materialInstance.getCount()* tousseDefinition.getScanAmount();//材料数量*包定义的每次扫描数量
 				materialInfoJSONObj.put("id",0);
 				materialInfoJSONObj.put("itemDefinitionName",materialInstance.getMaterialName());
-				materialInfoJSONObj.put("amount",amount);
-				materialInfoJSONObj.put("materialAmount",materialInstance.getCount());
+				materialInfoJSONObj.put("amount",amount); //扫描同一个器械包材料叠加数量
+				materialInfoJSONObj.put("materialAmount",materialInstance.getCount()); //材料数量
 				materialInfoJSONArray.add(materialInfoJSONObj);
 			}
 			result.put("itemAmountInfos", materialInfoJSONArray);