Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
===================================================================
diff -u -r29466 -r29476
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 29466)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 29476)
@@ -147,7 +147,8 @@
top.Ext.getCmp('cycleCounter').setValue(0);
}
}
- SterilizationRecordTableManager.saveMonitorResult(id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalObserveDateString,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,monitorAuditor,remark,
+ var bioreaderId = top.Ext.getCmp('bioreaderId').getValue();
+ SterilizationRecordTableManager.saveMonitorResult(bioreaderId,id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalObserveDateString,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,monitorAuditor,remark,
cardPosition,monitoringTubeResult,monitoringBatchNum,monitoringTubeExpiryDate,cardPositionOfControlTube,controlTubeResult,controlBatchNum,controlTubeExpiryDate,function(result){
if(result){
sterilizationRecordWin.close();
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r29098 -r29476
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 29098)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 29476)
@@ -107,7 +107,8 @@
-
+
+
<%--引入自己的js --%>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r29466 -r29476
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29466)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29476)
@@ -2829,7 +2829,17 @@
}
}
});
- if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){
+ BioreaderTableManager.getBioreaderOfSterilizerBySterilizerName(combo.value,function(result){
+ if(result != ''){
+ var result = Ext.decode(result);
+ top.Ext.getCmp('bioreaderId').setValue(result.bioreaderId);
+ top.Ext.getCmp('bioreaderName').setValue(result.bioreaderName);
+ }else{
+ top.Ext.getCmp('bioreaderId').setValue(null);
+ top.Ext.getCmp('bioreaderName').setValue(null);
+ }
+ });
+ if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){
Ext.Ajax.request( {
url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do',
params : {
@@ -4112,7 +4122,9 @@
if(scanUser == true){
top.Ext.getCmp('sterilizationUser').setValue('');
}
- bioreaderStore.load();
+ //bioreaderStore.load();
+ top.Ext.getCmp('bioreaderId').setValue(null);
+ top.Ext.getCmp('bioreaderName').setValue(null);
} else {
//优先显示生物监测数据来源的生物阅读器,其次显示灭菌炉绑定的生物阅读器
if(sr.bioreader != null){