Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r30217 -r30246
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 30217)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 30246)
@@ -986,7 +986,7 @@
 										items : [{
 											xtype : 'textfield',
 											disable:true,
-											fieldLabel:MONITORTOUSSEDISPLAY_EVERYTHING+'(第1炉除外)',
+											fieldLabel:MONITORTOUSSEDISPLAY_EVERYTHING,
 											labelSeparator:'',
 											cls : 'fieldReadOnlyNoRemove',
 											width:0
@@ -1000,26 +1000,7 @@
 										   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();
-													}
-											   }
-										   }
+										   labelSeparator:''
 										   }]
 									},{
 										layout : 'form',
@@ -1030,26 +1011,7 @@
 											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();
-													}
-												}
-											}
+											labelSeparator:''
 										}]
 									}]
 							   },{
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r30217 -r30246
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30217)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30246)
@@ -4890,105 +4890,25 @@
     }
 }
 
-//验证是否需要扫描监测包条码
-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 monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue();
         var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue();
         var sterilizerName = top.Ext.getCmp('sterilizerName').getValue();
-        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,
+                monitorPackageBarcode: monitorPackageBarcode,
+                chemistryPackageBarcode: chemistryPackageBarcode,
+                button: that,
+                saveType: 1
             }
+            sterilizerBioMonitoringIntervalReminder(params);
+        } else {
+            saveData(1, that);
         }
     } else {
         saveData(1, that);
@@ -5001,20 +4921,17 @@
         var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue();
         var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue();
         var sterilizerName = top.Ext.getCmp('sterilizerName').getValue();
-
-        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,
+                monitorPackageBarcode: monitorPackageBarcode,
+                chemistryPackageBarcode: chemistryPackageBarcode,
+                saveType: 2
             }
+            sterilizerBioMonitoringIntervalReminder(params);
+        } else {
+            saveData(2);
         }
     } else {
         saveData(2);