Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintData.java
===================================================================
diff -u -r22031 -r22096
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintData.java	(.../UseRecordPrintData.java)	(revision 22031)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintData.java	(.../UseRecordPrintData.java)	(revision 22096)
@@ -4,6 +4,12 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.lang3.StringUtils;
+
+import com.forgon.tools.MathTools;
+
 /**
  * 使用记录打印数据
  * @author kzh
@@ -78,7 +84,26 @@
 		if(useRecordPrintItems == null){
 			useRecordPrintItems = new ArrayList<>();
 		}
-		useRecordPrintItems.add(item);
+		if(item != null){
+			UseRecordPrintItem find = CollectionUtils.find(useRecordPrintItems, new Predicate<UseRecordPrintItem>(){
+				@Override
+				public boolean evaluate(UseRecordPrintItem object) {
+					if(StringUtils.equals(item.getCertification(),object.getCertification())
+							&& StringUtils.equals(item.getName(), object.getName())
+							&& StringUtils.equals(item.getModel(), object.getModel())
+							&& MathTools.valueEquals(item.getPrice(), object.getPrice())){
+						return true;
+					}
+					return false;
+				}});
+			if(find == null){
+				useRecordPrintItems.add(item);
+			}else{
+				find.setAmount(MathTools.add(find.getAmount(),item.getAmount()).intValue());
+			}
+			
+		}
+		
 	}
 	public List<UseRecordPrintItem> getUseRecordPrintItems() {
 		return useRecordPrintItems;
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintItem.java
===================================================================
diff -u -r22031 -r22096
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintItem.java	(.../UseRecordPrintItem.java)	(revision 22031)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintItem.java	(.../UseRecordPrintItem.java)	(revision 22096)
@@ -11,6 +11,10 @@
 	 */
 	private String name;
 	/**
+	 * 型号
+	 */
+	private String model;
+	/**
 	 * 注册证号
 	 */
 	private String certification;
@@ -46,5 +50,11 @@
 	public void setPrice(Double price) {
 		this.price = price;
 	}
+	public String getModel() {
+		return model;
+	}
+	public void setModel(String model) {
+		this.model = model;
+	}
 	
 }
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r22065 -r22096
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 22065)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 22096)
@@ -5718,10 +5718,15 @@
 				List<ExpensiveGoodsInstance> instances = itemsMap.get(useRecord.getId());
 				if(CollectionUtils.isNotEmpty(instances)){
 					for(ExpensiveGoodsInstance instance : instances){
+						ExpensiveGoods eg = instance.getExpensiveGoods();
+						if(eg != null && !eg.implant()){
+							//不是植入物,跳过
+							continue;
+						}
 						UseRecordPrintItem item = new UseRecordPrintItem();
 						item.setAmount(1);
-						ExpensiveGoods eg = instance.getExpensiveGoods();
 						item.setCertification(eg!=null?eg.getCertification():"");
+						item.setModel(instance.getModel());
 						item.setName(instance.getShowName());
 						item.setPrice(instance.getPrice());
 						useRecordPrintData.addItem(item);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoods.java
===================================================================
diff -u -r22094 -r22096
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoods.java	(.../ExpensiveGoods.java)	(revision 22094)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoods.java	(.../ExpensiveGoods.java)	(revision 22096)
@@ -555,6 +555,14 @@
 	public void setIsImplant(String isImplant) {
 		this.isImplant = isImplant;
 	}
+	/**
+	 * 判断是否植入物
+	 * @return
+	 */
+	@Transient
+	public boolean implant(){
+		return Constants.STR_YES.equals(getIsImplant());
+	}
 
 	// 调整库存,只是在原有库存上调整，不整个重新计算
 	public void adjustAmount(long amountChange) {
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
===================================================================
diff -u -r22031 -r22096
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js	(.../printConfig.js)	(revision 22031)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js	(.../printConfig.js)	(revision 22096)
@@ -1123,6 +1123,9 @@
     var goodsTable = "<table class='chld'>";
     goodsTable += "<tr>";
     var useRecordPrintItems = printSummaryObj.useRecordPrintItems||[];
+    if(useRecordPrintItems.length == 0){
+    	useRecordPrintItems.push({});//添加一个空对象
+    }
 
     goodsTable += "<td class='fat'>名称</td>";
     goodsTable += "<td class='thin'>注册证号</td>";
@@ -1134,13 +1137,14 @@
     	var item = useRecordPrintItems[i];
     	var itemName = item.name;
     	var amount = item.amount;
+    	var model = item.model;
     	var certification = item.certification;
     	var price = item.price;
     	
     	goodsTable += "<tr>";
 	    goodsTable += "<td class='fat'>"+getDefaultString(itemName,"&nbsp;")+"</td>";
 	    goodsTable += "<td class='thin'>"+getDefaultString(certification,"&nbsp;")+"</td>";
-	    goodsTable += "<td class='fat'>"+getDefaultString(null,"&nbsp;")+"</td>";
+	    goodsTable += "<td class='fat'>"+getDefaultString(model,"&nbsp;")+"</td>";
 	    goodsTable += "<td class='thin'>"+getDefaultString(amount,"&nbsp;")+"</td>";
 	    goodsTable += "<td class='thin'>"+getDefaultString(price,"&nbsp;")+"</td>";
 	    goodsTable += "</tr>";
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r22092 -r22096
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22092)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22096)
@@ -397,6 +397,7 @@
 		foreignTousseApplication.setApplicationItems(foreignTousseItems);
 	}
 	
+	@Override
 	public void createForeignTousseApplicationForEntry(ExpensiveGoodsGodownEntry expensiveGoodsGodownEntry) {
 		if (expensiveGoodsGodownEntry != null) {
 			Long invoicePlanId = expensiveGoodsGodownEntry.getInvoicePlanId();
@@ -547,7 +548,7 @@
 				Long expensiveGoodsId = expensiveGoodsGodownEntryItem.getExpensiveGoodsId();
 				if (DatabaseUtil.isPoIdValid(expensiveGoodsId)) {
 					ExpensiveGoods expensiveGoods = expensiveGoodsManager.get(expensiveGoodsId);
-					if (expensiveGoods != null && Constants.STR_YES.equals(expensiveGoods.getIsImplant())) {
+					if (expensiveGoods != null && expensiveGoods.implant()) {
 						Integer amount = expensiveGoodsToAmountMap.get(expensiveGoods);
 						expensiveGoodsToAmountMap.put(expensiveGoods, amount != null ? ++amount : 1);
 					}