Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r27343 -r27442 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 27343) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 27442) @@ -410,44 +410,45 @@ function getSterilization(barcode, recordId){ if(barcode != null && barcode.length > 0){ DWREngine.setAsync(true); - var sterilizerName + var sterilizerName; SterilizationRecordTableManager.getRinserSterilizationType(barcode,recordId,function setSterilizationType(result){ if(result != null){ var resultArray = result.split(':'); if(resultArray[0] == "success"){ top.Ext.getCmp('sterilizerName').setValue(resultArray[1].split(',')[0]); top.Ext.getCmp('frequency').setValue(resultArray[1].split(',')[1]); - sterilizerName = resultArray[1].split(',')[0] + sterilizerName = resultArray[1].split(',')[0]; + SterilizationRecordTableManager.getNextCycleCounter(sterilizerName,recordId,function(result){ + if(result == 0) + { + top.Ext.getCmp('cycleCounter').setValue(1); + }else + { + top.Ext.getCmp('cycleCounter').setValue(result); + } + }); + //判断是否无条件显示循环次数 + if(sstsConfig.showCycleCountWithoutCondition){ + top.Ext.getCmp('cycleCounterId').show(); + }else{ + // 判断灭菌炉是否关联接口,是否显示循环次数 + SterilizationRecordTableManager.isDefineDeviceInterface(sterilizerName,function(result) + { + if(result) + { + top.Ext.getCmp('cycleCounterId').show(); + }else + { + top.Ext.getCmp('cycleCounterId').hide(); + } + }); + } }else{ showResult(resultArray[1], null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); } } }); - SterilizationRecordTableManager.getNextCycleCounter(sterilizerName,recordId,function(result){ - if(result == 0) - { - top.Ext.getCmp('cycleCounter').setValue(1); - }else - { - top.Ext.getCmp('cycleCounter').setValue(result); - } - }); - //判断是否无条件显示循环次数 - if(sstsConfig.showCycleCountWithoutCondition){ - top.Ext.getCmp('cycleCounterId').show(); - }else{ - // 判断灭菌炉是否关联接口,是否显示循环次数 - SterilizationRecordTableManager.isDefineDeviceInterface(sterilizerName,function(result) - { - if(result) - { - top.Ext.getCmp('cycleCounterId').show(); - }else - { - top.Ext.getCmp('cycleCounterId').hide(); - } - }); - } + DWREngine.setAsync(true); sterilizationTypeStore.reload(); if (sstsConfig.sterilizationCheckTousseSterilingType