Index: ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
===================================================================
diff -u -r17924 -r17935
--- ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java	(.../CSSDTestDataProcess.java)	(revision 17924)
+++ ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java	(.../CSSDTestDataProcess.java)	(revision 17935)
@@ -918,7 +918,7 @@
 		initSterilizationPurpose();
 		//初始化7种包装类型
 		initPackingType();
-		//初始化8个清洗程序，2台清洗机
+		//初始化8个清洗程序，3台清洗机
 		initCleanMethodAndRinser();
 		//初始化9种灭菌程序，2个灭菌炉
 		initSterilisationAndSterilizer();
@@ -1342,9 +1342,10 @@
 	 * 	7、化学（条码：010172007）<br/>
 	 * 	8、手工清洗（条码：010172008）<br/>
 	 * 
-	 * 初始化2台清洗机：<br/>
+	 * 初始化3台清洗机：<br/>
 	 * 	1、清洗机1（属性科室：测试供应室，条码：010173001，含有的清洗程序：P1、P2、P3、P4）<br/>
 	 * 	2、手工清洗（属性科室：测试手术室，条码：010173002，含有的清洗程序：P5、P6、化学、手工清洗）
+	 *  3、清洗机2（属性科室：测试手术室，条码：010173003，含有的清洗程序：P5、P6） 需要确认完成
 	 */
 	private void initCleanMethodAndRinser(){
 		Rinser rinser1 = new Rinser();
@@ -1438,6 +1439,20 @@
 		rinser2.setCleanMethods(cleanMethods2);
 		
 		objectDao.saveOrUpdate(rinser2);
+		
+		Rinser rinser3 = new Rinser();
+		rinser3.setBarcode("010173003");
+		rinser3.setName("清洗机2");
+		rinser3.setDepartment(Constants.ORG_UNIT_NAME_CSSD);
+		rinser3.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
+		rinser3.setIsWashConfirm(com.forgon.Constants.STR_YES);
+		
+		Set<CleanMethod> cleanMethods3 = new HashSet<CleanMethod>();
+		cleanMethods3.add(cleanMethod5);
+		cleanMethods3.add(cleanMethod6);
+		rinser3.setCleanMethods(cleanMethods3);
+		objectDao.saveOrUpdate(rinser3);
+		
 	}
 
 	/**
@@ -1690,6 +1705,28 @@
 		container4.setDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		containerManager.saveOrUpdate(container4);
 		
+		Container container7 = new Container();
+		container7.setBarcode("019000005");
+		container7.setContainerName("清洗筐120");
+		container7.setPurpose(Container.CONTAINER_PURPOSE_CLEAN_BASKET);
+		container7.setContainerType(Container.CONTAINERTYPE_BASKET);
+		container7.setStatus(Container.CONTAINER_STATUS_FREE);
+		container7.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER);
+		container7.setDepartCode(Constants.ORG_UNIT_CODE_OR);
+		container7.setDepartName(Constants.ORG_UNIT_NAME_OR);
+		containerManager.saveOrUpdate(container7);
+		
+		Container container8 = new Container();
+		container8.setBarcode("019000006");
+		container8.setContainerName("清洗筐121");
+		container8.setPurpose(Container.CONTAINER_PURPOSE_CLEAN_BASKET);
+		container8.setContainerType(Container.CONTAINERTYPE_BASKET);
+		container8.setStatus(Container.CONTAINER_STATUS_FREE);
+		container8.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER);
+		container8.setDepartCode(Constants.ORG_UNIT_CODE_OR);
+		container8.setDepartName(Constants.ORG_UNIT_NAME_OR);
+		containerManager.saveOrUpdate(container8);
+		
 		Container container5 = new Container();
 		container5.setBarcode("018000001");
 		container5.setContainerName("灭菌筐01");
Index: ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json
===================================================================
diff -u -r17934 -r17935
--- ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json	(.../settings.json)	(revision 17934)
+++ ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json	(.../settings.json)	(revision 17935)
@@ -1,5 +1,6 @@
 {
     "服务器地址": "http://localhost",
+    "触摸屏清洗服务地址":"http://localhost/logon.jsp?logonType=washform",
 //    "服务器地址": "http://localhost:81",
     "一级供应室用户": {"工号": "cssduser1","条码": "0100001001","姓名": "cssduser1全名","密码": "1","科室名称": "测试供应室"},
     "二级供应室用户": {"工号": "oruser1","条码": "0100002001","姓名": "oruser1全名","密码": "1","科室名称": "测试手术室"},
@@ -33,7 +34,9 @@
 	"一级供应室清洗篮筐2": {"条码": "019000002","名称": "清洗筐117"},
 	"一级供应室清洗篮筐3": {"条码": "019000003","名称": "清洗筐118"},
 	"一级供应室清洗篮筐4": {"条码": "019000004","名称": "清洗筐119"},
-	"二级供应室清洗篮筐1": {"条码": "","名称": ""},
+	"二级供应室清洗机": {"清洗机条码": "010173002","清洗程序条码": "010172005"},
+	"二级供应室审核人": {"工号": "oruser1","条码": "0100002001","姓名": "oruser1全名","密码": "1"},
+	"二级供应室清洗篮筐1": {"条码": "019000005","名称": "清洗篮筐120"},
 	"二级供应室清洗篮筐2": {"条码": "","名称": ""},	
 	"二级供应室清洗篮筐3": {"条码": "","名称": ""},	
 	"灭菌炉分组": {"大型压力蒸汽": "大型压力蒸汽", "低温等离子": "低温等离子"},