Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r29935 -r30024
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 29935)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30024)
@@ -6913,7 +6913,7 @@
 							SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.wareHouseId", wareHouseIds),
 							SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.wareHouseId2", wareHouseIds));
 				}
-				sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil from %s ti "
+				sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ti.depart from %s ti "
 						+ "inner join %s td on td.id =ti.tousseDefinition_id "
 						+ "inner join %s bd on bd.id=ti.id "
 						+ "where  tousseFixedBarcode=0 %s %s"
@@ -6928,7 +6928,7 @@
 						TousseInstance.STATUS_DISINFECTED,
 						TousseInstance.STATUS_STERILED);
 			}else{
-				sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil from %s ti "
+				sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ti.depart from %s ti "
 						+ "inner join %s  i on i.id=ti.invoice_id inner join %s td on td.id =ti.tousseDefinition_id "
 						+ "inner join %s ds on ds.tousseDefinition_id=ti.tousseDefinition_id inner join %s bd on bd.id=ti.id "
 						+ "where tousseFixedBarcode=0 and i.departCoding=ds.departCoding and i.departCoding='%s' "
@@ -6985,15 +6985,23 @@
     		Date signedDate = rs.getTimestamp("signedDate");
     		String signedUser = rs.getString("signedUser");
     		String barcode = rs.getString("barcode");
+    		String invoiceSender = rs.getString("invoiceSender");
+    		String depart = rs.getString("depart");
     		if(signedDate != null){
     			obj.put("signedDate", sdf.format(signedDate));		
     		}
     		Date validUntil = rs.getTimestamp("validUntil");
     		if(validUntil != null){
     			obj.put("validUntil", sdf.format(validUntil));	
     		}
+    		Date invoiceSendTime = rs.getTimestamp("invoiceSendTime");
+    		if(invoiceSendTime != null){
+    			obj.put("invoiceSendTime", sdf.format(invoiceSendTime));
+    		}
     		obj.put("signedUser", signedUser);
     		obj.put("barcode", barcode);
+    		obj.put("invoiceSender", invoiceSender);
+    		obj.put("depart", depart);
 		}else if(TousseInstance.STATUS_USED.equals(status)){
     		Date useTime = rs.getTimestamp("useTime");
     		String patientName = rs.getString("patientName");
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r21820 -r30024
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 21820)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 30024)
@@ -64,7 +64,7 @@
 		Map<String, String> sqlWhereParamMap = gridManager
 				.getParamFromView(parameterMap);
 		StringBuilder sqlBuilder = new StringBuilder();
-		sqlBuilder.append("(select name , orgUnitName , sum(amount) amount from GoodsStock ");
+		sqlBuilder.append("(select name , orgUnitCode, orgUnitName , sum(amount) amount from GoodsStock ");
 		sqlBuilder.append(" WHERE 1=1 and amount > 0 and goodsType='"+GoodsStock.TYPE_TOUSSE
 						+"' and tousseDefinitionId is not null");
 		
@@ -84,7 +84,7 @@
 
 		sqlBuilder.append(" and orgUnitCode='" + AcegiHelper.getCurrentOrgUnitCode() + "'");  //只查用户当前科室的物品的库存
 		
-		sqlBuilder.append(" group by name , orgUnitName ) vw");
+		sqlBuilder.append(" group by name , orgUnitCode, orgUnitName ) vw");
 
 //		int start = 0;
 //		int pageSize = 20;
@@ -118,6 +118,7 @@
 				GoodsStock goodsStock = new GoodsStock();
 				goodsStock.setAmount(rs.getInt("amount"));
 				goodsStock.setName(rs.getString("name"));
+				goodsStock.setOrgUnitCode(rs.getString("orgUnitCode"));
 				goodsStock.setOrgUnitName(rs.getString("orgUnitName"));
 				goodsStockList.add(goodsStock);
 			}