Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r30195 -r30208
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30195)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30208)
@@ -54,7 +54,6 @@
 var USER = "用户";
 var POSITION = "位置";
 var confirmLabel = "灭菌情况确认人";
-var BIOLOGICALMONITORING = '生物监测包';
 
 var _biologicalMonitoringTime = 0;  //此灭菌炉的生物监测持续时间
 
@@ -595,7 +594,9 @@
         success: function (response, options) {
             var result = Ext.decode(response.responseText);
             if (result.success) {
-                if (result.message && (params.biologicalMonitoring || '') == '') {
+                var monitorPackageBarcode = params.monitorPackageBarcode || '';
+                var chemistryPackageBarcode = params.chemistryPackageBarcode || '';
+                if (result.message && (monitorPackageBarcode == '' || chemistryPackageBarcode == '')) {
                     showResult(result.message);
                 } else {
                     if (params.saveType == 1 && params.button) {
@@ -1305,6 +1306,13 @@
                 var name = pNode.attributes.name;
                 var sterilingMode = pNode.attributes.sterilingMode || '';
                 var isTraceable = pNode.attributes.isTraceable;
+                var unTraceable = pNode.attributes.unTraceable || '';
+                var newTraceable = '';
+                if(unTraceable !== ''){
+                    newTraceable = (unTraceable == '是')?'否':'是';
+                }else {
+                    newTraceable = '';
+                }
                 var params = {
                     isParentNode: true,
                     barcode: barcode,
@@ -1318,7 +1326,7 @@
                     stockAmount: 0,
                     sterilingMode: sterilingMode,
                     scanAmount: scanAmount,
-                    isTraceable: isTraceable
+                    isTraceable: isTraceable || newTraceable
                 }
                 var parentNode = createNode(params);
                 pNode.remove();//删除修改后的节点数据
@@ -2599,8 +2607,14 @@
 
     sterilizationColumnTreeEditer.on("beforestartedit", function (thiz, el, v) {
         var tempNode = thiz.editNode;//将要编辑的节点&& tempNode.attributes.scanFixedBarcode == '是'
+        var unTraceable = tempNode.attributes.unTraceable || '';
+        var isTraceable = tempNode.attributes.isTraceable || '';
         if (thiz.editColIndex == 'amount') {
-            return true;
+            if(unTraceable == '是' || isTraceable == '否'){
+                return true;
+            }else {
+                return false;
+            }
         } else {
             return false;
         }
@@ -3387,10 +3401,12 @@
                                                             } else if (STERILIZER == result) {  //灭菌炉
                                                                 getSterilization(barcode, recordID);
                                                                 top.Ext.getCmp('inputBarcode').setValue("");
-                                                            } else if (BIOLOGICALMONITORING == result) { //生物监测包
+                                                            } else if (BIOLOGICALMONITORTOUSSE == result) { //生物监测包
                                                                 top.Ext.getCmp('inputBarcode').setValue("");
-                                                                top.Ext.getCmp('biologicalMonitoring').setValue("已扫描");
                                                                 top.Ext.getCmp('monitorPackageBarcode').setValue(barcode);
+                                                            } else if (CHEMISTRYMONITORTOUSSE == result) { //化学监测包
+                                                                top.Ext.getCmp('inputBarcode').setValue("");
+                                                                top.Ext.getCmp('chemistryPackageBarcode').setValue(barcode);
                                                             } else if (STERILISATION == result) {  //灭菌程序
                                                                 var sterilizerName = top.Ext.getCmp('sterilizerName').getRawValue();
                                                                 if (sterilizerName.length <= 0) {
@@ -3576,21 +3592,34 @@
                         hidden: (sstsConfig.enableScanSterilizationMonitoringPackage) ? false : true,
                         items: [{
                             xtype: 'textfield',
-                            fieldLabel: "监测包",
+                            fieldLabel: "生物监测包",
                             // labelWidth: 85,
                             listWidth: 120,
-                            name: "biologicalMonitoring",
-                            id: "biologicalMonitoring",
+                            name: "monitorPackageBarcode",
+                            id: "monitorPackageBarcode",
                             readOnly: true,
                             allowBlank: true,
                             anchor: '100%',
                             cls: 'x-item-disabled'
-                        }, {
-                            xtype: 'hidden',
-                            id: 'monitorPackageBarcode',
-                            name: 'monitorPackageBarcode'
                         }]
                     }, {
+                        columnWidth: .33,
+                        layout: 'form',
+                        cls: 'edit-5char-labelwidth',
+                        hidden: (sstsConfig.enableScanSterilizationMonitoringPackage) ? false : true,
+                        items: [{
+                            xtype: 'textfield',
+                            fieldLabel: "化学监测包",
+                            // labelWidth: 85,
+                            listWidth: 120,
+                            name: "chemistryPackageBarcode",
+                            id: "chemistryPackageBarcode",
+                            readOnly: true,
+                            allowBlank: true,
+                            anchor: '100%',
+                            cls: 'x-item-disabled'
+                        }]
+                    }, {
                         columnWidth: 1,
                         layout: 'form',
                         items: [{
@@ -4474,6 +4503,7 @@
         success: function (form, action) {
             var sr = action.result.data;  //此灭菌记录对象     
             var monitorPackageBarcode = sr.monitorPackageBarcode || '';
+            var chemistryPackageBarcode = sr.chemistryPackageBarcode || '';
 
             if (!id) {  //新加的记录
                 setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'startDate');  //（设置开始时间，取服务器时间cjr）
@@ -4497,9 +4527,12 @@
                 top.Ext.getCmp('srSituationComfirmer').setValue(sr.srSituationComfirmer);
 
                 if (monitorPackageBarcode !== '') {
-                    top.Ext.getCmp('biologicalMonitoring').setValue("已扫描");
                     top.Ext.getCmp('monitorPackageBarcode').setValue(monitorPackageBarcode);
                 }
+
+                if (chemistryPackageBarcode !== '') {
+                    top.Ext.getCmp('chemistryPackageBarcode').setValue(chemistryPackageBarcode);
+                }
             }
 
             if (reSterilization) {  //重新灭菌
@@ -4857,46 +4890,106 @@
     }
 }
 
+//验证是否需要扫描监测包条码
+function isNeedScanMonitoringTousse() {
+    var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue();
+    var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').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(';');
+        for (var i = 0; i < monitorTousseDisplayArray.length; i++) {
+            var item = monitorTousseDisplayArray[i];
+            //每炉
+            if (item.indexOf(MONITORTOUSSEDISPLAY_EVERYTHING) >= 0) {
+                if (item.indexOf('生物') >= 0 && item.indexOf('化学') >= 0 && monitorPackageBarcode == '' && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码和生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') >= 0 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('化学') >= 0 && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') == -1 && item.indexOf('化学') == -1 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                }
+                //每天第一炉
+            } else if (item.indexOf(MONITORTOUSSEDISPLAY_FIRST) >= 0 && frequency == 1) {
+                if (item.indexOf('生物') >= 0 && item.indexOf('化学') >= 0 && monitorPackageBarcode == '' && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码和生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') >= 0 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('化学') >= 0 && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') == -1 && item.indexOf('化学') == -1 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                }
+                //有植入物时
+            } else if (item.indexOf(MONITORTOUSSEDISPLAY_IMPLANT) >= 0 && implantAmount > 0) {
+                if (item.indexOf('生物') >= 0 && item.indexOf('化学') >= 0 && monitorPackageBarcode == '' && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码和生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') >= 0 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('化学') >= 0 && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') == -1 && item.indexOf('化学') == -1 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                }
+                //有外来器械包时
+            } else if (item.indexOf(MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE) >= 0 && foreignTousseAmount > 0) {
+                if (item.indexOf('生物') >= 0 && item.indexOf('化学') >= 0 && monitorPackageBarcode == '' && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码和生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') >= 0 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('化学') >= 0 && chemistryPackageBarcode == '') {
+                    showResult('请扫描化学监测包条码！', null);
+                    return false;
+                } else if (item.indexOf('生物') == -1 && item.indexOf('化学') == -1 && monitorPackageBarcode == '') {
+                    showResult('请扫描生物监测包条码！', null);
+                    return false;
+                }
+            }
+        }
+    }
+    return true;
+}
+
 //保存
 function save() {
     var that = this;
     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());
+        var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue();
+        var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue();
         var sterilizerName = top.Ext.getCmp('sterilizerName').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 (isNeedScanMonitoringTousse()) {
+            if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) {
+                var params = {
+                    sterilizerName: sterilizerName,
+                    isSave: true,
+                    monitorPackageBarcode: monitorPackageBarcode,
+                    chemistryPackageBarcode: chemistryPackageBarcode,
+                    button: that,
+                    saveType: 1
+                }
+                sterilizerBioMonitoringIntervalReminder(params);
+            } else {
+                saveData(1, that);
             }
         }
-
-        if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) {
-            var params = {
-                sterilizerName: sterilizerName,
-                isSave: true,
-                biologicalMonitoring: biologicalMonitoring,
-                button: that,
-                saveType: 1
-            }
-            sterilizerBioMonitoringIntervalReminder(params);
-        } else {
-            saveData(1, that);
-        }
     } else {
         saveData(1, that);
     }
@@ -4905,41 +4998,24 @@
 //暂存
 function save2() {
     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());
+        var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue();
+        var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue();
         var sterilizerName = top.Ext.getCmp('sterilizerName').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 (isNeedScanMonitoringTousse()) {
+            if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) {
+                var params = {
+                    sterilizerName: sterilizerName,
+                    isSave: true,
+                    monitorPackageBarcode: monitorPackageBarcode,
+                    chemistryPackageBarcode: chemistryPackageBarcode,
+                    saveType: 2
+                }
+                sterilizerBioMonitoringIntervalReminder(params);
+            } else {
+                saveData(2);
             }
         }
-
-        if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) {
-            var params = {
-                sterilizerName: sterilizerName,
-                isSave: true,
-                biologicalMonitoring: biologicalMonitoring,
-                saveType: 2
-            }
-            sterilizerBioMonitoringIntervalReminder(params);
-        } else {
-            saveData(2);
-        }
     } else {
         saveData(2);
     }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r29514 -r30208
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 29514)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 30208)
@@ -844,7 +844,7 @@
 									}]
 								})]
 							},{
-								columnWidth: 0.6,
+								columnWidth: 0.5,
 							   layout : 'column',
 							   xtype:'fieldset',
 							   title:'生物监测的结果默认值',
@@ -853,7 +853,7 @@
 							   items:[{
 								   layout : 'form',
 								   columnWidth : .5,
-								   labelWidth : 150,
+								   labelWidth : 170,
 								   items : [{
 									   id : 'qualified',
 									   name : 'qualified',
@@ -879,7 +879,7 @@
 								   }]
 							   },{
 								   layout : 'form',
-								   labelWidth : 150,
+								   labelWidth : 170,
 								   columnWidth : .5,
 								   items : [{
 									   id : 'firstQualified',
@@ -891,7 +891,7 @@
 							   },{
 								   layout : 'form',
 								   columnWidth : .5,
-								   labelWidth : 150,
+								   labelWidth : 170,
 								   items : [{
 									   id : 'implantQualified',
 									   name : 'implantQualified',
@@ -932,119 +932,185 @@
 								   }]
 							   }]
 							},{
-								columnWidth: 0.4,
+								columnWidth: 0.5,
 							   layout : 'column',
 							   xtype:'fieldset',
 							   title:'监测包扫描提示默认值',
 							   height:38,
 							   autoHeight:true,
 							   hidden : (sstsConfig.enableScanSterilizationMonitoringPackage)?false:true,
 							   items:[{
+									layout : 'form',
+									labelWidth:70,
+									labelAlign:'right',
+									items : [{
+										xtype : 'textfield',
+										disable:true,
+										fieldLabel:MONITORTOUSSEDISPLAY_FIRST,
+										labelSeparator:'',
+										cls : 'fieldReadOnlyNoRemove',
+										width:0
+									}]
+								},{
 								   layout : 'form',
-								   columnWidth : .5,
-								   labelWidth : 150,
+								   labelWidth:30,
 								   items : [{
-									   id : 'biological_1',
-									   name : 'biological_1',
-									   fieldLabel :  MONITORTOUSSEDISPLAY_EVERYTHING,
+									   id : 'biological_1_1',
+									   name : 'biological_1_1',
+									   fieldLabel :  '化学',
 									   xtype : 'checkbox',
-									   inputValue :  MONITORTOUSSEDISPLAY_EVERYTHING,
+									   inputValue :  '化学',
+									   labelSeparator:''
+								   	}]
+								},{
+									layout : 'form',
+									labelWidth:30,
+									items : [{
+										id : 'biological_1_2',
+										name : 'biological_1_2',
+										fieldLabel :  '生物',
+										xtype : 'checkbox',
+										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').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();
+												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_2').enable();
-													top.Ext.getCmp('biological_3').enable();
-													top.Ext.getCmp('biological_4').enable();
+													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 : 150,
-								   columnWidth : .5,
-								   items : [{
-									   id : 'biological_2',
-									   name : 'biological_2',
-									   fieldLabel :  MONITORTOUSSEDISPLAY_FIRST,
-									   xtype : 'checkbox',
-									   inputValue :  MONITORTOUSSEDISPLAY_FIRST,
-									   listeners:{
+								   	}]
+								},{
+									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_1').setValue(false);
-													top.Ext.getCmp('biological_1').disable();
+												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 {
-													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();
-													}
+													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',
-								   columnWidth : .5,
-								   labelWidth : 150,
+								   labelWidth:30,
 								   items : [{
-									   id : 'biological_3',
-									   name : 'biological_3',
-									   fieldLabel :  MONITORTOUSSEDISPLAY_IMPLANT,
+									   id : 'biological_3_1',
+									   name : 'biological_3_1',
+									   fieldLabel :  '化学',
 									   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();
-													}
-												}
-											}
-									   }
-								   }]
-							   },{
+									   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',
-								   columnWidth : .5,
-								   labelWidth : 150,
+								   labelWidth:30,
 								   items : [{
-									   id : 'biological_4',
-									   name : 'biological_4',
-									   fieldLabel :  MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE,
+									   id : 'biological_4_1',
+									   name : 'biological_4_1',
+									   fieldLabel :  '化学',
 									   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();
-													}
-												}
-										   }
-									   }
-								   }]
-							   }]
+									   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',
@@ -1191,28 +1257,48 @@
 						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();
