Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r30208 -r30217
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 30208)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 30217)
@@ -940,6 +940,9 @@
 							   autoHeight:true,
 							   hidden : (sstsConfig.enableScanSterilizationMonitoringPackage)?false:true,
 							   items:[{
+								   layout:'column',
+								   columnWidth: 0.45,
+								   items:[{
 									layout : 'form',
 									labelWidth:70,
 									labelAlign:'right',
@@ -961,7 +964,7 @@
 									   xtype : 'checkbox',
 									   inputValue :  '化学',
 									   labelSeparator:''
-								   	}]
+									   }]
 								},{
 									layout : 'form',
 									labelWidth:30,
@@ -973,144 +976,157 @@
 										inputValue :  '生物',
 										labelSeparator:''
 									}]
-								 },{
-									layout : 'form',
-									labelWidth:120,
-									items : [{
-										xtype : 'textfield',
-										disable:true,
-										fieldLabel:MONITORTOUSSEDISPLAY_EVERYTHING,
-										labelSeparator:'',
-										cls : 'fieldReadOnlyNoRemove',
-										width:0
-									}]
-								},{
-								   layout : 'form',
-								   labelWidth:30,
-								   items : [{
-									   id : 'biological_2_1',
-									   name : 'biological_2_1',
-									   fieldLabel :  '化学',
-									   xtype : 'checkbox',
-									   inputValue :  '化学',
-									   labelSeparator:'',
-									   listeners:{
-										   check:function( thiz, checked ){
-												if (checked || top.Ext.getCmp('biological_2_2').getValue() == true) {
-													top.Ext.getCmp('biological_3_1').setValue(false);
-													top.Ext.getCmp('biological_3_1').disable();
-													top.Ext.getCmp('biological_3_2').setValue(false);
-													top.Ext.getCmp('biological_3_2').disable();
-													top.Ext.getCmp('biological_4_1').setValue(false);
-													top.Ext.getCmp('biological_4_1').disable();
-													top.Ext.getCmp('biological_4_2').setValue(false);
-													top.Ext.getCmp('biological_4_2').disable();
-												} else {
-													top.Ext.getCmp('biological_3_1').enable();
-													top.Ext.getCmp('biological_3_2').enable();
-													top.Ext.getCmp('biological_4_1').enable();
-													top.Ext.getCmp('biological_4_2').enable();
-												}
+								 }]
+							   },{
+									layout:'column',
+									columnWidth: 0.55,
+									items:[{
+										layout : 'form',
+										labelWidth:100,
+										items : [{
+											xtype : 'textfield',
+											disable:true,
+											fieldLabel:MONITORTOUSSEDISPLAY_EVERYTHING+'(第1炉除外)',
+											labelSeparator:'',
+											cls : 'fieldReadOnlyNoRemove',
+											width:0
+										}]
+									},{
+									   layout : 'form',
+									   labelWidth:30,
+									   items : [{
+										   id : 'biological_2_1',
+										   name : 'biological_2_1',
+										   fieldLabel :  '化学',
+										   xtype : 'checkbox',
+										   inputValue :  '化学',
+										   labelSeparator:'',
+										   listeners:{
+											   check:function( thiz, checked ){
+													if (checked || top.Ext.getCmp('biological_2_2').getValue() == true) {
+														top.Ext.getCmp('biological_3_1').setValue(false);
+														top.Ext.getCmp('biological_3_1').disable();
+														top.Ext.getCmp('biological_3_2').setValue(false);
+														top.Ext.getCmp('biological_3_2').disable();
+														top.Ext.getCmp('biological_4_1').setValue(false);
+														top.Ext.getCmp('biological_4_1').disable();
+														top.Ext.getCmp('biological_4_2').setValue(false);
+														top.Ext.getCmp('biological_4_2').disable();
+													} else {
+														top.Ext.getCmp('biological_3_1').enable();
+														top.Ext.getCmp('biological_3_2').enable();
+														top.Ext.getCmp('biological_4_1').enable();
+														top.Ext.getCmp('biological_4_2').enable();
+													}
+											   }
 										   }
-									   }
-								   	}]
-								},{
-									layout : 'form',
-									labelWidth:30,
-									items : [{
-										id : 'biological_2_2',
-										name : 'biological_2_2',
-										fieldLabel :  '生物',
-										xtype : 'checkbox',
-										inputValue :  '生物',
-										labelSeparator:'',
-										listeners:{
-											check:function( thiz, checked ){
-												if (checked || top.Ext.getCmp('biological_2_1').getValue() == true) {
-													top.Ext.getCmp('biological_3_1').setValue(false);
-													top.Ext.getCmp('biological_3_1').disable();
-													top.Ext.getCmp('biological_3_2').setValue(false);
-													top.Ext.getCmp('biological_3_2').disable();
-													top.Ext.getCmp('biological_4_1').setValue(false);
-													top.Ext.getCmp('biological_4_1').disable();
-													top.Ext.getCmp('biological_4_2').setValue(false);
-													top.Ext.getCmp('biological_4_2').disable();
-												} else {
-													top.Ext.getCmp('biological_3_1').enable();
-													top.Ext.getCmp('biological_3_2').enable();
-													top.Ext.getCmp('biological_4_1').enable();
-													top.Ext.getCmp('biological_4_2').enable();
+										   }]
+									},{
+										layout : 'form',
+										labelWidth:30,
+										items : [{
+											id : 'biological_2_2',
+											name : 'biological_2_2',
+											fieldLabel :  '生物',
+											xtype : 'checkbox',
+											inputValue :  '生物',
+											labelSeparator:'',
+											listeners:{
+												check:function( thiz, checked ){
+													if (checked || top.Ext.getCmp('biological_2_1').getValue() == true) {
+														top.Ext.getCmp('biological_3_1').setValue(false);
+														top.Ext.getCmp('biological_3_1').disable();
+														top.Ext.getCmp('biological_3_2').setValue(false);
+														top.Ext.getCmp('biological_3_2').disable();
+														top.Ext.getCmp('biological_4_1').setValue(false);
+														top.Ext.getCmp('biological_4_1').disable();
+														top.Ext.getCmp('biological_4_2').setValue(false);
+														top.Ext.getCmp('biological_4_2').disable();
+													} else {
+														top.Ext.getCmp('biological_3_1').enable();
+														top.Ext.getCmp('biological_3_2').enable();
+														top.Ext.getCmp('biological_4_1').enable();
+														top.Ext.getCmp('biological_4_2').enable();
+													}
 												}
 											}
-										}
+										}]
 									}]
-								},{
-									layout : 'form',
-									labelWidth:70,
-									items : [{
-										xtype : 'textfield',
-										disable:true,
-										fieldLabel:MONITORTOUSSEDISPLAY_IMPLANT,
-										labelSeparator:'',
-										cls : 'fieldReadOnlyNoRemove',
-										width:0
-									}]
-								},{
-								   layout : 'form',
-								   labelWidth:30,
-								   items : [{
-									   id : 'biological_3_1',
-									   name : 'biological_3_1',
-									   fieldLabel :  '化学',
-									   xtype : 'checkbox',
-									   inputValue :  '化学',
-									   labelSeparator:''
-								   	}]
-								},{
-									layout : 'form',
-									labelWidth:30,
-									items : [{
-										id : 'biological_3_2',
-										name : 'biological_3_2',
-										fieldLabel :  '生物',
-										xtype : 'checkbox',
-										inputValue :  '生物',
-										labelSeparator:''
-									}]
-								 },{
-									layout : 'form',
-									labelWidth:120,
-									items : [{
-										xtype : 'textfield',
-										disable:true,
-										fieldLabel:MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE,
-										labelSeparator:'',
-										cls : 'fieldReadOnlyNoRemove',
-										width:0
-									}]
-								},{
-								   layout : 'form',
-								   labelWidth:30,
-								   items : [{
-									   id : 'biological_4_1',
-									   name : 'biological_4_1',
-									   fieldLabel :  '化学',
-									   xtype : 'checkbox',
-									   inputValue :  '化学',
-									   labelSeparator:''
-								   	}]
-								},{
-									layout : 'form',
-									labelWidth:30,
-									items : [{
-										id : 'biological_4_2',
-										name : 'biological_4_2',
-										fieldLabel :  '生物',
-										xtype : 'checkbox',
-										inputValue :  '生物',
-										labelSeparator:''
-									}]
-								 }]
+							   },{
+									layout:'column',
+									columnWidth: 0.45,
+									items:[{
+										layout : 'form',
+										labelWidth:70,
+										items : [{
+											xtype : 'textfield',
+											disable:true,
+											fieldLabel:MONITORTOUSSEDISPLAY_IMPLANT,
+											labelSeparator:'',
+											cls : 'fieldReadOnlyNoRemove',
+											width:0
+										}]
+									},{
+									   layout : 'form',
+									   labelWidth:30,
+									   items : [{
+										   id : 'biological_3_1',
+										   name : 'biological_3_1',
+										   fieldLabel :  '化学',
+										   xtype : 'checkbox',
+										   inputValue :  '化学',
+										   labelSeparator:''
+										   }]
+									},{
+										layout : 'form',
+										labelWidth:30,
+										items : [{
+											id : 'biological_3_2',
+											name : 'biological_3_2',
+											fieldLabel :  '生物',
+											xtype : 'checkbox',
+											inputValue :  '生物',
+											labelSeparator:''
+										}]
+									 }]
+							   },{
+									layout:'column',
+									columnWidth: 0.55,
+									items:[{
+										layout : 'form',
+										labelWidth:100,
+										items : [{
+											xtype : 'textfield',
+											disable:true,
+											fieldLabel:MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE,
+											labelSeparator:'',
+											cls : 'fieldReadOnlyNoRemove',
+											width:0
+										}]
+									},{
+									   layout : 'form',
+									   labelWidth:30,
+									   items : [{
+										   id : 'biological_4_1',
+										   name : 'biological_4_1',
+										   fieldLabel :  '化学',
+										   xtype : 'checkbox',
+										   inputValue :  '化学',
+										   labelSeparator:''
+										   }]
+									},{
+										layout : 'form',
+										labelWidth:30,
+										items : [{
+											id : 'biological_4_2',
+											name : 'biological_4_2',
+											fieldLabel :  '生物',
+											xtype : 'checkbox',
+											inputValue :  '生物',
+											labelSeparator:''
+										}]
+									 }]
+							   }]
 							  }, {
 								columnWidth : 0.6,
 								layout : 'form',
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r30208 -r30217
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30208)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30217)
@@ -1308,9 +1308,9 @@
                 var isTraceable = pNode.attributes.isTraceable;
                 var unTraceable = pNode.attributes.unTraceable || '';
                 var newTraceable = '';
