Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js =================================================================== diff -u -r32987 -r32998 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js (.../proxyDisinfectionForm.js) (revision 32987) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js (.../proxyDisinfectionForm.js) (revision 32998) @@ -656,18 +656,23 @@ params: { packingRecordIds: idsArr.join(',') }, success: function (response, options) { var result = Ext.decode(response.responseText); - if (result.checkResult !== '') { + if ((result.checkResult || '') !== '') { showResult(result.checkResult); } - var produceDeptName = result.produceDeptName; - var produceDeptCode = result.produceDeptCode; - var packingRecordIds = result.packingRecordIds; - top.Ext.getCmp('depart').setValue(produceDeptName); - top.Ext.getCmp('departCoding').setValue(produceDeptCode); - top.Ext.getCmp('pakingRecordIDs').setValue(packingRecordIds); - for (var i = 0; i < result.instances.length; i++) { - var instance = result.instances[i]; - addTousseInstance(instance.id, instance.barcode, instance.name, instance.status); + if(result.success){ + var produceDeptName = result.produceDeptName; + var produceDeptCode = result.produceDeptCode; + var packingRecordIds = result.packingRecordIds; + top.Ext.getCmp('depart').setValue(produceDeptName); + top.Ext.getCmp('departCoding').setValue(produceDeptCode); + top.Ext.getCmp('pakingRecordIDs').setValue(packingRecordIds); + for (var i = 0; i < result.instances.length; i++) { + var instance = result.instances[i]; + var sterilizationMode = instance.sterilizationMode || ''; + addTousseInstance(instance.id, instance.barcode, instance.name, instance.status, false, 0, sterilizationMode); + } + }else { + showResult(result.message); } } });