Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r27541 -r27676
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 27541)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 27676)
@@ -8,6 +8,8 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@include file="/common/taglibs.jsp"%>
 <%@include file="/common/includeExtJsAndCss.jsp"%>
+<%@include file="/common/include_Ext42_Js.jsp"%>
+<%@include file="/disinfectsystem/print/print.jsp"%>
 <%
     LoginUserData userData = AcegiHelper.getLoginUser();
     request.setAttribute("userName",userData.getUserFullName());
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp
===================================================================
diff -u -r24239 -r27676
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp	(.../sterilizerView.jsp)	(revision 24239)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp	(.../sterilizerView.jsp)	(revision 27676)
@@ -54,6 +54,10 @@
 var BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED = '<%=Sterilizer.BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED%>';  //有植入物为合格否则为无
 var BIOLOGICALMONITORINGDISPLAY_FOREIGN_TOUSSE_QUALIFIED = '<%=Sterilizer.BIOLOGICALMONITORINGDISPLAY_FOREIGN_TOUSSE_QUALIFIED%>';  //有外来器械包为合格否则为无
 
+var MONITORTOUSSEDISPLAY_EVERYTHING = '<%=Sterilizer.MONITORTOUSSEDISPLAY_EVERYTHING%>';  //每炉
+var MONITORTOUSSEDISPLAY_FIRST = '<%=Sterilizer.MONITORTOUSSEDISPLAY_FIRST%>';  //每天第一炉
+var MONITORTOUSSEDISPLAY_IMPLANT = '<%=Sterilizer.MONITORTOUSSEDISPLAY_IMPLANT%>';  //有植入物时
+var MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE = '<%=Sterilizer.MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE%>';  //有外来器械包时
 /**
  * 《灭菌炉添加》权限
  */
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r27547 -r27676
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 27547)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 27676)
@@ -1022,90 +1022,136 @@
 	if((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm){
 		$Id("parm_s_needFinishConfirm").value = "true";
 	}
-	
-	var requestTbar = new Ext.Toolbar({  
-	    height : 25,
-		items:[{
-			text : '灭菌日期:'
-		},{
-			xtype : 'combo',
-			id : 'requestTimeQuantum',
-			name : 'requestTimeQuantum',
-			valueField : 'value',
-			displayField : 'key',
-			allowBlank : true,
-			editable : false,
-			width : 120,
-			mode:'local',
-			store : new Ext.data.SimpleStore({
-				data: getTimeComboData(),
-				fields:['key','value']
-			}),
-			forceSelection : true,
-			triggerAction : 'all',
-			listeners : {
-				select : function(combo, record, index){
-					var value = combo.getValue();
-					$Id("parm_s_requestTimeQuantum").value = value;
-					var timeArr = value.split(";");
-					Ext.getCmp('requestStartTime').setValue(timeArr[0]);
-					Ext.getCmp('requestEndTime').setValue(timeArr[1]);
-					grid.getStore().lastOptions.params['start'] = 0;
-					grid.dwrReload();
-				}
-			},
-			anchor : '95%'
-		},'-',{
-			text : '开始时间:'
-		},{
-			xtype : 'datefieldWithMin',
-			id : 'requestStartTime',
-			name : 'requestStartTime',
-			width : 130,
-			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-			selectOnFocus :true,
-			format : 'Y-m-d H:i',
-			theHours : 0,
-			theMinutes : 0
-		},'-',{
-			text : '结束时间:'
-		},{
-			xtype : 'datefieldWithMin',
-			width : 130,
-			id : 'requestEndTime',
-			name : 'requestEndTime',
-			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-			selectOnFocus :true,
-			format : 'Y-m-d H:i',
-			theHours : 23,
-			theMinutes : 59,
-			listeners : {
-				render : function(_this) {
-					var requestTimeQuantumCombo = Ext.getCmp('requestTimeQuantum');
-					var value = requestTimeQuantumCombo.store.data.items[0].data.value;
-					requestTimeQuantumCombo.setValue(value);
-					var timeArr = value.split(";");
-					Ext.getCmp('requestStartTime').setValue(timeArr[0]);
-					Ext.getCmp('requestEndTime').setValue(timeArr[1]);
-				}
+
+	var printCode = {};
+	var items = [{
+		text : '灭菌日期:'
+	},{
+		xtype : 'combo',
+		id : 'requestTimeQuantum',
+		name : 'requestTimeQuantum',
+		valueField : 'value',
+		displayField : 'key',
+		allowBlank : true,
+		editable : false,
+		width : 120,
+		mode:'local',
+		store : new Ext.data.SimpleStore({
+			data: getTimeComboData(),
+			fields:['key','value']
+		}),
+		forceSelection : true,
+		triggerAction : 'all',
+		listeners : {
+			select : function(combo, record, index){
+				var value = combo.getValue();
+				$Id("parm_s_requestTimeQuantum").value = value;
+				var timeArr = value.split(";");
+				Ext.getCmp('requestStartTime').setValue(timeArr[0]);
+				Ext.getCmp('requestEndTime').setValue(timeArr[1]);
+				grid.getStore().lastOptions.params['start'] = 0;
+				grid.dwrReload();
 			}
-		},'-',{
-		 	text : '查询',
+		},
+		anchor : '95%'
+	},'-',{
+		text : '开始时间:'
+	},{
+		xtype : 'datefieldWithMin',
+		id : 'requestStartTime',
+		name : 'requestStartTime',
+		width : 130,
+		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+		selectOnFocus :true,
+		format : 'Y-m-d H:i',
+		theHours : 0,
+		theMinutes : 0
+	},'-',{
+		text : '结束时间:'
+	},{
+		xtype : 'datefieldWithMin',
+		width : 130,
+		id : 'requestEndTime',
+		name : 'requestEndTime',
+		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+		selectOnFocus :true,
+		format : 'Y-m-d H:i',
+		theHours : 23,
+		theMinutes : 59,
+		listeners : {
+			render : function(_this) {
+				var requestTimeQuantumCombo = Ext.getCmp('requestTimeQuantum');
+				var value = requestTimeQuantumCombo.store.data.items[0].data.value;
+				requestTimeQuantumCombo.setValue(value);
+				var timeArr = value.split(";");
+				Ext.getCmp('requestStartTime').setValue(timeArr[0]);
+				Ext.getCmp('requestEndTime').setValue(timeArr[1]);
+			}
+		}
+	},'-',{
+		 text : '查询',
+		minWidth : 50,
+		iconCls : 'icon_search',
+		handler : function() {
+			var requestStartTime = Ext.getCmp('requestStartTime');
+			var requestEndTime = Ext.getCmp('requestEndTime');
+			if (requestStartTime.isValid() && requestEndTime.isValid()) {
+				$Id("parm_s_requestTimeQuantum").value = Ext.util.Format.date(requestStartTime.getValue(), 'Y-m-d H:i') + ';' +Ext.util.Format.date(requestEndTime.getValue(), 'Y-m-d H:i');
+				grid.getStore().lastOptions.params['start'] = 0;
+				grid.dwrReload();
+			} else {
+				showResult("请填写正确的时间格式！", null , sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+			}
+		}
+	}];
+	if(sstsConfig.enableScanSterilizationMonitoringPackage){
+		items = items.concat(['-',{
+			text : '打印监测包条码',
 			minWidth : 50,
-			iconCls : 'icon_search',
+			iconCls : 'icon_print',
 			handler : function() {
-				var requestStartTime = Ext.getCmp('requestStartTime');
-				var requestEndTime = Ext.getCmp('requestEndTime');
-				if (requestStartTime.isValid() && requestEndTime.isValid()) {
-					$Id("parm_s_requestTimeQuantum").value = Ext.util.Format.date(requestStartTime.getValue(), 'Y-m-d H:i') + ';' +Ext.util.Format.date(requestEndTime.getValue(), 'Y-m-d H:i');
-					grid.getStore().lastOptions.params['start'] = 0;
-					grid.dwrReload();
-				} else {
-					showResult("请填写正确的时间格式！", null , sstsConfig.messagePauseTimeOnSterilizationRecordPage);
-				}
+				top.Ext.MessageBox.prompt("打印监测包条码", "请输入打印数量：", function(bu, txt) {
+					if(txt !== ''){
+						Ext.Ajax.request({
+							url :  WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createBiologyMonitorTousseBarcodes.do',
+							params : {
+								amount : txt,
+							},
+							success : function(response, options) {
+								var result = Ext.decode(response.responseText);
+								var barcodes = [];
+								for(var i=0;i<result.data.length;i++){
+									var barcode = result.data[i].barcode;
+									print_container(barcode,'灭菌监测包','');
+								}
+							},
+							failure : function(response, options) {
+								var result = Ext.decode(response.responseText);
+								showResult(result.cause);
+							}
+						});
+					}
+				});
 			}
-		}]  
+		}]);
+	}
+	var requestTbar = new Ext.Toolbar({  
+	    height : 25,
+		items:items
 	});
+	function print_container(barcode,name,unitName,printType) {
+		var obj = {
+				barcode:barcode,
+				name:name,
+				unitName:'',
+				defaultPrintFun: function(){
+					defaultPrint(barcode,name,'');
+				},
+				dataSourceName: '篮筐',
+				styleName: '默认'
+		}
+		printObjWithdefaultPrintFun(obj);
+	};
 	grid = new Ext.ux.ForgonPageGrid({
 		title : '灭菌列表',
 		tbar : tbar,
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r26792 -r27676
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 26792)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 27676)
@@ -282,7 +282,6 @@
 		name : 'id',
 		name : 'sterilisation'
 	}]);
-	
 	var consumablesConfig = Ext.data.Record.create([{
 		name : 'id',
 		name : 'consumable'
@@ -336,6 +335,10 @@
 							name : 'biologicalMonitoringDisplay',
 							id : 'biologicalMonitoringDisplay'
 						},{
+							xtype : 'hidden',
+							name : 'monitorTousseDisplay',
+							id : 'monitorTousseDisplay'
+						},{
 							layout : 'column',
 							items : [{
 								columnWidth : 0.6,
@@ -788,95 +791,7 @@
 											anchor : '95%',
 											store : needNoticeSterilisationStore
 										}]
-									},{
-				             		columnWidth: 0.97,
-									layout : 'column',
-									xtype:'fieldset',
-									title:'生物监测的结果默认值',
-									height:38,
-									autoHeight:true,
-									items:[{
-							        	layout : 'form',
-										columnWidth : .5,
-										labelWidth : 170,
-										items : [{
-											id : 'qualified',
-											name : 'qualified',
-											fieldLabel :  BIOLOGICALMONITORINGDISPLAY_QUALIFIED,
-											xtype : 'checkbox',
-											inputValue :  BIOLOGICALMONITORINGDISPLAY_QUALIFIED,
-											listeners:{
-												check:function( thiz, checked ){
-													if (checked) {
-														top.Ext.getCmp('firstQualified').setValue(false);
-														top.Ext.getCmp('firstQualified').disable();
-														top.Ext.getCmp('implantQualified').setValue(false);
-														top.Ext.getCmp('implantQualified').disable();
-														top.Ext.getCmp('foreignTousseQualified').setValue(false);
-														top.Ext.getCmp('foreignTousseQualified').disable();
-													} else {
-														top.Ext.getCmp('firstQualified').enable();
-														top.Ext.getCmp('implantQualified').enable();
-														top.Ext.getCmp('foreignTousseQualified').enable();
-													}
-												}
-											}
-										}]
-									},{
-							        	layout : 'form',
-							        	labelWidth : 170,
-										columnWidth : .5,
-										items : [{
-											id : 'firstQualified',
-											name : 'firstQualified',
-											fieldLabel :  BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED,
-											xtype : 'checkbox',
-											inputValue :  BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED
-										}]
-									},{
-							        	layout : 'form',
-										columnWidth : .5,
-										labelWidth : 170,
-										items : [{
-											id : 'implantQualified',
-											name : 'implantQualified',
-											fieldLabel :  BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED,
-											xtype : 'checkbox',
-											inputValue :  BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED,
-											listeners:{
-												check:function( thiz, checked ){
-													if (checked) {
-														top.Ext.getCmp('qualified').setValue(false);
-														top.Ext.getCmp('qualified').disable();
-													} else if (!top.Ext.getCmp('foreignTousseQualified').getValue()) {
-														top.Ext.getCmp('qualified').enable();
-													}
-												}
-											}
-										}]
-									},{
-							        	layout : 'form',
-										columnWidth : .5,
-										labelWidth : 170,
-										items : [{
-											id : 'foreignTousseQualified',
-											name : 'foreignTousseQualified',
-											fieldLabel :  BIOLOGICALMONITORINGDISPLAY_FOREIGN_TOUSSE_QUALIFIED,
-											xtype : 'checkbox',
-											inputValue :  BIOLOGICALMONITORINGDISPLAY_FOREIGN_TOUSSE_QUALIFIED,
-											listeners:{
-												check:function( thiz, checked ){
-													if (checked) {
-														top.Ext.getCmp('qualified').setValue(false);
-														top.Ext.getCmp('qualified').disable();
-													} else if (!top.Ext.getCmp('implantQualified').getValue()) {
-														top.Ext.getCmp('qualified').enable();
-													}
-												}
-											}
-										}]
 									}]
-				             	  }]
 							}, {
 								columnWidth : 0.4,
 								layout : 'form',
@@ -913,7 +828,209 @@
 										}
 									}]
 								})]