-                if(unTraceable !== ''){
-                    newTraceable = (unTraceable == '是')?'否':'是';
-                }else {
+                if (unTraceable !== '') {
+                    newTraceable = (unTraceable == '是') ? '否' : '是';
+                } else {
                     newTraceable = '';
                 }
                 var params = {
@@ -2610,9 +2610,9 @@
         var unTraceable = tempNode.attributes.unTraceable || '';
         var isTraceable = tempNode.attributes.isTraceable || '';
         if (thiz.editColIndex == 'amount') {
-            if(unTraceable == '是' || isTraceable == '否'){
+            if (unTraceable == '是' || isTraceable == '否') {
                 return true;
-            }else {
+            } else {
                 return false;
             }
         } else {
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r30208 -r30217
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 30208)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 30217)
@@ -889,6 +889,32 @@
 	});
 	return applyDateDataArray;
 }
+
+//打印监测包条码
+function printMonitorTousseBarcodes(printAmount,type,callback){
+	top.Ext.MessageBox.show({
+		msg: '正在打印'+type+'条码，请稍候...',
+		width: 300,
+		wait: true,
+		waitConfig: { interval: 300 }
+	});
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createMonitorTousseBarcodes.do',
+		params: {
+			amount: printAmount,
+			type:type
+		},
+		success: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			hideMessageBox(true);
+			callback(result);
+		},
+		failure: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			showResult(result.cause);
+		}
+	});
+}
 Ext.onReady(function () {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
@@ -1346,50 +1372,33 @@
 							var printAmount = top.Ext.getCmp('printAmount').getValue();
 							if (isNaN(printAmount) == false) {
 								if(monitorTousseType_1){
-									var type = top.Ext.getCmp('monitorTousseType_1').inputValue;
-									
-									Ext.Ajax.request({
-										url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createMonitorTousseBarcodes.do',
-										params: {
-											amount: printAmount,
-											type:type
-										},
-										success: function (response, options) {
-											var result = Ext.decode(response.responseText);
-											for (var i = 0; i < result.data.length; i++) {
-												var barcode = result.data[i].barcode;
-												print_container(barcode, '化学监测包', unitName);
-											}
-											hideMessageBox(false);
-										},
-										failure: function (response, options) {
-											var result = Ext.decode(response.responseText);
-											showResult(result.cause);
+									var type1 = top.Ext.getCmp('monitorTousseType_1').inputValue;
+									printMonitorTousseBarcodes(printAmount,type1,function(result){
+										for (var i = 0; i < result.data.length; i++) {
+											var barcode = result.data[i].barcode;
+											print_container(barcode, type1, unitName);
 										}
-									});
+
+										if(monitorTousseType_2){
+											var type2 = top.Ext.getCmp('monitorTousseType_2').inputValue;
+											printMonitorTousseBarcodes(printAmount,type2,function(result){
+												for (var i = 0; i < result.data.length; i++) {
+													var barcode = result.data[i].barcode;
+													print_container(barcode, type2, unitName);
+												}
+											})
+										}
+									})
 								}
-								if(monitorTousseType_2){
+
+								if(!monitorTousseType_1 && monitorTousseType_2){
 									var type = top.Ext.getCmp('monitorTousseType_2').inputValue;
-									
-									Ext.Ajax.request({
-										url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createMonitorTousseBarcodes.do',
-										params: {
-											amount: printAmount,
-											type:type
-										},
-										success: function (response, options) {
-											var result = Ext.decode(response.responseText);
-											for (var i = 0; i < result.data.length; i++) {
-												var barcode = result.data[i].barcode;
-												print_container(barcode, '生物监测包', unitName);
-											}
-											hideMessageBox(false);
-										},
-										failure: function (response, options) {
-											var result = Ext.decode(response.responseText);
-											showResult(result.cause);
+									printMonitorTousseBarcodes(printAmount,type,function(result){
+										for (var i = 0; i < result.data.length; i++) {
+											var barcode = result.data[i].barcode;
+											print_container(barcode, type, unitName);
 										}
-									});
+									})
 								}
 							}else {
 								showResult("打印份数必须是数字，请重新输入!");