Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js
===================================================================
diff -u -r30649 -r31032
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js	(.../interfereRecordForm.js)	(revision 30649)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js	(.../interfereRecordForm.js)	(revision 31032)
@@ -373,20 +373,49 @@
 /**
  * 扫描灭菌程序
  */
-function loadSterilizationType(barcode,sterilizerName){
+function loadSterilizationType(barcode,sterilizerName,frequency){
     DWREngine.setAsync(false);
-    SterilizationRecordTableManager.getSterilizationType(barcode,sterilizerName,function setSterilizationType(result){
+    SterilizationRecordTableManager.getSterilizationType(barcode,sterilizerName,frequency,function setSterilizationType(result){
         if(result != null){
             var resultArray = result.split(':');
             if(resultArray[0] == "success"){
                 var sterilizationType = resultArray[1].split(',')[0];
-                top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
-                //加载灭菌参数
-                SterilizationRecordTableManager.getParameter(sterilizationType,function(result){
-                    if(result != null && result.length > 0){
-                        top.Ext.getCmp('parameter').setValue(result);
+                var newSterilizationType = resultArray[4] || '';
+                if (resultArray[2] == "success") {
+                    top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
+                    //加载灭菌参数
+                    SterilizationRecordTableManager.getParameter(sterilizationType,function(result){
+                        if(result != null && result.length > 0){
+                            top.Ext.getCmp('parameter').setValue(result);
+                        }
+                    });
+                }else {
+                    if(resultArray[3] == "强制提醒"){
+                        top.Ext.MessageBox.alert("请确认", resultArray[2],
+                        function (button, text) {
+                            top.Ext.getCmp('sterilizationType').setValue(newSterilizationType);
+                            //加载灭菌参数
+                            SterilizationRecordTableManager.getParameter(newSterilizationType,function(result){
+                                if(result != null && result.length > 0){
+                                    top.Ext.getCmp('parameter').setValue(result);
+                                }
+                            });
+                        });
+                    }else {
+                        top.Ext.MessageBox.confirm("请确认", resultArray[2],
+                        function (button, text) {
+                            if ("yes" == button) {
+                                top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
+                                //加载灭菌参数
+                                SterilizationRecordTableManager.getParameter(sterilizationType,function(result){
+                                    if(result != null && result.length > 0){
+                                        top.Ext.getCmp('parameter').setValue(result);
+                                    }
+                                });
+                            }
+                        });
                     }
-                });
+                }
             }else{
                 showResult(resultArray[1], null , sstsConfig.messagePauseTimeOnSterilizationRecordPage);
             }
@@ -2440,7 +2469,8 @@
 
                                                                      return;
                                                                 }
-                                                                loadSterilizationType(barcode,sterilizerName);
+                                                                var frequency = top.Ext.getCmp('frequency').getRawValue();
+                                                                loadSterilizationType(barcode,sterilizerName,frequency);
                                                                 top.Ext.getCmp('inputBarcode').setValue("");
                                                             }else if(TOUSSEINSTANCE == result){  //器械包实例2
                                                                 loadTousseInstanceCheckPosition(barcode,recordID);
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r30898 -r31032
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 30898)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 31032)
@@ -99,6 +99,7 @@
                 }
                 if (!isExist) {
                     top.Ext.getCmp('sterilizationType').setValue('');
+                    oldSterilizationType = '';
                 }
             }
         }
@@ -698,13 +699,14 @@
  * @param {条码} barcode 
  * @param {灭菌炉的名称} sterilizerName 
  */
-function loadSterilizationType(barcode, sterilizerName) {
+function loadSterilizationType(barcode, sterilizerName, frequency) {
     DWREngine.setAsync(false);
-    SterilizationRecordTableManager.getSterilizationType(barcode, sterilizerName, function setSterilizationType(result) {
+    SterilizationRecordTableManager.getSterilizationType(barcode, sterilizerName, frequency, function (result) {
         if (result != null) {
             var resultArray = result.split(':');
             if (resultArray[0] == "success") {
                 var sterilizationType = resultArray[1].split(',')[0];
+                var newSterilizationType = resultArray[4] || '';
                 if (resultArray[2] == "success") {
                     top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
                     oldSterilizationType = sterilizationType;
@@ -723,8 +725,29 @@
                         }
                     });
                 } else {
-                    top.Ext.MessageBox.confirm("请确认", resultArray[2],
+                    if(resultArray[3] == "强制提醒"){
+                        top.Ext.MessageBox.alert("请确认", resultArray[2],
                         function (button, text) {
+                            top.Ext.getCmp('sterilizationType').setValue(newSterilizationType);
+                            oldSterilizationType = newSterilizationType;
+                            //加载灭菌参数
+                            SterilizationRecordTableManager.getParameter(newSterilizationType, function (result) {
+                                if (result != null && result.length > 0) {
+                                    top.Ext.getCmp('parameter').setValue(result);
+                                } else {
+                                    top.Ext.getCmp('parameter').setValue('');
+                                }
+                            });
+                            //选择默认灭菌目的
+                            SterilizationRecordTableManager.getSterilizationPurpose(newSterilizationType, function (result) {
+                                if (result != null && result.length > 0) {
+                                    top.Ext.getCmp('sterilizationPurpose').setValue(result);
+                                }
+                            });
+                        });
+                    }else {
+                        top.Ext.MessageBox.confirm("请确认", resultArray[2],
+                        function (button, text) {
                             if ("yes" == button) {
                                 top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
                                 oldSterilizationType = sterilizationType;
@@ -742,10 +765,9 @@
                                         top.Ext.getCmp('sterilizationPurpose').setValue(result);
                                     }
                                 });
-                            } else {
-                                top.Ext.getCmp('sterilizationType').setValue(oldSterilizationType);
                             }
                         });
+                    }
                 }
             } else {
                 showResult(resultArray[1], null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
@@ -759,19 +781,40 @@
  * 扫描灭菌员条码
  * @param {灭菌条码} sterilizerName 
  * @param {灭菌程序} sterilizationType 
+ * @param {炉次} frequency 
  */
-function isHaveDoneNoticeSterilisation(sterilizerName, sterilizationType) {
+function isHaveDoneNoticeSterilisation(sterilizerName, sterilizationType, frequency) {
     Ext.Ajax.request({
         url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!isHaveDoneNoticeSterilisation.do',
         params: {
             sterilizerName: sterilizerName,
-            sterilizationType: sterilizationType
+            sterilizationType: sterilizationType,
+            frequency:frequency
         },
         success: function (response, options) {
             var result = Ext.decode(response.responseText);
             if (result.success == false) {
-                top.Ext.MessageBox.confirm("请确认", result.confirmMessage,
+                if(result.remindMode == "强制提醒"){
+                    top.Ext.MessageBox.alert("请确认", result.confirmMessage,
                     function (button, text) {
+                        top.Ext.getCmp('sterilizationType').setValue(result.sterilisation);
+                        oldSterilizationType = result.sterilisation;
+                        //加载灭菌参数
+                        SterilizationRecordTableManager.getParameter(result.sterilisation, function (result) {
+                            if (result != null && result.length > 0) {
+                                top.Ext.getCmp('parameter').setValue(result);
+                            }
+                        });
+                        //选择默认灭菌目的
+                        SterilizationRecordTableManager.getSterilizationPurpose(result.sterilisation, function (result) {
+                            if (result != null && result.length > 0) {
+                                top.Ext.getCmp('sterilizationPurpose').setValue(result);
+                            }
+                        });
+                    });
+                }else {
+                    top.Ext.MessageBox.confirm("请确认", result.confirmMessage,
+                    function (button, text) {
                         if ("yes" == button) {
                             top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
                             oldSterilizationType = sterilizationType;
@@ -791,6 +834,7 @@
                             top.Ext.getCmp('sterilizationType').setValue(oldSterilizationType);
                         }
                     });
+                }
             } else {
                 top.Ext.getCmp('sterilizationType').setValue(sterilizationType);
                 oldSterilizationType = sterilizationType;
@@ -3184,7 +3228,9 @@
                                         sterilizerNameTemp = combo.value;
                                         pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root, function () { });
                                     }
+                                    top.Ext.getCmp('sterilizationType').setValue('');
                                     top.Ext.getCmp('sterilizationPurpose').setValue('');
+                                    oldSterilizationType = '';
                                     Ext.Ajax.request({
                                         url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!loadSterilizerBySterilizerName.do',
                                         params: {
@@ -3307,7 +3353,8 @@
                                         showResult("选择灭菌炉");
                                         return false;
                                     }
-                                    isHaveDoneNoticeSterilisation(sterilizerName, record.data.sterilizationType);
+                                    var frequency = top.Ext.getCmp('frequency').getValue();
+                                    isHaveDoneNoticeSterilisation(sterilizerName, record.data.sterilizationType,frequency);
                                     /* //加载灭菌参数
                                      SterilizationRecordTableManager.getParameter(combo.getRawValue(),function(result){
                                          if(result != null && result.length > 0){
@@ -3438,7 +3485,8 @@
 
                                                                     return;
                                                                 }
-                                                                loadSterilizationType(barcode, sterilizerName);
+                                                                var frequency = top.Ext.getCmp('frequency').getRawValue();
+                                                                loadSterilizationType(barcode, sterilizerName, frequency);
                                                                 top.Ext.getCmp('inputBarcode').setValue("");
                                                             } else if (TOUSSEINSTANCE == result) {  //器械包实例2
                                                                 loadTousseInstanceCheckPosition(barcode, recordID);
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
===================================================================
diff -u -r26679 -r31032
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js	(.../interfereSterilizationTab1.js)	(revision 26679)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js	(.../interfereSterilizationTab1.js)	(revision 31032)
@@ -2,6 +2,53 @@
 if(sstsConfig.hasOwnProperty('isSRFinishConfirmShowUnload') && sstsConfig.isSRFinishConfirmShowUnload){
     confirmLabel = "灭菌卸载确认人";
 }
+var oldSterilizationType = '';
+/**
+ * 检测灭菌程序
+ * @param {灭菌条码} sterilizerName 
+ * @param {灭菌程序} sterilizationType 
+ * @param {炉次} frequency 
+ */
+function isHaveDoneNoticeSterilisation(sterilizerName, sterilizationType, frequency) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!isHaveDoneNoticeSterilisation.do',
+        params: {
+            sterilizerName: sterilizerName,
+            sterilizationType: sterilizationType,
+            frequency:frequency
+        },
+        success: function (response, options) {
+			var result = Ext.decode(response.responseText);
+            if (result.success == false) {
+                if(result.remindMode == "强制提醒"){
+                    top.Ext.MessageBox.alert("请确认", result.confirmMessage,
+                    function (button, text) {
+						oldSterilizationType = result.sterilisation;
+                        top.Ext.getCmp('sterilizationMethod1').setValue(result.sterilisation);
+                    });
+                }else {
+                    top.Ext.MessageBox.confirm("请确认", result.confirmMessage,
+                    function (button, text) {
+                        if ("yes" == button) {
+							oldSterilizationType = sterilizationType;
+                            top.Ext.getCmp('sterilizationMethod1').setValue(sterilizationType);
+                        } else {
+                            top.Ext.getCmp('sterilizationMethod1').setValue(oldSterilizationType);
+                        }
+                    });
+                }
+            }else {
+				oldSterilizationType = sterilizationType;
+			}
+
+        },
+        failure: function (response, options) {
+            top.Ext.getCmp('sterilizationMethod1').setValue(oldSterilizationType);
+            showResult("验证当天是否做过需要提示的灭菌程序失败");
+
+        }
+    });
+}
 function showSterilizationRecordParams(id,curStatus,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser,srSituationComfirmer,finishComfirmer){
 	// 灭菌程序store
 	var foldersJsonStore = new Ext.data.SimpleStore({
@@ -170,7 +217,14 @@
 								mode : 'local',
 								triggerAction : 'all',
 								anchor : '100%',
-								allowBlank : false
+								allowBlank : false,
+								listeners: {
+									select: function (combo, record, index) {
+										var sterilizerName = top.Ext.getCmp('sterilizerName1').getValue();
+										var frequency = top.Ext.getCmp('frequency1').getValue();
+										isHaveDoneNoticeSterilisation(sterilizerName, record.data.cleaningMethod,frequency);
+									}
+								}
 							}]
 						},{
 							layout : 'form',