Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r15370 -r15374
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 15370)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 15374)
@@ -180,7 +180,7 @@
 function getWashStartDateTimeAndEndDateTime(barcode){
 	 $.ajax({
          type:'get',
-         url:WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getWashStartDateTimeAndEndDateTime.do?&barcode='+barcode+'',
+         url:WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getWashStartDateTimeAndEndDateTime.do?time='+new Date()+'&barcode='+barcode,
          dataType:'json',
          success:function(result){
          	var success = result.success;
@@ -385,12 +385,19 @@
 	$("#basketsUl").empty();
 	if(defaultDisinfectIdentificationBarcode != ""){
 		loadBarcodeDevice(defaultDisinfectIdentificationBarcode);
+	}else{
+		$("#disinfectIdentification").val("");
 	}
 	if(defaultDisinfectProgramBarcode != ""){
 		loadBarcodeDevice(defaultDisinfectProgramBarcode);
+	}else{
+		$("#disinfectProgram").val("");
 	}
-	$("#startDate").val("");
-	$("#endDate").val("");
+	
+	if(defaultDisinfectProgramBarcode == ""){
+		$("#startDate").val("");
+		$("#endDate").val("");
+	}
 }
 
 function doSaveAction(){
@@ -451,6 +458,9 @@
 	if(defaultDisinfectProgramBarcode != ""){
 		loadBarcodeDevice(defaultDisinfectProgramBarcode);
 	}
-	$("#startDate").val(today);
-	$("#endDate").val(today);
+	if(defaultDisinfectProgramBarcode == ""){
+		$("#startDate").val(today);
+		$("#endDate").val(today);
+	}
+	
 }
\ No newline at end of file