-							}, {
+							},{
+								columnWidth: 0.6,
+							   layout : 'column',
+							   xtype:'fieldset',
+							   title:'生物监测的结果默认值',
+							   height:38,
+							   autoHeight:true,
+							   items:[{
+								   layout : 'form',
+								   columnWidth : .5,
+								   labelWidth : 150,
+								   items : [{
+									   id : 'qualified',
+									   name : 'qualified',
+									   fieldLabel :  BIOLOGICALMONITORINGDISPLAY_QUALIFIED,
+									   xtype : 'checkbox',
+									   inputValue :  BIOLOGICALMONITORINGDISPLAY_QUALIFIED,
+									   listeners:{
+										   check:function( thiz, checked ){
+											   if (checked) {
+												   top.Ext.getCmp('firstQualified').setValue(false);
+												   top.Ext.getCmp('firstQualified').disable();
+												   top.Ext.getCmp('implantQualified').setValue(false);
+												   top.Ext.getCmp('implantQualified').disable();
+												   top.Ext.getCmp('foreignTousseQualified').setValue(false);
+												   top.Ext.getCmp('foreignTousseQualified').disable();
+											   } else {
+												   top.Ext.getCmp('firstQualified').enable();
+												   top.Ext.getCmp('implantQualified').enable();
+												   top.Ext.getCmp('foreignTousseQualified').enable();
+											   }
+										   }
+									   }
+								   }]
+							   },{
+								   layout : 'form',
+								   labelWidth : 150,
+								   columnWidth : .5,
+								   items : [{
+									   id : 'firstQualified',
+									   name : 'firstQualified',
+									   fieldLabel :  BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED,
+									   xtype : 'checkbox',
+									   inputValue :  BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED
+								   }]
+							   },{
+								   layout : 'form',
+								   columnWidth : .5,
+								   labelWidth : 150,
+								   items : [{
+									   id : 'implantQualified',
+									   name : 'implantQualified',
+									   fieldLabel :  BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED,
+									   xtype : 'checkbox',
+									   inputValue :  BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED,
+									   listeners:{
+										   check:function( thiz, checked ){
+											   if (checked) {
+												   top.Ext.getCmp('qualified').setValue(false);
+												   top.Ext.getCmp('qualified').disable();
+											   } else if (!top.Ext.getCmp('foreignTousseQualified').getValue()) {
+												   top.Ext.getCmp('qualified').enable();
+											   }
+										   }
+									   }
+								   }]
+							   },{
+								   layout : 'form',
+								   columnWidth : .5,
+								   labelWidth : 170,
+								   items : [{
+									   id : 'foreignTousseQualified',
+									   name : 'foreignTousseQualified',
+									   fieldLabel :  BIOLOGICALMONITORINGDISPLAY_FOREIGN_TOUSSE_QUALIFIED,
+									   xtype : 'checkbox',
+									   inputValue :  BIOLOGICALMONITORINGDISPLAY_FOREIGN_TOUSSE_QUALIFIED,
+									   listeners:{
+										   check:function( thiz, checked ){
+											   if (checked) {
+												   top.Ext.getCmp('qualified').setValue(false);
+												   top.Ext.getCmp('qualified').disable();
+											   } else if (!top.Ext.getCmp('implantQualified').getValue()) {
+												   top.Ext.getCmp('qualified').enable();
+											   }
+										   }
+									   }
+								   }]
+							   }]
+							},{
+								columnWidth: 0.4,
+							   layout : 'column',
+							   xtype:'fieldset',
+							   title:'监测包扫描提示默认值',
+							   height:38,
+							   autoHeight:true,
+							   hidden : (sstsConfig.enableScanSterilizationMonitoringPackage)?false:true,
+							   items:[{
+								   layout : 'form',
+								   columnWidth : .5,
+								   labelWidth : 150,
+								   items : [{
+									   id : 'biological_1',
+									   name : 'biological_1',
+									   fieldLabel :  MONITORTOUSSEDISPLAY_EVERYTHING,
+									   xtype : 'checkbox',
+									   inputValue :  MONITORTOUSSEDISPLAY_EVERYTHING,
+									   listeners:{
+										   check:function( thiz, checked ){
+												if (checked) {
+													top.Ext.getCmp('biological_2').setValue(false);
+													top.Ext.getCmp('biological_2').disable();
+													top.Ext.getCmp('biological_3').setValue(false);
+													top.Ext.getCmp('biological_3').disable();
+													top.Ext.getCmp('biological_4').setValue(false);
+													top.Ext.getCmp('biological_4').disable();
+												} else {
+													top.Ext.getCmp('biological_2').enable();
+													top.Ext.getCmp('biological_3').enable();
+													top.Ext.getCmp('biological_4').enable();
+												}
+										   }
+									   }
+								   }]
+							   },{
+								   layout : 'form',
+								   labelWidth : 150,
+								   columnWidth : .5,
+								   items : [{
+									   id : 'biological_2',
+									   name : 'biological_2',
+									   fieldLabel :  MONITORTOUSSEDISPLAY_FIRST,
+									   xtype : 'checkbox',
+									   inputValue :  MONITORTOUSSEDISPLAY_FIRST,
+									   listeners:{
+											check:function( thiz, checked ){
+												if (checked) {
+													top.Ext.getCmp('biological_1').setValue(false);
+													top.Ext.getCmp('biological_1').disable();
+												} else {
+													if(top.Ext.getCmp('biological_3').getValue() || top.Ext.getCmp('biological_4').getValue()){
+														top.Ext.getCmp('biological_1').setValue(false);
+														top.Ext.getCmp('biological_1').disable();
+													}else {
+														top.Ext.getCmp('biological_1').enable();
+													}
+												}
+											}
+										}
+								   }]
+							   },{
+								   layout : 'form',
+								   columnWidth : .5,
+								   labelWidth : 150,
+								   items : [{
+									   id : 'biological_3',
+									   name : 'biological_3',
+									   fieldLabel :  MONITORTOUSSEDISPLAY_IMPLANT,
+									   xtype : 'checkbox',
+									   inputValue :  MONITORTOUSSEDISPLAY_IMPLANT,
+									   listeners:{
+										   check:function( thiz, checked ){
+												if (checked) {
+													top.Ext.getCmp('biological_1').setValue(false);
+													top.Ext.getCmp('biological_1').disable();
+												} else {
+													if(top.Ext.getCmp('biological_2').getValue() || top.Ext.getCmp('biological_4').getValue()){
+														top.Ext.getCmp('biological_1').setValue(false);
+														top.Ext.getCmp('biological_1').disable();
+													}else {
+														top.Ext.getCmp('biological_1').enable();
+													}
+												}
+											}
+									   }
+								   }]
+							   },{
+								   layout : 'form',
+								   columnWidth : .5,
+								   labelWidth : 150,
+								   items : [{
+									   id : 'biological_4',
+									   name : 'biological_4',
+									   fieldLabel :  MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE,
+									   xtype : 'checkbox',
+									   inputValue :  MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE,
+									   listeners:{
+										   check:function( thiz, checked ){
+												if (checked) {
+													top.Ext.getCmp('biological_1').setValue(false);
+													top.Ext.getCmp('biological_1').disable();
+												} else {
+													if(top.Ext.getCmp('biological_2').getValue() || top.Ext.getCmp('biological_3').getValue()){
+														top.Ext.getCmp('biological_1').setValue(false);
+														top.Ext.getCmp('biological_1').disable();
+													}else {
+														top.Ext.getCmp('biological_1').enable();
+													}
+												}
+										   }
+									   }
+								   }]
+							   }]
+							  }, {
 								columnWidth : 0.6,
 								layout : 'form',
 								labelWidth : 70,
@@ -1030,6 +1147,8 @@
 				var sterilizer = action.result.data;  //灭菌炉对象
 				var biologicalMonitoringDisplay = sterilizer.biologicalMonitoringDisplay;
 				var biologicalMonitoringDisplayArray = biologicalMonitoringDisplay.split(';');
+				var monitorTousseDisplay = sterilizer.monitorTousseDisplay;
+				var monitorTousseDisplayArray = monitorTousseDisplay.split(';');
 				top.Ext.getCmp('isRoutineMonitoring').setValue(sterilizer.isRoutineMonitoring);
 				top.Ext.getCmp('waitSterilizedPrompt').setValue(sterilizer.waitSterilizedPrompt);
 				if(sterilizer.bioreader != null){
@@ -1058,6 +1177,30 @@
 						top.Ext.getCmp('qualified').disable();
 					}
 				}
