Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17635 -r17637 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17635) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17637) @@ -1092,6 +1092,10 @@ initRinser(); // 初始化灭菌程序 initSterilisation(); + // 初始化灭菌目的 + initSterilizationPrupose(); + // 初始化灭菌炉分组 + initSterilerGroup(); // 一次性物品类型 HttpOption httpoption1 = new HttpOption(); httpoption1.setOptionListId(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE); @@ -1216,8 +1220,8 @@ container1.setContainerType(Container.CONTAINERTYPE_BASKET); container1.setStatus(Container.CONTAINER_STATUS_FREE); container1.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER); - container1.setDepartCode(Constants.ORG_UNIT_CODE_OR); - container1.setDepartName(Constants.ORG_UNIT_NAME_OR); + container1.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); + container1.setDepartName(Constants.ORG_UNIT_NAME_CSSD); containerManager.saveOrUpdate(container1); Container container2 = new Container(); @@ -1227,8 +1231,8 @@ container2.setContainerType(Container.CONTAINERTYPE_BASKET); container2.setStatus(Container.CONTAINER_STATUS_FREE); container2.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER); - container2.setDepartCode(Constants.ORG_UNIT_CODE_OR); - container2.setDepartName(Constants.ORG_UNIT_NAME_OR); + container2.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); + container2.setDepartName(Constants.ORG_UNIT_NAME_CSSD); containerManager.saveOrUpdate(container2); Container container3 = new Container(); @@ -1238,8 +1242,8 @@ container3.setContainerType(Container.CONTAINERTYPE_BASKET); container3.setStatus(Container.CONTAINER_STATUS_FREE); container3.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER); - container3.setDepartCode(Constants.ORG_UNIT_CODE_OR); - container3.setDepartName(Constants.ORG_UNIT_NAME_OR); + container3.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); + container3.setDepartName(Constants.ORG_UNIT_NAME_CSSD); containerManager.saveOrUpdate(container3); Container container4 = new Container(); @@ -1249,8 +1253,8 @@ container4.setContainerType(Container.CONTAINERTYPE_BASKET); container4.setStatus(Container.CONTAINER_STATUS_FREE); container4.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER); - container4.setDepartCode(Constants.ORG_UNIT_CODE_OR); - container4.setDepartName(Constants.ORG_UNIT_NAME_OR); + container4.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); + container4.setDepartName(Constants.ORG_UNIT_NAME_CSSD); containerManager.saveOrUpdate(container4); Container container5 = new Container(); @@ -1260,19 +1264,19 @@ container5.setContainerType(Container.CONTAINERTYPE_BASKET); container5.setStatus(Container.CONTAINER_STATUS_FREE); container5.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER); - container5.setDepartCode(Constants.ORG_UNIT_CODE_OR); - container5.setDepartName(Constants.ORG_UNIT_NAME_OR); + container5.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); + container5.setDepartName(Constants.ORG_UNIT_NAME_CSSD); containerManager.saveOrUpdate(container5); Container container6 = new Container(); container6.setBarcode("018000002"); container6.setContainerName("灭菌筐02"); container6.setPurpose(Container.CONTAINER_PURPOSE_DISINFECTION); - container6.setContainerType(Container.CONTAINERTYPE_BASKET); + container6.setContainerType(Container.CONTAINERTYPE_BASKET); container6.setStatus(Container.CONTAINER_STATUS_FREE); container6.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER); - container6.setDepartCode(Constants.ORG_UNIT_CODE_OR); - container6.setDepartName(Constants.ORG_UNIT_NAME_OR); + container6.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); + container6.setDepartName(Constants.ORG_UNIT_NAME_CSSD); containerManager.saveOrUpdate(container6); containerManager.createVirtualContainer(999 , null); @@ -1282,7 +1286,7 @@ Sterilizer sterilizer1 = new Sterilizer(); sterilizer1.setName("1号高温蒸汽灭菌炉"); sterilizer1.setBarcode(serialNumManager.getSerialNumberStr("条码")); - + sterilizer1.setOwnGroup("大型压力蒸汽"); OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_CSSD, false); assertNotNull(cssdDept); @@ -1296,7 +1300,7 @@ Sterilizer sterilizer2 = new Sterilizer(); sterilizer2.setName("6号高温蒸汽灭菌炉"); sterilizer2.setBarcode(serialNumManager.getSerialNumberStr("条码")); - + sterilizer2.setOwnGroup("低温等离子"); OrgUnit orDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_OR, false); assertNotNull(orDept); @@ -1508,8 +1512,8 @@ Rinser rinser1 = new Rinser(); rinser1.setBarcode(serialNumManager.getSerialNumberStr("条码")); rinser1.setName("清洗机1"); - rinser1.setDepartment(Constants.ORG_UNIT_NAME_OR); - rinser1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); + rinser1.setDepartment(Constants.ORG_UNIT_NAME_CSSD); + rinser1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD); objectDao.saveOrUpdate(rinser1); Rinser rinser2 = new Rinser(); @@ -1581,6 +1585,55 @@ objectDao.saveOrUpdate(sterilisation9); } /** + * 初始化灭菌目的 + */ + private void initSterilizationPrupose(){ + HttpOption stserilizationPurpose1 = new HttpOption(); + stserilizationPurpose1.setOptionListId(HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE); + stserilizationPurpose1.setOptionText("器械包灭菌"); + stserilizationPurpose1.setOptionValue("器械包灭菌"); + stserilizationPurpose1.setSequence(1); + objectDao.saveOrUpdate(stserilizationPurpose1); + + HttpOption stserilizationPurpose2 = new HttpOption(); + stserilizationPurpose2.setOptionListId(HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE); + stserilizationPurpose2.setOptionText("每天例行监测"); + stserilizationPurpose2.setOptionValue("每天例行监测"); + stserilizationPurpose2.setSequence(2); + objectDao.saveOrUpdate(stserilizationPurpose2); + + HttpOption stserilizationPurpose3 = new HttpOption(); + stserilizationPurpose3.setOptionListId(HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE); + stserilizationPurpose3.setOptionText("装载监测"); + stserilizationPurpose3.setOptionValue("装载监测"); + stserilizationPurpose3.setSequence(3); + objectDao.saveOrUpdate(stserilizationPurpose3); + + HttpOption stserilizationPurpose4 = new HttpOption(); + stserilizationPurpose4.setOptionListId(HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE); + stserilizationPurpose4.setOptionText("更换部件或维护监测"); + stserilizationPurpose4.setOptionValue("更换部件或维护监测"); + stserilizationPurpose4.setSequence(4); + objectDao.saveOrUpdate(stserilizationPurpose4); + + } + // 初始化灭菌炉分组 + private void initSterilerGroup(){ + HttpOption sterilerGroup1 = new HttpOption(); + sterilerGroup1.setOptionListId(HttpOption.SYSTEMSETTING_STERILIZER_GROUP); + sterilerGroup1.setOptionText("大型压力蒸汽"); + sterilerGroup1.setOptionValue("大型压力蒸汽"); + sterilerGroup1.setSequence(1); + objectDao.saveOrUpdate(sterilerGroup1); + + HttpOption sterilerGroup2 = new HttpOption(); + sterilerGroup2.setOptionListId(HttpOption.SYSTEMSETTING_STERILIZER_GROUP); + sterilerGroup2.setOptionText("低温等离子"); + sterilerGroup2.setOptionValue("低温等离子"); + sterilerGroup2.setSequence(2); + objectDao.saveOrUpdate(sterilerGroup2); + } + /** * 初始化供应室服务临床科室配置 * 设置所有一二级供应室针对器械包与一次性物品服务所有申请科室与结算科室 *