Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r23909 -r23939 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 23909) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 23939) @@ -1157,8 +1157,8 @@ $('#depart').val(msg.tousseInstance.locationForDisplay) $('#departCode').val(msg.tousseInstance.location) } - - if(!isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay) && $('#depart').attr('value') != msg.tousseInstance.locationForDisplay){ + var tousseDepart = isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay2)?msg.tousseInstance.locationForDisplay:msg.tousseInstance.locationForDisplay2; + if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').attr('value') != tousseDepart){ alertDiv('该器械包不属于该科室。'); }else{ var ti = msg.tousseInstance;