+
+				for (var i = 0; i < monitorTousseDisplayArray.length; i ++) {
+					if (monitorTousseDisplayArray[i] == MONITORTOUSSEDISPLAY_EVERYTHING) {
+						top.Ext.getCmp('biological_1').setValue(true);
+						top.Ext.getCmp('biological_2').setValue(false);
+						top.Ext.getCmp('biological_2').disable();
+						top.Ext.getCmp('biological_3').setValue(false);
+						top.Ext.getCmp('biological_3').disable();
+						top.Ext.getCmp('biological_4').setValue(false);
+						top.Ext.getCmp('biological_4').disable();
+					} else if (monitorTousseDisplayArray[i] == MONITORTOUSSEDISPLAY_FIRST) {
+						top.Ext.getCmp('biological_2').setValue(true);
+						top.Ext.getCmp('biological_1').setValue(false);
+						top.Ext.getCmp('biological_1').disable();
+					} else if (monitorTousseDisplayArray[i] == MONITORTOUSSEDISPLAY_IMPLANT) {
+						top.Ext.getCmp('biological_3').setValue(true);
+						top.Ext.getCmp('biological_1').setValue(false);
+						top.Ext.getCmp('biological_1').disable();
+					} else if (monitorTousseDisplayArray[i] == MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE) {
+						top.Ext.getCmp('biological_4').setValue(true);
+						top.Ext.getCmp('biological_1').setValue(false);
+						top.Ext.getCmp('biological_1').disable();
+					}
+				}
 				
 				if(id != 0){
 					configStore.loadData(Ext.util.JSON.decode(action.result.sterilisationJsonData));
@@ -1152,6 +1295,25 @@
 	top.Ext.getCmp('biologicalMonitoringDisplay').setValue(biologicalMonitoringDisplay);
 }
 
