Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java =================================================================== diff -u -r13045 -r13047 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java (.../InvoicePlanManagerTests.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java (.../InvoicePlanManagerTests.java) (revision 13047) @@ -66,7 +66,7 @@ InvoicePlan invoicePlan = new InvoicePlan(); invoicePlan.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); invoicePlan.setCommittedStatus(true); - invoicePlan.setDepartCoding("testOR"); + invoicePlan.setDepartCoding(Constants.ORG_UNIT_CODE_OR); invoicePlan.setType("器械包申请单"); //3.初始化回收项 @@ -87,7 +87,7 @@ //4.1 创建对应的仓库 WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD); - WareHouse wareHouse2 = wareHouseManager.getDefaultWareHouseByUnitCode("testOR");; + WareHouse wareHouse2 = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_OR);; TousseInstance tousseInstance1 = new TousseInstance(); tousseInstance1.setTousseDefinition(td); @@ -144,7 +144,7 @@ JSONObject params = new JSONObject(); params.put("mode", "depart"); - params.put("departCode", "testOR"); + params.put("departCode", Constants.ORG_UNIT_CODE_OR); params.put("assistantSender", "admin"); params.put("sender", "admin"); params.put("warehouseID", wareHouse1.getId()); Index: ssts-web/src/test/java/test/forgon/constant/Constants.java =================================================================== diff -u -r13045 -r13047 --- ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 13047) @@ -7,7 +7,19 @@ */ public final class Constants { /** - * 一级供应室的编码 + * 测试供应室(一级供应室)的科室编码 */ public static final String ORG_UNIT_CODE_CSSD = "testCSSD"; + /** + * 测试手术室(二级供应室)的科室编码 + */ + public static final String ORG_UNIT_CODE_OR = "testOR"; + /** + * 测试供应室的科室名称 + */ + public static final String ORG_UNIT_NAME_CSSD = "测试供应室"; + /** + * 测试手术室的科室名称 + */ + public static final String ORG_UNIT_NAME_OR = "测试手术室"; } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java =================================================================== diff -u -r13045 -r13047 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 13047) @@ -205,7 +205,7 @@ RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); Collection applyItemVos = new ArrayList(); appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); @@ -240,7 +240,7 @@ makeActiveUser("oruser1"); RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); Collection applyItemVos = new ArrayList(); appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); @@ -286,7 +286,7 @@ disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", - "testOR", df.parse("2014-12-01 14:20:10")); + Constants.ORG_UNIT_CODE_OR, df.parse("2014-12-01 14:20:10")); } catch (ParseException e) { e.printStackTrace(); } @@ -304,7 +304,7 @@ RecyclingApplication disposableGoodsApplication2 = null; disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); recyclingApplicationManager.saveApplication( disposableGoodsApplication2, applyItemVos, true); @@ -339,7 +339,7 @@ disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", - "testOR", df.parse("2014-12-01 14:20:10")); + Constants.ORG_UNIT_CODE_OR, df.parse("2014-12-01 14:20:10")); } catch (ParseException e) { e.printStackTrace(); } @@ -351,7 +351,7 @@ RecyclingApplication disposableGoodsApplication2 = null; disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); recyclingApplicationManager.saveApplication( disposableGoodsApplication2, applyItemVos,true); @@ -382,7 +382,7 @@ disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", - "testOR", df.parse("2014-12-01 14:20:10")); + Constants.ORG_UNIT_CODE_OR, df.parse("2014-12-01 14:20:10")); } catch (ParseException e) { e.printStackTrace(); } @@ -398,7 +398,7 @@ // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( @@ -433,7 +433,7 @@ disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", - "testOR", df.parse("2014-12-01 14:20:10")); + Constants.ORG_UNIT_CODE_OR, df.parse("2014-12-01 14:20:10")); } catch (ParseException e) { e.printStackTrace(); } @@ -448,7 +448,7 @@ // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( @@ -479,7 +479,7 @@ disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", - "testOR", df.parse("2014-12-01 14:20:10")); + Constants.ORG_UNIT_CODE_OR, df.parse("2014-12-01 14:20:10")); } catch (ParseException e) { e.printStackTrace(); } @@ -495,7 +495,7 @@ // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( @@ -527,7 +527,7 @@ disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", - "testOR", df.parse("2014-12-01 14:20:10")); + Constants.ORG_UNIT_CODE_OR, df.parse("2014-12-01 14:20:10")); } catch (ParseException e) { e.printStackTrace(); } @@ -542,7 +542,7 @@ // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( disposableGoodsApplication2, @@ -785,13 +785,13 @@ RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); RecyclingApplication disposableGoodsApplication3 = createApplicationByParam( "Y-0003", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); //合并 recyclingApplicationManager.saveApplication( @@ -806,23 +806,23 @@ disposableGoodsApplication3, applyItemVos3, true); - List invoicePlanList = invoicePlanManager.getInvoicePlanByOrgUnitCoding("testOR"); + List invoicePlanList = invoicePlanManager.getInvoicePlanByOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); assertNotNull(invoicePlanList); assertEquals(3,invoicePlanList.size()); InvoicePlan invoicePlan = invoicePlanList.get(0); assertEquals("待发货",invoicePlan.getDeliverStatus()); assertEquals("测试手术室",invoicePlan.getSettleAccountsDepart()); - assertEquals("testOR",invoicePlan.getSettleAccountsDepartCoding()); + assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan.getApplicationItems()); InvoicePlan invoicePlan2 = invoicePlanList.get(1); assertEquals("待发货",invoicePlan2.getDeliverStatus()); assertEquals("测试手术室",invoicePlan.getSettleAccountsDepart()); - assertEquals("testOR",invoicePlan.getSettleAccountsDepartCoding()); + assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan2.getApplicationItems()); InvoicePlan invoicePlan3 = invoicePlanList.get(2); assertEquals("待发货",invoicePlan3.getDeliverStatus()); assertEquals("测试手术室",invoicePlan.getSettleAccountsDepart()); - assertEquals("testOR",invoicePlan.getSettleAccountsDepartCoding()); + assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan3.getApplicationItems()); } @@ -840,7 +840,7 @@ RecyclingApplication tousseApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "测试手术室", - "testOR", new Date()); + Constants.ORG_UNIT_CODE_OR, new Date()); recyclingApplicationManager.saveApplication(tousseApplication, applyItemVos, true); @@ -874,9 +874,9 @@ tousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication.setRemark("测试备注"); tousseApplication.setDepart("测试手术室"); - tousseApplication.setDepartCoding("testOR"); + tousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setSettleAccountsDepart("测试手术室"); - tousseApplication.setSettleAccountsDepartCoding("testOR"); + tousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication.setAdministrators("USERID_oruser1"); tousseApplication.setSequence(57); @@ -957,9 +957,9 @@ tousseApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); tousseApplication.setRemark("测试备注"); tousseApplication.setDepart("测试手术室"); - tousseApplication.setDepartCoding("testOR"); + tousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setSettleAccountsDepart("测试手术室"); - tousseApplication.setSettleAccountsDepartCoding("testOR"); + tousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication.setAdministrators("USERID_oruser1"); tousseApplication.setSequence(57); @@ -972,9 +972,9 @@ tousseApplication2.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); tousseApplication2.setRemark("测试备注"); tousseApplication2.setDepart("测试手术室"); - tousseApplication2.setDepartCoding("testOR"); + tousseApplication2.setDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication2.setSettleAccountsDepart("测试手术室"); - tousseApplication2.setSettleAccountsDepartCoding("testOR"); + tousseApplication2.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication2.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication2.setAdministrators("USERID_oruser1"); tousseApplication2.setSequence(57); @@ -987,9 +987,9 @@ tousseApplication3.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); tousseApplication3.setRemark("测试备注"); tousseApplication3.setDepart("测试手术室"); - tousseApplication3.setDepartCoding("testOR"); + tousseApplication3.setDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication3.setSettleAccountsDepart("测试手术室"); - tousseApplication3.setSettleAccountsDepartCoding("testOR"); + tousseApplication3.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication3.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication3.setAdministrators("USERID_oruser1"); tousseApplication3.setSequence(57); @@ -1183,9 +1183,9 @@ tousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication.setRemark("测试备注"); tousseApplication.setDepart("测试手术室"); - tousseApplication.setDepartCoding("testOR"); + tousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setSettleAccountsDepart("测试手术室"); - tousseApplication.setSettleAccountsDepartCoding("testOR"); + tousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setType(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM); tousseApplication.setAdministrators("USERID_oruser1"); tousseApplication.setSequence(57); @@ -1222,6 +1222,7 @@ tousseInstance.setBarcode(barcodeStr); tousseInstance.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); tousseInstance.setUnTraceableTousse(TousseInstance.FICTITIOUS_GOODS_TRUE); + tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_CSSD); tousseInstanceManager.saveOrUpdate(tousseInstance); Long id = tousseInstance.getTousseDefinition().getId(); assertNotNull(id); @@ -1276,7 +1277,7 @@ foreignTousseApplication .setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); foreignTousseApplication.setSurgery("开颅术"); - foreignTousseApplication.setSettleAccountsDepartCoding("testOR"); + foreignTousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); foreignTousseApplication.setSettleAccountsDepart("消毒供应房"); foreignTousseApplication.setSerialNumber("0100201412020001"); foreignTousseApplication.setSequence(57); @@ -1290,7 +1291,7 @@ foreignTousseApplication .setPackageStatus(ForeignTousseDefinition.PACKAGE_STATUS_RECEIVING); foreignTousseApplication.setDoctor("阿斯达"); - foreignTousseApplication.setDepartCoding("testOR"); + foreignTousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); foreignTousseApplication.setDepart("测试手术室"); foreignTousseApplication.setCommittedStatus(true); foreignTousseApplication.setClinicNumber("0100006"); @@ -1333,9 +1334,9 @@ customRecyclingApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); customRecyclingApplication.setRemark("测试备注"); customRecyclingApplication.setDepart("测试手术室"); - customRecyclingApplication.setDepartCoding("testOR"); + customRecyclingApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); customRecyclingApplication.setSettleAccountsDepart("测试手术室"); - customRecyclingApplication.setSettleAccountsDepartCoding("testOR"); + customRecyclingApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); customRecyclingApplication.setType(InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM); customRecyclingApplication.setAdministrators("USERID_oruser1"); customRecyclingApplication.setSequence(57); @@ -1408,7 +1409,7 @@ RecyclingApplication application = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_COMBO_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); assertNotNull(application); @@ -1491,7 +1492,7 @@ RecyclingApplication application = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_COMBO_FORM, - "测试手术室", "testOR", new Date()); + "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); assertNotNull(application); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java =================================================================== diff -u -r13045 -r13047 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java (.../ScanBasketInvoiceTests.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java (.../ScanBasketInvoiceTests.java) (revision 13047) @@ -97,12 +97,12 @@ TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("TestOR胆加仪"); JSONArray array = new JSONArray(); for (int i = 0; i < 10; i++) { - Long id = newTousseInstance(td,null,"testOR"); + Long id = newTousseInstance(td,null,Constants.ORG_UNIT_CODE_OR); array.put(i, ""+id); } TousseDefinition td2 = tousseDefinitionManager.getTousseDefinitionByName("TestOR甲加仪（半年期）"); for (int j = 10; j < 20; j++) { - Long id = newTousseInstance(td2,null,"testOR"); + Long id = newTousseInstance(td2,null,Constants.ORG_UNIT_CODE_OR); array.put(j, ""+id); } JSONArray basketArray = new JSONArray(); @@ -117,7 +117,7 @@ params.put("id", ""); params.put("applicant", "张三"); params.put("applicationTimeStr", "2016-01-01 10:00"); - params.put("departCoding", "testOR"); + params.put("departCoding", Constants.ORG_UNIT_CODE_OR); params.put("totalAmountOfTousses", 20); params.put("tousseInstanceIdStrs", array.toString()); params.put("basketInfos", basketArray.toString()); @@ -133,15 +133,15 @@ /** * 第二张代理灭菌单 */ - newTousseDefinition("OR 外仪","testOR"); + newTousseDefinition("OR 外仪",Constants.ORG_UNIT_CODE_OR); TousseDefinition td3 = tousseDefinitionManager.getTousseDefinitionByName("OR 外仪"); JSONArray array2 = new JSONArray(); for (int i = 0; i < 10; i++) { - Long id = newTousseInstance(td3,null,"testOR"); + Long id = newTousseInstance(td3,null,Constants.ORG_UNIT_CODE_OR); array2.put(i, ""+id); } for (int j = 10; j < 15; j++) { - Long id = newTousseInstance(td2,null,"testOR"); + Long id = newTousseInstance(td2,null,Constants.ORG_UNIT_CODE_OR); array2.put(j, ""+id); } JSONArray basketArray2 = new JSONArray(); @@ -158,7 +158,7 @@ params2.put("id", ""); params2.put("applicant", "张三"); params2.put("applicationTimeStr", "2016-01-01 11:00"); - params2.put("departCoding", "testOR"); + params2.put("departCoding", Constants.ORG_UNIT_CODE_OR); params2.put("totalAmountOfTousses", 15); params2.put("tousseInstanceIdStrs", array2.toString()); params2.put("basketInfos", basketArray2.toString()); @@ -212,7 +212,7 @@ */ JsonObject extraParam = new JsonObject(); extraParam.addProperty("mode", "depart"); - extraParam.addProperty("departCodeOfInvoicePlan", "testOR"); + extraParam.addProperty("departCodeOfInvoicePlan", Constants.ORG_UNIT_CODE_OR); JsonElement scannedBarcodes = new Gson().toJsonTree("018000001"); extraParam.add("scannedBarcodes", scannedBarcodes); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r13045 -r13047 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 13047) @@ -813,7 +813,7 @@ TaskGroup TaskGroup3 = new TaskGroup(); TaskGroup3.setTaskGroupName("器械组"); - TaskGroup3.setDepartCode("testOR"); + TaskGroup3.setDepartCode(Constants.ORG_UNIT_CODE_OR); TaskGroup3.setDepartName("测试手术室"); // 一次性物品类型 @@ -845,7 +845,7 @@ supplyRoomConfig.setSequence(0); supplyRoomConfig.setInvoiceOrigin(SupplyRoomConfig.INVOICE_ORIGIN_RECYCLING); supplyRoomConfig.setDiposablePriceFluctuation(DIPOSABLEGOODS_PRICE_F); - supplyRoomConfig.setDptCodeOfForeignTousse("testOR");//新增加的属性 + supplyRoomConfig.setDptCodeOfForeignTousse(Constants.ORG_UNIT_CODE_OR);//新增加的属性 supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig); SupplyRoomConfig supplyRoomConfig1 = new SupplyRoomConfig(); @@ -855,7 +855,7 @@ supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig1); SupplyRoomConfig supplyRoomConfig2 = new SupplyRoomConfig(); - supplyRoomConfig2.setOrgUnitCoding("testOR"); + supplyRoomConfig2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); supplyRoomConfig2.setOrgUnitName("测试手术室"); supplyRoomConfig2.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_2); supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig2); @@ -901,7 +901,7 @@ wareHouse2.setCreatedUserName("admin"); wareHouse2.setCreateTime(new Date()); wareHouse2.setName("测试手术室仓库1"); - wareHouse2.setOrgUnitCode("testOR"); + wareHouse2.setOrgUnitCode(Constants.ORG_UNIT_CODE_OR); wareHouse2.setOrgUnitName("测试手术室"); wareHouse2.setBarcode("010009002"); wareHouse2.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE); @@ -1344,7 +1344,7 @@ .setMaterialInstances(new ArrayList()); tousseDefinition5.getMaterialInstances().add(materialInstance9); tousseDefinition5.getMaterialInstances().add(materialInstance10); - tousseDefinition5.setHandlerDepartCode("testOR"); + tousseDefinition5.setHandlerDepartCode(Constants.ORG_UNIT_CODE_OR); tousseDefinition5.setHandlerDepartName("测试手术室"); tousseDefinitionManager.saveOrUpdate(tousseDefinition5); @@ -1382,7 +1382,7 @@ tousseDefinition6.getMaterialInstances().add(materialInstance12); tousseDefinition6.getMaterialInstances().add(materialInstance13); tousseDefinition6.getMaterialInstances().add(materialInstance14); - tousseDefinition6.setHandlerDepartCode("testOR"); + tousseDefinition6.setHandlerDepartCode(Constants.ORG_UNIT_CODE_OR); tousseDefinition6.setHandlerDepartName("测试手术室"); tousseDefinitionManager.saveOrUpdate(tousseDefinition6); @@ -2100,7 +2100,7 @@ "yangguangyiyuan", "name1", rootNode); assertTrue(directoryHelper.isOrgUnitName("阳光医院")); - OrgUnit orgUnitOR = directoryHelper.createOrgUnit("测试手术室", "testOR", + OrgUnit orgUnitOR = directoryHelper.createOrgUnit("测试手术室", Constants.ORG_UNIT_CODE_OR, "name2", orgUnitROOT); assertTrue(directoryHelper.isOrgUnitName("测试手术室")); OrgUnit orgUnitCSSD = directoryHelper.createOrgUnit("测试供应室",