+					var names = monitorTousseDisplayArray[i].split('_');
+					if(names[0] == MONITORTOUSSEDISPLAY_FIRST){
+						if(names[1] == '化学' || names[2] == '化学'){
+							top.Ext.getCmp('biological_1_1').setValue(true);
+						}
+						if(names[1] == '生物' || names[2] == '生物'){
+							top.Ext.getCmp('biological_1_2').setValue(true);
+						}
+						if(names[1] == undefined){
+							top.Ext.getCmp('biological_1_2').setValue(true);
+						}
+					}else if(names[0] == MONITORTOUSSEDISPLAY_EVERYTHING){
+						if(names[1] == '化学' || names[2] == '化学'){
+							top.Ext.getCmp('biological_2_1').setValue(true);
+						}
+						if(names[1] == '生物' || names[2] == '生物'){
+							top.Ext.getCmp('biological_2_2').setValue(true);
+						}
+						if(names[1] == undefined){
+							top.Ext.getCmp('biological_2_2').setValue(true);
+						}
+					}else if(names[0] == MONITORTOUSSEDISPLAY_IMPLANT){
+						if(names[1] == '化学' || names[2] == '化学'){
+							top.Ext.getCmp('biological_3_1').setValue(true);
+						}
+						if(names[1] == '生物' || names[2] == '生物'){
+							top.Ext.getCmp('biological_3_2').setValue(true);
+						}
+						if(names[1] == undefined){
+							top.Ext.getCmp('biological_3_2').setValue(true);
+						}
+					}else {
+						if(names[1] == '化学' || names[2] == '化学'){
+							top.Ext.getCmp('biological_4_1').setValue(true);
+						}
+						if(names[1] == '生物' || names[2] == '生物'){
+							top.Ext.getCmp('biological_4_2').setValue(true);
+						}
+						if(names[1] == undefined){
+							top.Ext.getCmp('biological_4_2').setValue(true);
+						}
 					}
 				}
 				
