Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r17649 -r17650
--- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17649)
+++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17650)
@@ -1199,16 +1199,14 @@
 		initMaterialType();
 		// 初始化包装类型
 		initPackingType();
-		// 初始化清洗程序
-		initCleanMethod();
-		// 初始化清洗机设置
-		initRinser();
-		// 初始化灭菌程序
-		initSterilisation();
+		// 初始化清洗程序和清洗机设置
+		initCleanMethodAndRinser();
 		// 初始化灭菌目的
 		initSterilizationPrupose();
 		// 初始化灭菌炉分组
 		initSterilerGroup();
+		// 初始化灭菌程序和灭菌炉
+		initSterilisationAndSterilizer();
 		// 一次性物品类型
 		HttpOption httpoption1 = new HttpOption();
 		httpoption1.setOptionListId(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
@@ -1394,34 +1392,6 @@
 		
 		containerManager.createVirtualContainer(999 , null);
 		
-
-		// 灭菌炉(属于供应室)
-		Sterilizer sterilizer1 = new Sterilizer();
-		sterilizer1.setName("1号高温蒸汽灭菌炉");
-		sterilizer1.setBarcode("010175001");
-		sterilizer1.setOwnGroup("大型压力蒸汽");
-		OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_CSSD, false);
-		assertNotNull(cssdDept);
-		
-		sterilizer1.setDepartment(cssdDept.getName());
-		sterilizer1.setOrgUnitCoding(cssdDept.getOrgUnitCoding());
-		
-		objectDao.save(sterilizer1);
-		
-
-		// 灭菌炉(属于二级供应室--手术室)
-		Sterilizer sterilizer2 = new Sterilizer();
-		sterilizer2.setName("6号高温蒸汽灭菌炉");
-		sterilizer2.setBarcode("010175002");
-		sterilizer2.setOwnGroup("低温等离子");
-		OrgUnit orDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_OR, false);
-		assertNotNull(orDept);
-		
-		sterilizer2.setDepartment(orDept.getName());
-		sterilizer2.setOrgUnitCoding(orDept.getOrgUnitCoding());
-		
-		objectDao.save(sterilizer2);
-		
 	}
 	/*
 	 * 初始化材料类型
@@ -1551,9 +1521,15 @@
 		objectDao.saveOrUpdate(httpoptionPackingTpye7);
 	}
 	/**
-	 * 初始化清洗程序的数据
+	 * 初始化清洗程序和清洗机设置
 	 */
