Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28709 -r28710 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28709) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28710) @@ -1705,6 +1705,7 @@ $('#depart').val(msg.tousseInstance.locationForDisplay) $('#departCode').val(msg.tousseInstance.location) } + var tousseDepart = isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay2)?msg.tousseInstance.locationForDisplay:msg.tousseInstance.locationForDisplay2; if(msg.shareDeparts.length > 0){ if(msg.shareDeparts.indexOf(departValue) == -1 && departValue !== ''){ alertDiv('该器械包不属于该科室。'); @@ -1717,7 +1718,6 @@ return; } } - var tousseDepart = isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay2)?msg.tousseInstance.locationForDisplay:msg.tousseInstance.locationForDisplay2; // 对于已废弃的包,不检查其位置和所属科室的信息 var ti = msg.tousseInstance; var td = ti.tousseDefinition;