@@ -1310,21 +1396,53 @@
 }
 
 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 biological_1_1 = top.Ext.getCmp('biological_1_1').getValue();
+	var biological_1_2 = top.Ext.getCmp('biological_1_2').getValue();
+	//每炉(第1炉除外)：化学和生物
+	var biological_2_1 = top.Ext.getCmp('biological_2_1').getValue();
+	var biological_2_2 = top.Ext.getCmp('biological_2_2').getValue();
+	//有植入物时：化学和生物
+	var biological_3_1 = top.Ext.getCmp('biological_3_1').getValue();
+	var biological_3_2 = top.Ext.getCmp('biological_3_2').getValue();
+	//有外来器械时：化学和生物
+	var biological_4_1 = top.Ext.getCmp('biological_4_1').getValue();
+	var biological_4_2 = top.Ext.getCmp('biological_4_2').getValue();
 	
 	var monitorTousseDisplay = '';
+
+	if(biological_1_1 || biological_1_2){
+		monitorTousseDisplay += MONITORTOUSSEDISPLAY_FIRST;
+		monitorTousseDisplay += (biological_1_1 ? '_' + top.Ext.getCmp('biological_1_1').inputValue : '');
+		monitorTousseDisplay += (biological_1_2 ? '_' + top.Ext.getCmp('biological_1_2').inputValue : '');
+		monitorTousseDisplay += ';';
+	}
+
+	if(biological_2_1 || biological_2_2){
+		monitorTousseDisplay += MONITORTOUSSEDISPLAY_EVERYTHING;
+		monitorTousseDisplay += (biological_2_1 ? '_' + top.Ext.getCmp('biological_2_1').inputValue : '');
+		monitorTousseDisplay += (biological_2_2 ? '_' + top.Ext.getCmp('biological_2_2').inputValue : '');
+		monitorTousseDisplay += ';';
+	}
+
+	if(biological_3_1 || biological_3_2){
+		monitorTousseDisplay += MONITORTOUSSEDISPLAY_IMPLANT;
+		monitorTousseDisplay += (biological_3_1 ? '_' + top.Ext.getCmp('biological_3_1').inputValue : '');
+		monitorTousseDisplay += (biological_3_2 ? '_' + top.Ext.getCmp('biological_3_2').inputValue : '');
+		monitorTousseDisplay += ';';
+	}
+
+	if(biological_4_1 || biological_4_2){
+		monitorTousseDisplay += MONITORTOUSSEDISPLAY_FOREIGN_TOUSSE;
+		monitorTousseDisplay += (biological_4_1 ? '_' + top.Ext.getCmp('biological_4_1').inputValue : '');
+		monitorTousseDisplay += (biological_4_2 ? '_' + top.Ext.getCmp('biological_4_2').inputValue : '');
+		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);
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r29711 -r30208
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 29711)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 30208)
@@ -3,11 +3,13 @@
 <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
 <%@page import="com.forgon.directory.vo.LoginUserData"%>
