Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js
===================================================================
diff -u -r17440 -r17448
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js	(.../washTransitionRecordView.js)	(revision 17440)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js	(.../washTransitionRecordView.js)	(revision 17448)
@@ -1,4 +1,4 @@
-var entityName = '清洗交接';
+var entityName = '清洗交接记录';
 var grid;
 
 function rendererFun(value, metaData, record, rowIndex, colIndex, store, view) {
@@ -18,23 +18,29 @@
   	    {name : 'id', mapping : 'id'},
 	    {name : 'handover', mapping : 'handover'},
 	    {name : 'takeover', mapping : 'takeover'},
-	    {name : 'transitionTime', mapping : 'transitionTime'}
+	    {name : 'transitionTime', mapping : 'transitionTime'},
+	    {name : 'tousseCount', mapping : 'tousseCount'},
+	    {name : 'materialCount', mapping : 'materialCount'}
 	];
 	
 	var columns = [{
-		header: "清洗人", dataIndex: 'handover', width: 70, minWidth:70, maxWidth:70, filterable: false, filter: {type: 'string'}, renderer : rendererFun
+		header: "清洗人", dataIndex: 'handover', width: 70, minWidth:70, maxWidth:70, filterable: true, filter: {type: 'string'}, renderer : rendererFun
 	},{
-		header: "配包人", dataIndex: 'takeover', width: 70, minWidth:70, maxWidth:70, filterable: false, filter: {type: 'string'}
+		header: "配包人", dataIndex: 'takeover', width: 70, minWidth:70, maxWidth:70, filterable: true, filter: {type: 'string'}
 	},{
-		header: "交接时间", dataIndex: 'transitionTime', width: 150, minWidth: 150, filterable: false, filter: {type: 'date'}, renderer : rendererTransitionTime
+		header: "交接时间", dataIndex: 'transitionTime', width: 150, minWidth: 150, filterable: true, filter: {type: 'date'}, renderer : rendererTransitionTime
+	},{
+		header: "器械包数量", dataIndex: 'tousseCount', width: 80, minWidth: 80, filterable: true, filter: {type: 'numeric'}
+	},{
+		header: "器械数量", dataIndex: 'materialCount', width: 70, minWidth: 70, filterable: true, filter: {type: 'numeric'}
 	}];
 	
 	grid = Ext4.create('ExtJs.forgon4.Grid', {
 		title : entityName,
 		dataUrl : WWWROOT + '/disinfectSystem/washTransitionRecordAction!loadWashTransitionRecordList.do',
 		fields : fields,
 		columns : columns,
-		sorters : { property : 'transitionTime',direction: 'DESC'}
+		sorters : { property : 'transitionTime', direction: 'DESC'}
 	});
 	
 	var viewport = Ext4.create('Ext4.Viewport', {
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
===================================================================
diff -u -r17441 -r17448
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java	(.../WashTransitionRecordAction.java)	(revision 17441)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java	(.../WashTransitionRecordAction.java)	(revision 17448)
@@ -71,7 +71,23 @@
 	 * @return
 	 */
 	public void loadWashTransitionRecordList() {
-		ExtJsEntity entity =ExtJsUtil.buildSQLEntity("select id,handover,takeover,transitionTime ", " from WashTransitionRecord where 1=1 ", "");
+		String select = "select id,handover,takeover,transitionTime,tousseCount,materialCount ";
+		String where = 	"from("
+							+ "select t1.id,t1.handover,t1.takeover,t1.transitionTime,sum(t1.tousseCount) tousseCount,sum(t1.materialCount) materialCount "
+							+ "from("
+								+ "select wtr.id,wtr.handover,wtr.takeover,wtr.transitionTime,sum(wti.amount) tousseCount,0 materialCount "
+								+ "from WashTransitionRecord wtr join WashTransitionItem wti on wti.washTransitionRecordId=wtr.id "
+								+ "group by wtr.id,wtr.handover,wtr.takeover,wtr.transitionTime "
+								+ "union all "
+								+ "select wtr.id,wtr.handover,wtr.takeover,wtr.transitionTime,0 tousseCount,sum(wtm.amount*wti.amount) materialCount "
+								+ "from WashTransitionRecord wtr join WashTransitionItem wti on wti.washTransitionRecordId=wtr.id "
+								+ "join WashTransitionMaterial wtm on wtm.washTransitionItemId=wti.id "
+								+ "group by wtr.id,wtr.handover,wtr.takeover,wtr.transitionTime,wti.tousseName "
+							+ ") t1 group by t1.id,t1.handover,t1.takeover,t1.transitionTime"
+						+ ") temp where 1=1 "
+						;
+		
+		ExtJsEntity entity =ExtJsUtil.buildSQLEntity(select, where, "");
 		JSONObject result = extGridUtils.getPagedResult(entity);
 		StrutsResponseUtils.output(result);
 	}
@@ -105,7 +121,9 @@
 				JSONArray jMaterials = new JSONArray();
 				for (WashTransitionMaterial  material : materials) {
 					JSONObject jMaterial = new JSONObject();
-					jMaterial.put("goodsName", material.getMaterialName());
+					String goodsName = StringTools.isNotBlank(material.getSpecification()) ? String.format("%s[%s]", material.getMaterialName(), material.getSpecification())
+							: material.getMaterialName();
+					jMaterial.put("goodsName", goodsName);
 					Integer temp = material.getAmount() == null ? 0 : material.getAmount();
 					materialTotal = materialTotal + temp*tousseAmount;
 					jMaterial.put("idCardBarcodeOrAmount", temp);