Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r16737 -r16738 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16737) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16738) @@ -46,14 +46,15 @@ if(stasticsStore.getCount() > 0){ for(var i = 0;i < stasticsStore.getCount();i++){ var stasticsRowData = stasticsStore.getAt(i); - if(stasticsRowData.data.depart == row.data.depart - && stasticsRowData.data.tousseDefinitionName == row.data.tousseDefinitionName){ - if(stasticsRowData.data.count > 1){ - stasticsRowData.set("count",parseInt(stasticsRowData.data.count) - 1); - }else{ - stasticsStore.remove(stasticsRowData); + if(stasticsRowData.data.tousseDefinitionName == row.data.tousseDefinitionName){ + if(stasticsRowData.data.depart == row.data.depart || (!stasticsRowData.data.depart && !row.data.depart)){ + if(stasticsRowData.data.count > 1){ + stasticsRowData.set("count",parseInt(stasticsRowData.data.count) - 1); + }else{ + stasticsStore.remove(stasticsRowData); + } + break; } - break; } } } @@ -535,6 +536,7 @@ if(result.data && result.data.length > 0){ for(var i = 0;i < result.data.length;i++){ var currentTousseInstance = new tousseInstanceRecord({ + depart:result.data[i].depart, tousseDefinitionName: result.data[i].tousseName, barcode: result.data[i].barcode });