Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17639 -r17640 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17639) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17640) @@ -1288,7 +1288,7 @@ // 灭菌炉(属于供应室) Sterilizer sterilizer1 = new Sterilizer(); sterilizer1.setName("1号高温蒸汽灭菌炉"); - sterilizer1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilizer1.setBarcode("010175001"); sterilizer1.setOwnGroup("大型压力蒸汽"); OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_CSSD, false); assertNotNull(cssdDept); @@ -1302,7 +1302,7 @@ // 灭菌炉(属于二级供应室--手术室) Sterilizer sterilizer2 = new Sterilizer(); sterilizer2.setName("6号高温蒸汽灭菌炉"); - sterilizer2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilizer2.setBarcode("010175002"); sterilizer2.setOwnGroup("低温等离子"); OrgUnit orDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_OR, false); assertNotNull(orDept); @@ -1445,63 +1445,63 @@ */ private void initCleanMethod(){ CleanMethod cleanMethod1 = new CleanMethod(); - cleanMethod1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod1.setBarcode("010172001"); cleanMethod1.setCleanMethod("P1"); cleanMethod1.setCleanMinutes(30); cleanMethod1.setCleanParameter("POWER CLEAN，适用于污垢严重器械的清洗消毒。上酶，上润滑油。"); cleanMethod1.setValue("600"); objectDao.saveOrUpdate(cleanMethod1); CleanMethod cleanMethod2 = new CleanMethod(); - cleanMethod2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod2.setBarcode("010172002"); cleanMethod2.setCleanMethod("P2"); cleanMethod2.setCleanMinutes(30); cleanMethod2.setCleanParameter("OP-D-3，适用于常规器械的清洗消毒，上酶，上润滑油。"); cleanMethod2.setValue("3000"); objectDao.saveOrUpdate(cleanMethod2); CleanMethod cleanMethod3 = new CleanMethod(); - cleanMethod3.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod3.setBarcode("010172003"); cleanMethod3.setCleanMethod("P3"); cleanMethod3.setCleanMinutes(30); cleanMethod3.setCleanParameter("OP-SHORT-D-3，适用于治疗碗/碗盘等的清洗消毒。上酶。"); cleanMethod3.setValue("3000"); objectDao.saveOrUpdate(cleanMethod3); CleanMethod cleanMethod4 = new CleanMethod(); - cleanMethod4.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod4.setBarcode("010172004"); cleanMethod4.setCleanMethod("P4"); cleanMethod4.setCleanMinutes(30); cleanMethod4.setCleanParameter("AN-D，适用于呼吸/麻醉管道的清洗消毒（需配专用装载架）"); cleanMethod4.setValue("3000"); objectDao.saveOrUpdate(cleanMethod4); CleanMethod cleanMethod5 = new CleanMethod(); - cleanMethod5.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod5.setBarcode("010172005"); cleanMethod5.setCleanMethod("P5"); cleanMethod5.setCleanMinutes(30); cleanMethod5.setCleanParameter("AN-BGA（A+B）-D，适用于污染严重的呼吸/麻醉管道的清洗（需配专用装载架）"); cleanMethod5.setValue("3000"); objectDao.saveOrUpdate(cleanMethod5); CleanMethod cleanMethod6 = new CleanMethod(); - cleanMethod6.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod6.setBarcode("010172006"); cleanMethod6.setCleanMethod("P6"); cleanMethod6.setCleanMinutes(30); cleanMethod6.setCleanParameter("OP-BGA（A+B）-D，适用于污染严重器械的清洗消毒。"); cleanMethod6.setValue("3000"); objectDao.saveOrUpdate(cleanMethod6); CleanMethod cleanMethod7 = new CleanMethod(); - cleanMethod7.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod7.setBarcode("010172007"); cleanMethod7.setCleanMethod("化学"); cleanMethod7.setCleanMinutes(45); cleanMethod7.setCleanParameter("化学侵泡后清洗"); cleanMethod7.setValue("6000"); objectDao.saveOrUpdate(cleanMethod7); CleanMethod cleanMethod8 = new CleanMethod(); - cleanMethod8.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod8.setBarcode("010172008"); cleanMethod8.setCleanMethod("手工清洗"); cleanMethod8.setCleanMinutes(30); cleanMethod8.setCleanParameter("化学侵泡后清洗"); @@ -1513,14 +1513,14 @@ */ private void initRinser(){ Rinser rinser1 = new Rinser(); - rinser1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + rinser1.setBarcode("010173001"); rinser1.setName("清洗机1"); rinser1.setDepartment(Constants.ORG_UNIT_NAME_CSSD); rinser1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD); objectDao.saveOrUpdate(rinser1); Rinser rinser2 = new Rinser(); - rinser2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + rinser2.setBarcode("010173002"); rinser2.setName("手工清洗"); rinser2.setDepartment(Constants.ORG_UNIT_NAME_OR); rinser2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); @@ -1531,57 +1531,57 @@ */ private void initSterilisation(){ Sterilisation sterilisation1 = new Sterilisation(); - sterilisation1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation1.setBarcode("010174001"); sterilisation1.setSterilisation("P01"); sterilisation1.setParameter("包装工具,织品，多孔负载（134·C？10 Min）"); objectDao.saveOrUpdate(sterilisation1); Sterilisation sterilisation2 = new Sterilisation(); - sterilisation2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation2.setBarcode("010174002"); sterilisation2.setSterilisation("P02"); sterilisation2.setParameter("包装，热敏材料，橡胶，多孔负载（121·C 16 Min）"); objectDao.saveOrUpdate(sterilisation2); Sterilisation sterilisation3 = new Sterilisation(); - sterilisation3.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation3.setBarcode("010174003"); sterilisation3.setSterilisation("P03"); sterilisation3.setParameter("单个、未包缠的器械快速过程（134°C 4 Min）"); objectDao.saveOrUpdate(sterilisation3); Sterilisation sterilisation4 = new Sterilisation(); - sterilisation4.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation4.setBarcode("010174004"); sterilisation4.setSterilisation("P04"); sterilisation4.setParameter("B/D测试程序"); sterilisation4.setSterilizationPurpose("每天例行监测"); objectDao.saveOrUpdate(sterilisation4); Sterilisation sterilisation5 = new Sterilisation(); - sterilisation5.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation5.setBarcode("010174005"); sterilisation5.setSterilisation("P05"); sterilisation5.setParameter("自动测漏程序"); objectDao.saveOrUpdate(sterilisation5); Sterilisation sterilisation6 = new Sterilisation(); - sterilisation6.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation6.setBarcode("010174006"); sterilisation6.setSterilisation("P06"); sterilisation6.setParameter("包装工具、重型（134°C 4 Min）"); objectDao.saveOrUpdate(sterilisation6); Sterilisation sterilisation7 = new Sterilisation(); - sterilisation7.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation7.setBarcode("010174007"); sterilisation7.setSterilisation("低温等离子"); sterilisation7.setParameter("低温等离子"); sterilisation7.setSterilizationPurpose("器械包灭菌"); objectDao.saveOrUpdate(sterilisation7); Sterilisation sterilisation8 = new Sterilisation(); - sterilisation8.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation8.setBarcode("010174008"); sterilisation8.setSterilisation("高水平消毒"); sterilisation8.setParameter("呼吸机管道，湿化瓶"); objectDao.saveOrUpdate(sterilisation8); Sterilisation sterilisation9 = new Sterilisation(); - sterilisation9.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation9.setBarcode("010174009"); sterilisation9.setSterilisation("超大超重"); sterilisation9.setParameter("超大超重器械"); sterilisation9.setSterilizationPurpose("器械包灭菌");