Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r40813 -r40835 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40813) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40835) @@ -4249,25 +4249,25 @@ xtype : 'textfield', fieldLabel : patientAreaName, maxLength : '50', - id : sstsConfig.enableDepartmentToWardAssociation ? 'patientArea2' : 'patientArea', - name : sstsConfig.enableDepartmentToWardAssociation ? 'patientArea2' : 'patientArea', + id : sstsConfig.enablePatientAreaSetting ? 'patientArea2' : 'patientArea', + name : sstsConfig.enablePatientAreaSetting ? 'patientArea2' : 'patientArea', width : '33.3%', allowBlank : true, - hidden:sstsConfig.enableDepartmentToWardAssociation, + hidden:sstsConfig.enablePatientAreaSetting, flex : 1 },{ xtype: 'combo', fieldLabel: patientAreaName, valueField: 'value', displayField: 'value', - id: sstsConfig.enableDepartmentToWardAssociation ? 'patientArea' : 'patientArea2', - name: sstsConfig.enableDepartmentToWardAssociation ? 'patientArea' : 'patientArea2', + id: sstsConfig.enablePatientAreaSetting ? 'patientArea' : 'patientArea2', + name: sstsConfig.enablePatientAreaSetting ? 'patientArea' : 'patientArea2', triggerAction: 'all', forceSelection: false, editable: false, allowBlank: true, store: patientAreaStore, - hidden:!sstsConfig.enableDepartmentToWardAssociation, + hidden:!sstsConfig.enablePatientAreaSetting, width : '33.3%', flex : 1 }]