+function setMonitortousseDisplay() {
+	var biological_1 = top.Ext.getCmp('biological_1').getValue();
+	var biological_2 = top.Ext.getCmp('biological_2').getValue();
+	var biological_3 = top.Ext.getCmp('biological_3').getValue();
+	var biological_4 = top.Ext.getCmp('biological_4').getValue();
+	
+	var monitorTousseDisplay = '';
+	
+	monitorTousseDisplay += (biological_1 ? top.Ext.getCmp('biological_1').inputValue + ';' : '');
+	monitorTousseDisplay += (biological_2 ? top.Ext.getCmp('biological_2').inputValue + ';' : '');
+	monitorTousseDisplay += (biological_3 ? top.Ext.getCmp('biological_3').inputValue + ';' : '');
+	monitorTousseDisplay += (biological_4 ? top.Ext.getCmp('biological_4').inputValue + ';' : '');
+	
+	if (monitorTousseDisplay) {
+		monitorTousseDisplay = monitorTousseDisplay.substring(0, monitorTousseDisplay.length - 1);
+	} 
+	top.Ext.getCmp('monitorTousseDisplay').setValue(monitorTousseDisplay);
+}
+
 function validateAndSubmit(print){
 	var rapidFurnace = top.Ext.getCmp('rapidFurnace').getValue();
 	var price = top.Ext.getCmp('price').getValue();
@@ -1164,6 +1326,7 @@
 	}
 	
 	setBiologicalMonitoringDisplay();