+<%@ page import="com.forgon.directory.model.BarcodeDevice" %>
 <%@ page import="com.forgon.tools.SpringBeanManger" %>
 <%@page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer"%>
 <%@include file="/common/taglibs.jsp"%>
 <%@include file="/common/includeExtJsAndCss.jsp"%>
 <%@include file="/common/include_Ext42_Js.jsp"%>
@@ -84,6 +86,14 @@
 			isQueryToday = true;
 		}
 		var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
+
+		var CHEMISTRYMONITORTOUSSE = '<%=BarcodeDevice.BARCODE_TYPE_CHEMISTRYMONITORTOUSSE%>';  //化学监测包
+		var BIOLOGICALMONITORTOUSSE = '<%=BarcodeDevice.BARCODE_TYPE_BIOLOGICALMONITORTOUSSE%>';  //生物监测包
+
+		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%>';  //有外来器械包时
 	</script>
 	
 	<%--引入一些工具类 --%>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r29794 -r30208
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 29794)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 30208)
@@ -1248,43 +1248,173 @@
 			minWidth: 50,
 			iconCls: 'icon_print',
 			handler: function () {
-				top.Ext.Msg.show({
-					title: '输入打印份数',
-					msg: '打印份数：',
-					width: 100,
-					buttons: Ext.MessageBox.OKCANCEL,
-					prompt: true,
-					fn: function (bu, txt) {
-						if (bu == 'ok') {
-							if (isNaN(txt) == false) {
-								Ext.MessageBox.progress('打印中', '请稍候...');
-								var count = Number(txt);
-								Ext.Ajax.request({
-									url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createBiologyMonitorTousseBarcodes.do',
-									params: {
-										amount: count
-									},
-									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);
+				var formPanel = new top.Ext.FormPanel({
+					id: 'formPanel',
+					frame: true,
+					labelAlign: 'right',
+					labelSeparator: '：',
+					bodyStyle: 'padding:5px 5px 0px 5px',
+					labelWidth: 80,
+					autoHeight: true,
+					autoScroll: true,
+					items: [{
+						layout : 'column',
+						items:[{
+							layout : 'form',
+							labelWidth:70,
+							labelAlign:'left',
+							columnWidth: 1,
+							items : [{
+								xtype : 'textfield',
+								columnWidth: 1,
+								disable:true,
+								fieldLabel:'监测包类型',
+								cls : 'fieldReadOnlyNoRemove',
+								width:0
+							}]
+						},{
+							layout : 'form',
+							labelWidth:100,
+							labelAlign:'right',
+							columnWidth: .5,
+							items : [{
+								id : 'monitorTousseType_1',
+								name : 'monitorTousseType_1',
+								columnWidth: .5,
+								fieldLabel :  '化学监测包',
+								xtype : 'checkbox',
+								inputValue :  '化学监测包',
+								labelSeparator:''
+							}]
+						},{
+							layout : 'form',
+							labelWidth:70,
+							labelAlign:'right',
+							columnWidth: .5,
+							items : [{
+								id : 'monitorTousseType_2',
+								name : 'monitorTousseType_2',
+								columnWidth: .5,
+								fieldLabel :  '生物监测包',
+								xtype : 'checkbox',
+								inputValue :  '生物监测包',
+								labelSeparator:''
+							}]
+						},{
+							layout : 'form',
+							labelWidth:70,
+							labelAlign:'left',
+							columnWidth: 1,
+							items : [{
+								xtype : 'textfield',
+								columnWidth: 1,
+								disable:true,
+								fieldLabel:'打印份数',
+								cls : 'fieldReadOnlyNoRemove',
+								width:0
+							}]
+						},{
+							layout : 'form',
+							labelWidth:35,
+							labelAlign:'left',
+							columnWidth: 1,
+							items : [{
+								xtype : 'numberfield',
+								columnWidth: 1,
+								labelSeparator:'',
+								id:'printAmount',
+								width:180,
+								value:1,
+								name:'printAmount',
+								allowDecimals : false,
+								allowNegative : false,
+								minValue:1
+							}]
+						}]
+					}],
+					buttons: [{
+						id: 'continueBtn',
+						text: '确认',
+						handler: function () {
+							var monitorTousseType_1 = top.Ext.getCmp('monitorTousseType_1').getValue();
+							var monitorTousseType_2 = top.Ext.getCmp('monitorTousseType_2').getValue();
+							if(!monitorTousseType_1 && !monitorTousseType_2){
+								showResult('请选择监测包类型');
+								return
+							}
+
+							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);
 										}
-										hideMessageBox(false);
-									},
-									failure: function (response, options) {
-										var result = Ext.decode(response.responseText);
-										showResult(result.cause);
-									}
-								});
-							} else {
+									});
+								}
+								if(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);
+										}
+									});
+								}
+							}else {
 								showResult("打印份数必须是数字，请重新输入!");
 							}
 						}
-					},
-					animEl: 'addAddressBtn',
-					value: '1'
+					}, {
+						text: '取消',
+						id: 'cancleBtn',
+						handler: function () {
+							printWin.close();
+						}
+					}]
 				});
+				var printWin = new top.Ext.Window({
+					id: 'printWin',
+					layout: 'fit',
+					title: '输入打印份数',
+					width: 300,
+					border: false,
+					modal: true,
+					autoHeight: true,
+					plain: true,
+					items: [formPanel]
+				});
+				printWin.show();
 			}
 		}]);
 	}