Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r26774 -r26780
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 26774)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 26780)
@@ -423,8 +423,6 @@
 	var returnMsg=new Array();
 	//总金额合计
 	var sum=0;
-	//实际归还总数
-	var returnAmount= 0;
 	for(var t=0;t<children.length;t++){
 	//将发货的器械包和归还的器械包分别放在两个数组中，如果某发货单发货数量为3，那么数组中体现出三条记录
 		var detail=children[t];
@@ -446,27 +444,37 @@
 			}
 		}else if(detail.type=='实际还物'||detail.type=='使用完全归还'){
 			//发货数量则在发货信息数组中加入多少条数据，此数据为发货时间
-			returnMsg.push(detail.time);
-			returnAmount += detail.amount;
+			for(var d=0;d<detail.amount;d++){
+				returnMsg[rLength+d]=detail.time;
+			}
 		}
 	}
 	//实际借出总数
 	var lendAmount=deliver.length;
+	//实际归还总数
+	var returnAmount=returnMsg.length;
 	//剩余未归还数量
 	var remainAmount=lendAmount-returnAmount;
 	//已归还物品总借出天数
 	var lendDays=0;
+	//未归还物品截止目前借出天数
+	var remainDays=0;
 	//遍历相减得到总借出天数
 	for(var v=0;v<returnMsg.length;v++){
 		var end=Date.parse(new Date(revertDate(returnMsg[v])));
 		var start=Date.parse(new Date(revertDate(deliver[v])));
 		var days=Math.ceil((end-start)/86400000);
 		lendDays=lendDays+days;
 	}
-	//未归还物品截止目前借出天数
-	var newDate = Date.parse(new Date());
-	var startDate = Date.parse(new Date(revertDate(deliver[0])));
-	var remainDays=Math.ceil((newDate-startDate)/86400000);
+	
+	//遍历得到未归还器械包截至目前借出天数
+	for(var v=returnAmount;v<lendAmount;v++){
+		var end=Date.parse(new Date());
+		var start=Date.parse(new Date(revertDate(deliver[v])));
+		var days=Math.ceil((end-start)/86400000);
+		remainDays=remainDays+days;
+	}
+	
 	//最后把记录转换成两条json,放到总的已归还信息和未归还信息json数组中
 	//已归还记录
 	var alreadyReturnChild={};
@@ -484,7 +492,7 @@
 	//借物单价（元/天）
 	alreadyReturnChild.price=price;
 	//金额
-	alreadyReturnChild.totalPrice=Math.floor((returnAmount*lendDays*price) * 100)/100;
+	alreadyReturnChild.totalPrice=Math.floor((lendDays*price) * 100)/100;
 	
 	//未归还记录
 	var remainReturnChild={};
@@ -502,7 +510,7 @@
 	//借物单价（元/天）
 	remainReturnChild.price=price;
 	//金额
-	remainReturnChild.totalPrice=Math.floor((remainAmount*remainDays*price) * 100)/100;
+	remainReturnChild.totalPrice=Math.floor((remainDays*price) * 100)/100;
 	if(returnAmount!=0){
 		alreadyReturn.push(alreadyReturnChild);
 	}