+	setMonitortousseDisplay();
 	Ext.Ajax.request({
 		url :  WWWROOT + '/disinfectSystem/baseData/sterilizerAction!validate.do',
 		params : {validateId : top.Ext.getCmp('id').getValue(),valifateName:top.Ext.getCmp('name').getValue()},
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r27471 -r27676
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 27471)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 27676)
@@ -49,6 +49,7 @@
 var USER = "用户";
 var POSITION = "位置";
 var confirmLabel = "灭菌情况确认人";
+var BIOLOGICALMONITORING = '生物监测包';
 
 var _biologicalMonitoringTime = 0;  //此灭菌炉的生物监测持续时间
 
@@ -329,9 +330,8 @@
 function statisticsTousseAndBasket () {
     var rootNode = sterilizationColumnTree.getRootNode();  //灭菌物品columnTree的根节点
     var basketAmount = 0;  //篮筐数量
-    
     var tousseNameOfAmount = {};  //器械包名称和数量
-    var statisticsAmount = {'篮筐':0,'器械包':0,'敷料包':0,'外来器械包':0,'代理灭菌包':0,'灭菌物品总数量':0};
+    var statisticsAmount = {'篮筐':0,'器械包':0,'敷料包':0,'外来器械包':0,'代理灭菌包':0,'灭菌物品总数量':0,'植入物':0};
     rootNode.eachChild(function(pNode){
         if(pNode.attributes.type == '篮筐') {  //此节点是篮筐
             statisticsAmount['篮筐'] = statisticsAmount['篮筐'] + 1;
@@ -341,19 +341,22 @@
             pNode.eachChild(function(pNode){
                 sumTousseAndBasket(pNode, tousseNameOfAmount, statisticsAmount);
             });
+        }else if(pNode.attributes.includeImplant == 0){
+            pNode.attributes.typeForSterilizationStatistics = '植入物';
+            sumTousseAndBasket(pNode, tousseNameOfAmount, statisticsAmount);
         } else {  //此节点是器械包
             sumTousseAndBasket(pNode, tousseNameOfAmount, statisticsAmount);
         }
     });
-    
     top.Ext.getCmp('totalAmount').setText("灭菌物品总数量:"+(statisticsAmount['灭菌物品总数量']));
     top.Ext.getCmp('typeTotalAmount').setText(
             "篮筐:" + statisticsAmount['篮筐'] + 
             ",器械包:" + statisticsAmount['器械包']
             + ",敷料包:" + statisticsAmount['敷料包'] + 
             ",外来器械包:" + statisticsAmount['外来器械包'] + 
             ",代理灭菌包:"+ statisticsAmount['代理灭菌包']);
-    
+    top.Ext.getCmp('foreignTousseAmount').setValue(statisticsAmount['外来器械包']);
+    top.Ext.getCmp('implantAmount').setValue(statisticsAmount['植入物']);
     tousseItemCountJsonStore.removeAll();
     for(var key in tousseNameOfAmount){
         if (tousseNameOfAmount.hasOwnProperty(key)) {  //过滤掉非“tousseNameOfAmount”本对象的属性比较严谨一些
@@ -2593,6 +2596,10 @@
                         id : 'delTousseJson'
                     },{
                         xtype : 'hidden',
+                        name : 'monitorTousseDisplay',
+                        id : 'monitorTousseDisplay'
+                    },{
+                        xtype : 'hidden',
                         name : 'haveDoneNoticeSterilisation',
                         id : 'haveDoneNoticeSterilisation'
                     },{
@@ -2637,7 +2644,7 @@
                             valueField : 'sterilizerName',
                             displayField : 'sterilizerName',
                             store : new Ext.data.SimpleStore({
-                                fields : [ 'sterilizerName' ],
+                                fields : [ 'sterilizerName','monitorTousseDisplay'],
                                 url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?ownGroup=' + encodeURI(ownGroup)
                             }),
                             triggerAction : 'all',
@@ -2651,6 +2658,27 @@
                             readOnly:true,
                             anchor : '100%',
                             listeners : {
+                                render:function(v, p, record){
+                                    setTimeout(function(){
+                                        var sterilizerName = v.getValue();
+                                        if(sterilizerName !== ''){
+                                            Ext.Ajax.request( {
+                                                url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!loadSterilizerBySterilizerName.do',
+                                                params : {
+                                                    sterilizerName : sterilizerName
+                                                },
+                                                success : function(response, options) {
+                                                    var result = Ext.decode(response.responseText);
+                                                    
+                                                    if(result.success){
+                                                        var monitorTousseDisplay = result.data.monitorTousseDisplay;
+                                                        top.Ext.getCmp('monitorTousseDisplay').setValue(monitorTousseDisplay);
+                                                    }
+                                                }
+                                            });
+                                        }
+                                    }, 1000);
+                                },
                                 select : function(combo, record, index) {
                                      DWREngine.setAsync(true);
                                      var recordId = id;
@@ -2693,6 +2721,19 @@
                                         pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root,function(){});
                                     }
                                     top.Ext.getCmp('sterilizationPurpose').setValue('');
+                                    Ext.Ajax.request( {
+                                        url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!loadSterilizerBySterilizerName.do',
+                                        params : {
+                                            sterilizerName : combo.value
+                                        },
+                                        success : function(response, options) {
+                                            var result = Ext.decode(response.responseText);
+                                            if(result.success){
+                                                var monitorTousseDisplay = result.data.monitorTousseDisplay;
+                                                top.Ext.getCmp('monitorTousseDisplay').setValue(monitorTousseDisplay);
+                                            }
+                                        }
+                                    });
                                 }
                             }
                         }]
