Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
===================================================================
diff -u -r29563 -r30210
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js	(.../sterilizationMonitoring.js)	(revision 29563)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js	(.../sterilizationMonitoring.js)	(revision 30210)
@@ -120,41 +120,23 @@
 }
 function saveMonitor(){
 	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:3
+				}
+				sterilizerBioMonitoringIntervalReminder(params);
+			}else {
+				saveMonitorData();
+			}
         }
-
-        if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){
-            var params = {
-                sterilizerName:sterilizerName,
-                isSave:true,
-                biologicalMonitoring:biologicalMonitoring,
-                saveType:3
-            }
-            sterilizerBioMonitoringIntervalReminder(params);
-        }else {
-            saveMonitorData();
-        }
     }else {
         saveMonitorData();
     }