Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r21686 -r21754
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 21686)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 21754)
@@ -253,6 +253,26 @@
 					+ "%'");
 		}
 		
+		String taskGroup = sqlWhereParamMap.get("taskGroup");			//装配任务组
+		if(StringUtils.isNotBlank(taskGroup)){
+			String[] groups = taskGroup.split(",");
+			String taskGroupSql = "";
+			if(!"全部".equals(groups[0])){
+				if(groups.length == 1){
+					taskGroupSql += String.format(" po.taskGroup = '%s' ", groups[0]);
+				}else{
+					taskGroupSql +=" po.taskGroup in (";
+					for ( int i = 0; i<groups.length;i++ ){
+						taskGroupSql += String.format(" '%s',",groups[i].trim());
+					}
+					taskGroupSql = taskGroupSql.substring(0,taskGroupSql.length()-1);
+					taskGroupSql +=") ";
+				}
+				sqlBuilder.append(String.format(" AND (%s) ",taskGroupSql));
+			}
+		}
+		
+		
 		String tousseStatus = sqlWhereParamMap.get("tousseStatus");		//器械包状态
 		if (StringUtils.isNotBlank(tousseStatus)){
 			String[] statuses = tousseStatus.split(",");
@@ -268,8 +288,6 @@
 					tousseStatusSql = tousseStatusSql.substring(0,tousseStatusSql.length()-1);
 					tousseStatusSql +=") ";
 				}
-			}
-			if(!tousseStatusSql.isEmpty()){
 				sqlBuilder.append(String.format(" AND (%s)",tousseStatusSql));
 			}
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r21723 -r21754
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 21723)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 21754)
@@ -32,6 +32,20 @@
 		combo.deselectAll();
 	}
 }
+var taskGroupMultiSelectStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/taskGroupAction!loadTaskGroupStore.do',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		root : 'data',
+		totalProperty: 'totalCount'
+	},[
+	    {name : 'id',mapping : 'valueField'},
+	    {name : 'taskGroupName',mapping : 'displayField'}
+	  ]
+	)
+});
 
 var departmentComboBoxStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -107,9 +121,8 @@
 	}else{
 		$Id('parm_s_department').value = Ext.getCmp('department').getValue();	
 	}
-	
-	
 	$Id('parm_s_tousseStatus').value = $Id('tousseStatus').value;		//器械包状态
+	$Id('parm_s_taskGroup').value = $Id('taskGroup').value;				//装配任务组
 	
 	
 	Ext.getCmp('barcodeSearch').setValue('');
@@ -428,6 +441,31 @@
 					}
 				}]
 			},{
+				columnWidth : .25,
+				layout : 'form',
+                labelWidth : fontSize == 12 ? 70 : 90,
+				labelAlign:"right",
+				items : [{
+					xtype : 'multiSelect',
+					triggerAction : 'all',
+					fieldLabel : '装配任务组',
+					id : 'taskGroup',
+					name : 'taskGroup',
+					mode : 'remote',
+					forceSelection : false,
+					allowBlank : true,
+					editable : false,
+					anchor : '95%',
+					valueField : 'id',
+					displayField : 'taskGroupName',
+					listeners : {
+						select : function(combo, record, index){
+							onAllChoosedOrNot(combo, record,index,'taskGroupName');
+						}
+					},
+					store : taskGroupMultiSelectStore
+	             }]
+			},{
 				columnWidth : .27,
 				layout : 'form',
                 labelWidth : fontSize == 12 ? 81 : 110,
@@ -587,7 +625,7 @@
 					store : departmentComboBoxStore,
 					triggerAction : 'all',
 					mode : 'remote',
-					forceSelection : false,
+					forceSelection : true,
 					allowBlank : true,
 					editable : true,
 					queryParam : 'spell',
@@ -667,6 +705,8 @@
 						Ext.getCmp('department').setValue("");
 						$Id('tousseStatus').value="";
 						Ext.getCmp('tousseStatus').setValue("");
+						$Id('taskGroup').value="";
+						Ext.getCmp('taskGroup').setValue("");
 						barcodes = '';
 					}
 				}]
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r21561 -r21754
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 21561)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 21754)
@@ -118,6 +118,9 @@
     <input type="hidden" id="parm_s_department" name="parm_s_department">
     <!--  新增器械包状态过滤条件 -->
     <input type="hidden" id="parm_s_tousseStatus" name="parm_s_tousseStatus">
+    <!--  新增装配任务组过滤条件 -->
+    <input type="hidden" id="parm_s_taskGroup" name="parm_s_taskGroup">
+    
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r21662 -r21754
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 21662)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 21754)
@@ -1446,19 +1446,20 @@
 					
 					//灭菌记录
 					top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID);  //灭菌记录_灭菌记录id（隐藏域）
-					top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);  //灭菌记录_灭菌记录数量（隐藏域）
-					top.Ext.getCmp('sterilizerName').setValue(instance.sterilizerName);  //灭菌记录_灭菌炉
-					top.Ext.getCmp('sterilizationType').setValue(instance.sterilingType);  //灭菌记录_灭菌程序
-					top.Ext.getCmp('frequency').setValue(instance.sterileFrequency);  //灭菌记录_炉次
-					top.Ext.getCmp('sterilizationUser').setValue(instance.sterilizationUser);  //灭菌记录_灭菌员
-					top.Ext.getCmp('sterilizationFinishConfirm').setValue(result.sterilizationFinishConfirm);  //灭菌记录_灭菌确认人
-					top.Ext.getCmp('startDate').setValue(instance.sterileStartTime);  //灭菌记录_开始时间
-					top.Ext.getCmp('endDate').setValue(instance.sterileEndTime);  //灭菌记录_结束时间
-					top.Ext.getCmp('sterilizationBasket').setValue(instance.sterilizationBasket);  //灭菌记录_灭菌确认人灭菌篮筐
-					top.Ext.getCmp('sterilizationPosition').setValue(result.sterilizationPosition);  //灭菌记录_灭菌位置
-					top.Ext.getCmp('cycleCounter').setValue(result.cycleCounter);  //灭菌记录_循环次数
-
+					if(result.sterilizationRecordID != 0){
+						top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);  //灭菌记录_灭菌记录数量（隐藏域）
+						top.Ext.getCmp('sterilizerName').setValue(instance.sterilizerName);  //灭菌记录_灭菌炉
+						top.Ext.getCmp('sterilizationType').setValue(instance.sterilingType);  //灭菌记录_灭菌程序
+						top.Ext.getCmp('frequency').setValue(instance.sterileFrequency);  //灭菌记录_炉次
+						top.Ext.getCmp('sterilizationUser').setValue(instance.sterilizationUser);  //灭菌记录_灭菌员
+						top.Ext.getCmp('sterilizationFinishConfirm').setValue(result.sterilizationFinishConfirm);  //灭菌记录_灭菌确认人
+						top.Ext.getCmp('startDate').setValue(instance.sterileStartTime);  //灭菌记录_开始时间
+						top.Ext.getCmp('endDate').setValue(instance.sterileEndTime);  //灭菌记录_结束时间
+						top.Ext.getCmp('sterilizationBasket').setValue(instance.sterilizationBasket);  //灭菌记录_灭菌确认人灭菌篮筐
+						top.Ext.getCmp('sterilizationPosition').setValue(result.sterilizationPosition);  //灭菌记录_灭菌位置
+					}
 					
+					
 					//废弃记录
 					if(instance.operateUser != null && instance.operateUser.length > 0){
 						top.Ext.getCmp('operateUser').setValue(instance.operateUser);  //废弃记录_操作人