Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js =================================================================== diff -u -r15368 -r15370 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15368) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15370) @@ -386,7 +386,7 @@ if(defaultDisinfectIdentificationBarcode != ""){ loadBarcodeDevice(defaultDisinfectIdentificationBarcode); } - if(defaultDisinfectProgramBarcode != null){ + if(defaultDisinfectProgramBarcode != ""){ loadBarcodeDevice(defaultDisinfectProgramBarcode); } $("#startDate").val(""); @@ -448,7 +448,7 @@ if(defaultDisinfectIdentificationBarcode != ""){ loadBarcodeDevice(defaultDisinfectIdentificationBarcode); } - if(defaultDisinfectProgramBarcode != null){ + if(defaultDisinfectProgramBarcode != ""){ loadBarcodeDevice(defaultDisinfectProgramBarcode); } $("#startDate").val(today);