Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
===================================================================
diff -u -r23398 -r23460
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js	(.../expensiveGoodsGodownEntryView.js)	(revision 23398)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js	(.../expensiveGoodsGodownEntryView.js)	(revision 23460)
@@ -1099,7 +1099,7 @@
 				rowEl.set({
 					'data-qtip' :tableContent,
 					'data-qwidth': 1000,
-					'data-qtitle':'&nbsp<font size=10>入库单信息表:</font>'});
+					'data-qtitle':'&nbsp;<font size=10>入库单信息表:</font>'});
 		}
 	});
 });
\ No newline at end of file
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
===================================================================
diff -u -r23450 -r23460
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java	(.../ExpensiveGoodsApplicationManagerImpl.java)	(revision 23450)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java	(.../ExpensiveGoodsApplicationManagerImpl.java)	(revision 23460)
@@ -512,27 +512,34 @@
 		if (StringUtils.isBlank(serialNumber)){
 			return expensiveGoodsItemVoList;
 		}
-		
-		String sql="select  ip.serialNumber,ti.tousseName,ti.price "
-		+",amount, "
-		+" (select count(0) from expensivegoodsGodownentry eg join expensivegoodsGodownentryitem egi " 
-		+"on eg.id=egi.expensivegoodsGodownentry_id "
-		+"where eg.invoiceplanid=ip.id and egi.expensiveGoodsId=ti.expensiveGoodsId "
-		+") stockAmount, "
-		+"( "
-		+"select count(0) from ExpensiveGoodsInstance egit where egit.invoiceplanid =ip.id and egit.expensiveGoods_id=ti.expensiveGoodsId and egit.userecordid is not null "
-		+") useAmount "
-		+", "
-		+"( "
-		+"select count(0) from ExpensiveGoodsInstance egit where egit.invoiceplanid =ip.id and egit.expensiveGoods_id=ti.expensiveGoodsId and egit.settledStatus='已结算' "
-		+") settleAmount "
-		+"from invoicePlan ip "
-		+"join ExpensiveGoodsApplication ega on ip.id=ega.id " 
-		+"join TousseItem ti on ti.recyclingApplication_ID =ega.id " 
-		+"left join ExpensiveGoodsInstance egi on egi.invoiceplanid =ega.id and  egi.expensiveGoods_id=ti.expensiveGoodsId "
-		+"where ip.serialNumber="+serialNumber
-		+"group by ip.id,ti.expensiveGoodsId ,ip.serialNumber,ti.tousseName,ti.amount,ti.price ";
 
+		String sql="select  ti.expensiveGoodsId,ip.serialNumber,ti.tousseName,ti.price ,amount, " 
+				+"( " 
+				+"(select count(0) from expensivegoodsGodownentry eg join expensivegoodsGodownentryitem egi " 
+				+"on eg.id=egi.expensivegoodsGodownentry_id " 
+				+"where eg.invoiceplanid=ip.id and egi.expensiveGoodsId=ti.expensiveGoodsId) - " 
+				+"( " 
+				+"select count(0) from expensivegoodsGodownentry eg "  
+				+"join expensivegoodsGodownentryitem eggi on eg.id=eggi.expensivegoodsGodownentry_id " 
+				+"join ExpensiveGoodsInstance egi1 on eggi.expensiveGoodsInstanceId=egi1.id " 
+				+"where eg.type='"+ ExpensiveGoodsGodownEntry.TYPE_OUT +"' and eggi.expensiveGoodsId=ti.expensiveGoodsId " 
+				+"and eggi.expensiveGoodsInstanceId in "  
+				+"(select eggi_in.expensiveGoodsInstanceId "  
+				+"from expensivegoodsGodownentry egg_in "  
+				+"join expensivegoodsGodownentryitem eggi_in on egg_in.id=eggi_in.expensivegoodsGodownentry_id " 
+				+"where ip.id=egg_in.invoiceplanId) " 
+				+") "  
+				+")stockAmount, " 
+				+"( " 
+				+"select count(0) from ExpensiveGoodsInstance egit where egit.invoiceplanid =ip.id and egit.expensiveGoods_id=ti.expensiveGoodsId and egit.userecordid is not null "  
+				+") useAmount "  
+				+", ( select count(0) from ExpensiveGoodsInstance egit where egit.invoiceplanid =ip.id and egit.expensiveGoods_id=ti.expensiveGoodsId and egit.settledStatus='已结算' ) settleAmount "  
+				+"from invoicePlan ip "  
+				+"join ExpensiveGoodsApplication ega on ip.id=ega.id  " 
+				+"join TousseItem ti on ti.recyclingApplication_ID =ega.id "  
+				+"left join ExpensiveGoodsInstance egi on egi.invoiceplanid =ega.id and  egi.expensiveGoods_id=ti.expensiveGoodsId "  
+				+"where ip.serialNumber="+serialNumber
+				+"group by ip.id,ti.expensiveGoodsId ,ip.serialNumber,ti.tousseName,ti.amount,ti.price " ; 
 
 		ResultSet rs = null;
 	
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js
===================================================================
diff -u -r23450 -r23460
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js	(.../expensiveGoodsApplicationView.js)	(revision 23450)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js	(.../expensiveGoodsApplicationView.js)	(revision 23460)
@@ -288,7 +288,7 @@
 	},{
 		header: '医生', dataIndex: 'doctor', width: 50, filterable: true, filter: {type: 'string'}
 	},{
-		header: '手术时间', dataIndex: 'operationTime', width: 90, filterable: true, filter: {type: 'date'}, renderer: rendererTime
+		header: '手术时间', dataIndex: 'operationTime', width: 115, filterable: true, filter: {type: 'date'}, renderer: rendererTime
 	},{
 		header: '当前审批环节', dataIndex: 'taskName', width: 130, filterable: true, filter: {type: 'string'}
 	},{
@@ -419,7 +419,7 @@
 					+"<td>物品名称</td>"
 					+"<td>单价</td>"
 					+"<td>申请数量</td>"		
-					+"<td>已入库数量</td>"
+					+"<td>入库数量</td>"
 					+"<td>使用数量</td>"
 					+"<td>结算数量</td>"
 				+"</tr>";