@@ -2900,6 +2941,9 @@
                                                             }else if (STERILIZER == result){  //灭菌炉
                                                                 getSterilization(barcode,recordID);
                                                                 top.Ext.getCmp('inputBarcode').setValue("");
+                                                            }else if(BIOLOGICALMONITORING == result){ //生物监测包
+                                                                top.Ext.getCmp('inputBarcode').setValue("");
+                                                                top.Ext.getCmp('biologicalMonitoring').setValue("已扫描");
                                                             }else if(STERILISATION == result){  //灭菌程序
                                                                 var sterilizerName = top.Ext.getCmp('sterilizerName').getRawValue();
                                                                 if(sterilizerName.length <= 0){
@@ -3078,6 +3122,23 @@
                             hideLabel :  id == 0?true:false,
                             anchor : '100%'
                         }]
+                    }, {
+                        columnWidth : .33,
+                        layout : 'form',
+                        cls:'edit-5char-labelwidth',
+                        hidden : (sstsConfig.enableScanSterilizationMonitoringPackage)?false:true,
+                        items : [ {
+                            xtype : 'textfield',
+                            fieldLabel : "监测包",
+                           // labelWidth: 85,
+                            listWidth:120,
+                            name : "biologicalMonitoring",
+                            id : "biologicalMonitoring",
+                            readOnly : true,
+                            allowBlank : true,
+                            anchor : '100%',
+                            cls:'x-item-disabled'
+                        } ]
                     },{
                         columnWidth : 1,
                         layout : 'form',
@@ -3176,6 +3237,14 @@
                                 xtype : 'button',
                                 id : 'totalAmount'/*,
                                 text : '灭菌物品总数量:'*/
+                            },{
+                                xtype : 'hidden',
+                                id : 'foreignTousseAmount',
+                                name:'foreignTousseAmount'
+                            },{
+                                xtype : 'hidden',
+                                id : 'implantAmount',
+                                name:'implantAmount'
                             }],
                             bbar:[{
                                 xtype : 'button',
@@ -4067,6 +4136,29 @@
 var isNewRecord = false;
 
 function save() {
+    if(sstsConfig.enableScanSterilizationMonitoringPackage){
+        var biologicalMonitoring = top.Ext.getCmp('biologicalMonitoring').getValue();
+        var monitorTousseDisplay = top.Ext.getCmp('monitorTousseDisplay').getValue();
+        var foreignTousseAmount = parseInt(top.Ext.getCmp('foreignTousseAmount').getValue());
+        var implantAmount = parseInt(top.Ext.getCmp('implantAmount').getValue());
+        var frequency = parseInt(top.Ext.getCmp('frequency').getValue());
+        if(monitorTousseDisplay !== ''){
+            var monitorTousseDisplayArray = monitorTousseDisplay.split(';');
+            if(monitorTousseDisplayArray.indexOf('每炉') >=0 && biologicalMonitoring == ''){
+                showResult('当前灭菌记录需要扫描监测包条编码，否则不能提交保存。', null);
+                return;
+            }else if(monitorTousseDisplayArray.indexOf('每天第一炉') >=0 && frequency == 1 && biologicalMonitoring == ''){
+                showResult('当前灭菌记录每天第一炉需要扫描监测包条编码，否则不能提交保存。', null);
+                return;
+            }else if(monitorTousseDisplayArray.indexOf('有植入物时') >=0 && implantAmount > 0 && biologicalMonitoring == ''){
+                showResult('当前灭菌记录有植入物时需要扫描监测包条编码，否则不能提交保存。', null);
+                return;
+            }else if(monitorTousseDisplayArray.indexOf('有外来器械包时') >=0 && foreignTousseAmount > 0 && biologicalMonitoring == ''){
+                showResult('当前灭菌记录有外来器械包时需要扫描监测包条编码，否则不能提交保存。', null);
+                return;
+            }
+        }
+    }
     if (!formObj.form.isValid()) {
         showResult('请正确填写表单各值', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage);
         this.enable();