Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r26739 -r26792 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 26739) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 26792) @@ -3988,7 +3988,7 @@ } }else{ //灭菌完成 //是否允许手动选择生物监测结果”选择为选否时,生物监测结果不允许手动选择,只能从生物阅读器接口获取结果写入。 - if(sr.sterilizer.isAllowHandMovementSelectBiologicalResult !="是"){ + if(sr.sterilizer.allowSelectBiologicalResult !="是"){ top.Ext.getCmp('biologyResult').disable(); } _biologicalMonitoringTime = sr.sterilizer.biologicalMonitoringTime*60*1000; //此灭菌炉的生物监测持续时间 Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r26739 -r26792 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 26739) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 26792) @@ -757,8 +757,8 @@ xtype : 'combo', fieldLabel : '是否允许手动选择生物监测结果', allowBlank : true, - name : 'isAllowHandMovementSelectBiologicalResult', - id : 'isAllowHandMovementSelectBiologicalResult', + name : 'allowSelectBiologicalResult', + id : 'allowSelectBiologicalResult', valueField : 'value', displayField : 'value', forceSelection : true, @@ -1080,7 +1080,7 @@ top.Ext.getCmp('isEveryDayReset').setValue('是'); top.Ext.getCmp('isCheckSterilizationTime').setValue('否'); top.Ext.getCmp('isAutoCompleteSterilization').setValue('是'); - top.Ext.getCmp('isAllowHandMovementSelectBiologicalResult').setValue('是'); + top.Ext.getCmp('allowSelectBiologicalResult').setValue('是'); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java =================================================================== diff -u -r26736 -r26792 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 26736) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 26792) @@ -77,7 +77,7 @@ /** * 是否允许手动选择生物监测结果 */ - private String isAllowHandMovementSelectBiologicalResult = "是"; + private String allowSelectBiologicalResult = "是"; /** * 购买日期 @@ -562,15 +562,14 @@ public void setNeedNoticeSterilisation(String needNoticeSterilisation) { this.needNoticeSterilisation = needNoticeSterilisation; - } + } - public String getIsAllowHandMovementSelectBiologicalResult() { - return isAllowHandMovementSelectBiologicalResult; + public String getAllowSelectBiologicalResult() { + return allowSelectBiologicalResult; } - public void setIsAllowHandMovementSelectBiologicalResult( - String isAllowHandMovementSelectBiologicalResult) { - this.isAllowHandMovementSelectBiologicalResult = isAllowHandMovementSelectBiologicalResult; + public void setAllowSelectBiologicalResult(String allowSelectBiologicalResult) { + this.allowSelectBiologicalResult = allowSelectBiologicalResult; } }