-	private void initCleanMethod(){
+	private void initCleanMethodAndRinser(){
+		Rinser rinser1 = new Rinser();
+		rinser1.setBarcode("010173001");
+		rinser1.setName("清洗机1");
+		rinser1.setDepartment(Constants.ORG_UNIT_NAME_CSSD);
+		rinser1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
+		
 		CleanMethod cleanMethod1 = new CleanMethod();
 		cleanMethod1.setBarcode("010172001");
 		cleanMethod1.setCleanMethod("P1");
@@ -1586,6 +1562,20 @@
 		cleanMethod4.setValue("3000");
 		objectDao.saveOrUpdate(cleanMethod4);
 		
+		Set<CleanMethod> cleanMethods1 = new HashSet<CleanMethod>();
+		cleanMethods1.add(cleanMethod1);
+		cleanMethods1.add(cleanMethod2);
+		cleanMethods1.add(cleanMethod3);
+		cleanMethods1.add(cleanMethod4);
+		rinser1.setCleanMethods(cleanMethods1);
+		objectDao.saveOrUpdate(rinser1);
+		
+		Rinser rinser2 = new Rinser();
+		rinser2.setBarcode("010173002");
+		rinser2.setName("手工清洗");
+		rinser2.setDepartment(Constants.ORG_UNIT_NAME_OR);
+		rinser2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
+		
 		CleanMethod cleanMethod5 = new CleanMethod();
 		cleanMethod5.setBarcode("010172005");
 		cleanMethod5.setCleanMethod("P5");
@@ -1617,29 +1607,19 @@
 		cleanMethod8.setCleanParameter("化学侵泡后清洗");
 		cleanMethod8.setValue("600");
 		objectDao.saveOrUpdate(cleanMethod8);
-	}
-	/**
-	 * 初始化清洗机设置
-	 */
-	private void initRinser(){
-		Rinser rinser1 = new Rinser();
-		rinser1.setBarcode("010173001");
-		rinser1.setName("清洗机1");
-		rinser1.setDepartment(Constants.ORG_UNIT_NAME_CSSD);
-		rinser1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
-		objectDao.saveOrUpdate(rinser1);
+		Set<CleanMethod> cleanMethods2 = new HashSet<CleanMethod>();
+		cleanMethods2.add(cleanMethod5);
+		cleanMethods2.add(cleanMethod6);
+		cleanMethods2.add(cleanMethod7);
+		cleanMethods2.add(cleanMethod8);
+		rinser2.setCleanMethods(cleanMethods2);
 		
-		Rinser rinser2 = new Rinser();
-		rinser2.setBarcode("010173002");
-		rinser2.setName("手工清洗");
-		rinser2.setDepartment(Constants.ORG_UNIT_NAME_OR);
-		rinser2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 		objectDao.saveOrUpdate(rinser2);
 	}
 	/**
-	 * 初始化灭菌程序
+	 * 初始化灭菌程序 和灭菌炉
 	 */
-	private void initSterilisation(){
+	private void initSterilisationAndSterilizer(){
 		Sterilisation sterilisation1 = new Sterilisation();
 		sterilisation1.setBarcode("010174001");
 		sterilisation1.setSterilisation("P01");
@@ -1696,6 +1676,46 @@
 		sterilisation9.setParameter("超大超重器械");
 		sterilisation9.setSterilizationPurpose("器械包灭菌");
 		objectDao.saveOrUpdate(sterilisation9);
+		
+		// 灭菌炉(属于供应室)
+		Sterilizer sterilizer1 = new Sterilizer();
+		sterilizer1.setName("1号高温蒸汽灭菌炉");
+		sterilizer1.setBarcode("010175001");
+		sterilizer1.setOwnGroup("大型压力蒸汽");
+		OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_CSSD, false);
+		assertNotNull(cssdDept);
+		
+		sterilizer1.setDepartment(cssdDept.getName());
+		sterilizer1.setOrgUnitCoding(cssdDept.getOrgUnitCoding());
+		// 设置灭菌程序
+		Set<Sterilisation> sterilisations1 = new HashSet<Sterilisation>();
+		sterilisations1.add(sterilisation1);
+		sterilisations1.add(sterilisation2);
+		sterilisations1.add(sterilisation3);
+		sterilisations1.add(sterilisation4);
+		sterilisations1.add(sterilisation5);
+		sterilizer1.setSterilisations(sterilisations1);
+		objectDao.save(sterilizer1);
+		
+
+		// 灭菌炉(属于二级供应室--手术室)
+		Sterilizer sterilizer2 = new Sterilizer();
+		sterilizer2.setName("6号高温蒸汽灭菌炉");
+		sterilizer2.setBarcode("010175002");
+		sterilizer2.setOwnGroup("低温等离子");
+		OrgUnit orDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_OR, false);
+		assertNotNull(orDept);
+		
+		sterilizer2.setDepartment(orDept.getName());
+		sterilizer2.setOrgUnitCoding(orDept.getOrgUnitCoding());
+		// 设置灭菌程序
+		Set<Sterilisation> sterilisations2 = new HashSet<Sterilisation>();
+		sterilisations2.add(sterilisation6);
+		sterilisations2.add(sterilisation7);
+		sterilisations2.add(sterilisation8);
+		sterilisations2.add(sterilisation9);
+		sterilizer2.setSterilisations(sterilisations2);
+		objectDao.save(sterilizer2);
 	}
 	/**
 	 * 初始化灭菌目的