Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
===================================================================
diff -u -r15986 -r16098
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 15986)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 16098)
@@ -93,7 +93,7 @@
 	});
 	
 	var recordColumns = [
-	     {header : "科室",width : 200,dataIndex : 'orgUnitName'},
+	     {header : "科室",width : 200,dataIndex : 'depart'},
   	     {header : "装配记录时间",width : 150,dataIndex : 'packTime',renderer:myDateFormatBySecond}, 
   	     {header : "器械包",width : 250,dataIndex : 'tousseName',renderer:filterUnderScoreName},
   	     {header : "数量",width : 80,dataIndex : 'amount'},
@@ -103,6 +103,7 @@
 	var recordReaderDetail = [
    	     {name : 'id'}, 
    	     {name : 'orgUnitName'},
+   	     {name : 'depart'},
    	     {name : 'packTime'}, 
    	     {name : 'packer'},
    	     {name : 'tousseName'},
@@ -115,6 +116,7 @@
 	        {type: 'numeric',  dataIndex: 'id'},
 	        {type: 'date',  dataIndex: 'packTime'},
 	        {type: 'string',  dataIndex: 'packer'},
+	        {type: 'string',  dataIndex: 'depart'},
 	        {type: 'string',  dataIndex: 'tousseName'},
 	        {type: 'numeric',  dataIndex: 'amount'}
 	    ]
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r16073 -r16098
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 16073)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 16098)
@@ -120,6 +120,7 @@
 	           {name: 'id',type: "int" },
 	           {name: 'packTimeStr'},
 	           {name: 'orgUnitName'},
+	           {name: 'depart'},
 	           {name: 'packer'},
 	           {name: 'tousseName'},
 	           {name: 'amount'}
@@ -2610,7 +2611,7 @@
 //    							    height: document.body.clientHeight-25,
     							    viewConfig : {loadMask : {msg : '正在加载，请稍候...'}},
     							    columns: [
-    							        {header: '科室', dataIndex: 'orgUnitName',width: 200}, 
+    							        {header: '科室', dataIndex: 'depart',width: 200}, 
     								    {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, 
     								    {header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName}, 
     								    {header: '数量', dataIndex: 'amount'}, 
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16072 -r16098
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16072)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16098)
@@ -2603,6 +2603,9 @@
 		packingRecord.setTousseType(tousseDefinition
 				.getTousseType());
 		packingRecord.setTousseDefinitionId(tousseDefinition.getId());
+		if(currentPackingTask != null){
+			packingRecord.setDepart(currentPackingTask.getDepartment());
+		}
 		// 如果装配的是消毒物品，取装配任务的数量作为装配记录的数量(会导致历史装配数量为该装配任务的数量,所以暂注释SYF20160506)
 		/*if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())){
 			packingAmount = currentPackingTask.getAmount();