Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceCommon.js =================================================================== diff -u -r40949 -r41167 --- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceCommon.js (.../forminstanceCommon.js) (revision 40949) +++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceCommon.js (.../forminstanceCommon.js) (revision 41167) @@ -262,15 +262,24 @@ name: 'configItemOption' + id, xtype: 'hidden', hidden: allowBlank, - value: resultValue + value: '' }); if (options != "") { var optionsJson = JSON.parse(options); + var optionNames = []; + if (resultValue != null && resultValue !== '') { + var newValue = resultValue.substring(1); + newValue = '[' + newValue + ']'; + var valueObj = JSON.parse(newValue); + for (var k = 0; k < valueObj.length; k++) { + optionNames.push(valueObj[k].name) + } + } var formId = Ext.getCmp('id').getValue(); for (var j = 0; j < optionsJson.length; j++) { var checked = false; if(formId !== ''){ - if (resultValue != '' && resultValue.indexOf(JSON.stringify(optionsJson[j])) != -1) { + if (optionNames.indexOf(optionsJson[j].name) != -1) { checked = true; } }else { Index: ssts-web/src/main/webapp/disinfectsystem/customform/forminstanceCommon.js =================================================================== diff -u -r40388 -r41167 --- ssts-web/src/main/webapp/disinfectsystem/customform/forminstanceCommon.js (.../forminstanceCommon.js) (revision 40388) +++ ssts-web/src/main/webapp/disinfectsystem/customform/forminstanceCommon.js (.../forminstanceCommon.js) (revision 41167) @@ -258,13 +258,22 @@ name: 'configItemOption' + id, xtype: 'hidden', hidden: allowBlank, - value: resultValue + value: '' }); if (options != "") { var optionsJson = JSON.parse(options); + var optionNames = []; + if (resultValue != null && resultValue !== '') { + var newValue = resultValue.substring(1); + newValue = '[' + newValue + ']'; + var valueObj = JSON.parse(newValue); + for (var k = 0; k < valueObj.length; k++) { + optionNames.push(valueObj[k].name) + } + } for (var j = 0; j < optionsJson.length; j++) { var checked = false; - if (resultValue != '' && resultValue.indexOf(JSON.stringify(optionsJson[j])) != -1) { + if (optionNames.indexOf(optionsJson[j].name) != -1) { checked = true; } optionsArray.push({