Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js =================================================================== diff -u -r15367 -r15368 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15367) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15368) @@ -383,8 +383,12 @@ function cleanPage(){ $("#basketsUl").empty(); - loadBarcodeDevice(defaultDisinfectIdentificationBarcode); - loadBarcodeDevice(defaultDisinfectProgramBarcode); + if(defaultDisinfectIdentificationBarcode != ""){ + loadBarcodeDevice(defaultDisinfectIdentificationBarcode); + } + if(defaultDisinfectProgramBarcode != null){ + loadBarcodeDevice(defaultDisinfectProgramBarcode); + } $("#startDate").val(""); $("#endDate").val(""); } @@ -441,8 +445,12 @@ function initDate(){ document.onkeydown = showKeyDown; $("#operator").val(userName); - loadBarcodeDevice(defaultDisinfectIdentificationBarcode); - loadBarcodeDevice(defaultDisinfectProgramBarcode); + if(defaultDisinfectIdentificationBarcode != ""){ + loadBarcodeDevice(defaultDisinfectIdentificationBarcode); + } + if(defaultDisinfectProgramBarcode != null){ + loadBarcodeDevice(defaultDisinfectProgramBarcode); + } $("#startDate").val(today); $("#endDate").val(today); } \ No newline at end of file