Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r37325 -r37450
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 37325)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 37450)
@@ -29,6 +29,8 @@
     pendingSterilizationColumnTreeHeight = 420
 }
 
+var oldFormValue = {} 
+
 var pendingSterilizationColumnTreeWidth = extBodyWidth > 1600 ? 600 : rightWidth - 50;
 //是否隐藏“一键入炉”按钮
 var isHideBtnBatchAddTousse = sstsConfig.hasOwnProperty('isHideBtnBatchAddTousse') && sstsConfig.isHideBtnBatchAddTousse;
@@ -5320,7 +5322,47 @@
                             name: "biologyResult",
                             id: "biologyResult",
                             allowBlank: false,
-                            anchor: sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation ? '100%' : '50%'
+                            anchor: sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation ? '100%' : '50%',
+                            listeners:{
+                                select: function (combo, record, index) {
+                                	//NYSY-59:重置相关字段
+                                    if(combo.value == '无' && id !== ''){
+                                        top.Ext.MessageBox.confirm("请确认",'生物监测结果切换为"无"时，将重置相关字段，是否继续？',function (button, text) {
+                                            if ("yes" == button) {
+                                                top.Ext.getCmp('biologicalMonitoringStartDate').setValue('');
+                                                top.Ext.getCmp('biologicalMonitoringEndDate').setValue('');
+                                                top.Ext.getCmp('monitorUserBarcode').setValue('');
+                                                top.Ext.getCmp('monitorUser').setValue('');
+                                                top.Ext.getCmp('monitorCheckerBarcode').setValue('');
+                                                top.Ext.getCmp('monitorChecker').setValue('');
+                                                
+                                                if(sstsConfig.enableBiologicalObserveDate){
+                                                    top.Ext.getCmp('biologicalObserveDate').setValue('');
+                                                }
+                                                if(enableBioreaderInterface){
+                                                    top.Ext.getCmp('bioreaderName').setValue('');
+                                                    top.Ext.getCmp('cardPosition').setValue('');
+                                                    top.Ext.getCmp('monitoringTubeResult').setValue('');
+                                                    top.Ext.getCmp('monitoringBatchNum').setValue('');
+                                                    top.Ext.getCmp('monitoringTubeExpiryDate').setValue('');
+                                                    top.Ext.getCmp('cardPositionOfControlTube').setValue('');
+                                                    top.Ext.getCmp('controlTubeResult').setValue('');
+                                                    top.Ext.getCmp('controlBatchNum').setValue('');
+                                                    top.Ext.getCmp('controlTubeExpiryDate').setValue('');
+                                                }
+                                                if(sstsConfig.needMonitorAuditor){
+                                                    top.Ext.getCmp('monitorAuditor').setValue('');
+                                                    top.Ext.getCmp('monitorAuditorBarcode').setValue('');
+                                                }
+                                            }else {
+                                                top.Ext.getCmp('biologyResult').setValue(oldFormValue.biologyResult);
+                                            }
+                                        });
+                                    }else {
+                                        oldFormValue.biologyResult = combo.value;
+                                    }
+                                }
+                            }
                         }]
                     }, {
                         columnWidth: .5,
@@ -5525,7 +5567,27 @@
                                 fields: ['cardPosition'],
                                 autoLoad: false,
                                 data: [['1'], ['2'], ['3'], ['4'], ['5'], ['6'], ['7'], ['8'], ['9'], ['10']]
-                            })
+                            }),
+                            listeners:{
+                                blur:function(thiz){
+                                	//NYSY-59:重置相关字段
+                                    if(thiz.getRawValue() == ''){
+                                        top.Ext.MessageBox.confirm("请确认",'卡位被清空时，将重置相关字段，是否继续？',function (button, text) {
+                                            if ("yes" == button) {
+                                                if(enableBioreaderInterface){
+                                                    top.Ext.getCmp('monitoringTubeResult').setValue('');
+                                                    top.Ext.getCmp('monitoringBatchNum').setValue('');
+                                                    top.Ext.getCmp('monitoringTubeExpiryDate').setValue('');
+                                                }
+                                            }else {
+                                                top.Ext.getCmp('cardPosition').setValue(oldFormValue.cardPosition);
+                                            }
+                                        });
+                                    }else {
+                                        oldFormValue.cardPosition = thiz.getRawValue();
+                                    }
+                                }
+                            }
                         }]
                     }, {
                         columnWidth: .5,
@@ -5595,7 +5657,27 @@
                                 fields: ['cardPositionOfControlTube'],
                                 autoLoad: false,
                                 data: [['1'], ['2'], ['3'], ['4'], ['5'], ['6'], ['7'], ['8'], ['9'], ['10']]
-                            })
+                            }),
+                            listeners:{
+                                blur:function(thiz){
+                                	//NYSY-59:重置相关字段
+                                    if(thiz.getRawValue() == ''){
+                                        top.Ext.MessageBox.confirm("请确认",'卡位被清空时，将重置相关字段，是否继续？',function (button, text) {
+                                            if ("yes" == button) {
+                                                if(enableBioreaderInterface){
+                                                    top.Ext.getCmp('controlTubeResult').setValue('');
+                                                    top.Ext.getCmp('controlBatchNum').setValue('');
+                                                    top.Ext.getCmp('controlTubeExpiryDate').setValue('');
+                                                }
+                                            }else {
+                                                top.Ext.getCmp('cardPositionOfControlTube').setValue(oldFormValue.cardPositionOfControlTube);
+                                            }
+                                        });
+                                    }else {
+                                        oldFormValue.cardPositionOfControlTube = thiz.getRawValue();
+                                    }
+                                }
+                            }
                         }]
                     }, {
                         columnWidth: .5,
@@ -5668,8 +5750,18 @@
                                                         result.isNotSameOrgUnit ? showMultipleResult(result.message || "不允许登记非本科室人员，请扫描本科室人员条码！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage) : showMultipleResult(result.message || "输入的条码有误！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
                                                         return;
                                                     }
-                                                    top.Ext.getCmp('monitorUser').setValue(result.fullName);
-                                                    top.Ext.getCmp('monitorCheckerBarcode').focus();
+                                                    //NYSY-59：移除已输入用户
+                                                    if(top.Ext.getCmp('monitorUser').getValue() == result.fullName){
+                                                        top.Ext.MessageBox.confirm("请确认",'是否移除已输入用户',function (button, text) {
+                                                            if ("yes" == button) {
+                                                                top.Ext.getCmp('monitorUser').setValue('');
+                                                                top.Ext.getCmp('monitorUserBarcode').focus();
+                                                            }
+                                                        });
+                                                    }else {
+                                                        top.Ext.getCmp('monitorUser').setValue(result.fullName);
+                                                        top.Ext.getCmp('monitorCheckerBarcode').focus();
+                                                    }
                                                 } else {
                                                     showMultipleResult('找不到该条码所对应的人员信息', null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
                                                 }
@@ -5719,8 +5811,18 @@
                                                         result.isNotSameOrgUnit ? showMultipleResult(result.message || "不允许登记非本科室人员，请扫描本科室人员条码", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage) : showMultipleResult("输入的条码有误！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
                                                         return;
                                                     }
-                                                    top.Ext.getCmp('monitorChecker').setValue(result.fullName);
-                                                    top.Ext.getCmp('monitorAuditorBarcode').focus();
+                                                    //NYSY-59：移除已输入用户
+                                                    if(top.Ext.getCmp('monitorChecker').getValue() == result.fullName){
+                                                        top.Ext.MessageBox.confirm("请确认",'是否移除已输入用户',function (button, text) {
+                                                            if ("yes" == button) {
+                                                                top.Ext.getCmp('monitorChecker').setValue('');
+                                                                top.Ext.getCmp('monitorCheckerBarcode').focus();
+                                                            }
+                                                        });
+                                                    }else {
+                                                        top.Ext.getCmp('monitorChecker').setValue(result.fullName);
+                                                        top.Ext.getCmp('monitorAuditorBarcode').focus();
+                                                    }
                                                 } else {
                                                     showMultipleResult('找不到该条码所对应的人员信息', null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
                                                 }
@@ -6336,6 +6438,13 @@
                     loadFormInstance(id, 'runTableRecordId', 'runTableRecordFormId', 'runTableRecordFormDefinitionBox', 'runTableRecordFormDefinitionId');
                 }
             }
+
+            //NYSY-59:保存页面显示的值
+            oldFormValue = {
+                biologyResult:sr.biologyResult,
+                cardPosition:sr.cardPosition,
+                cardPositionOfControlTube:sr.cardPositionOfControlTube
+            }
         },
         params: {
             id: id