Index: ssts-web/src/test/java/test/forgon/constant/Constants.java =================================================================== diff -u -r13047 -r13052 --- ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 13047) +++ ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 13052) @@ -15,11 +15,19 @@ */ public static final String ORG_UNIT_CODE_OR = "testOR"; /** + * 消毒供应室科室编码 + */ + public static final String ORG_UNIT_CODE_DISINFECT = "8063"; + /** * 测试供应室的科室名称 */ public static final String ORG_UNIT_NAME_CSSD = "测试供应室"; /** * 测试手术室的科室名称 */ public static final String ORG_UNIT_NAME_OR = "测试手术室"; + /** + * 消毒供应室科室名称 + */ + public static final String ORG_UNIT_NAME_DISINFECT = "消毒供应室"; } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java =================================================================== diff -u -r12728 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java (.../TestDepartmentMonthDetail.java) (revision 12728) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java (.../TestDepartmentMonthDetail.java) (revision 13052) @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; @@ -438,8 +439,8 @@ tousseInstance1.setPrice(price5); tousseInstance1.setFluctuationPrice(price5); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(1); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -507,8 +508,8 @@ tousseInstance1.setPrice(price1); tousseInstance1.setFluctuationPrice(price1); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(1); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -530,8 +531,8 @@ tousseInstance1.setPrice(price2); tousseInstance1.setFluctuationPrice(price2); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -556,8 +557,8 @@ tousseInstance1.setInvoicePlanID(app.getId()); tousseInstance1.setFluctuationPrice(price3); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -578,8 +579,8 @@ tousseInstance1.setPrice(price4); tousseInstance1.setFluctuationPrice(price4); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java =================================================================== diff -u -r13045 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java (.../UnPackingDisinfectGoodsInstanceTests.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java (.../UnPackingDisinfectGoodsInstanceTests.java) (revision 13052) @@ -65,8 +65,8 @@ tousseDefinition.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition.setTaskGroup("术科组"); tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - tousseDefinition.setHandlerDepartCode("900202"); - tousseDefinition.setHandlerDepartName("供应室"); + tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); tousseDefinition.getMaterialInstances().add(materialInstance); objectDao.saveOrUpdate(materialInstance); @@ -93,8 +93,8 @@ tousseDefinition2.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition2.setTaskGroup("术科组"); tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - tousseDefinition2.setHandlerDepartCode("900202"); - tousseDefinition2.setHandlerDepartName("供应室"); + tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); tousseDefinition2.getMaterialInstances().add(materialInstance2); objectDao.saveOrUpdate(materialInstance2); @@ -277,8 +277,8 @@ tousseDefinition1.setIsCleanedEntirely("否"); tousseDefinition1.setTaskGroup("灭菌组"); tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition1.setHandlerDepartName("供应室"); - tousseDefinition1.setHandlerDepartCode("900202"); + tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition1.setIsRecycling("是"); tousseDefinition1.setIsPacking("是"); tousseDefinition1.setIsTraceable("是"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java (.../TestPDADisinfectGoodsInvoiceManager.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java (.../TestPDADisinfectGoodsInvoiceManager.java) (revision 13052) @@ -7,6 +7,7 @@ import org.testng.annotations.Test; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; @@ -43,8 +44,8 @@ tousseInstance.setStatus(TousseInstance.STATUS_DISINFECTED); tousseInstance.setPrice(3.5); tousseInstance.setFluctuationPrice(3.5); - tousseInstance.setOrgUnitCoding("900202"); - tousseInstance.setOrgUnitName("消毒供应室"); + tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance.setStatisticsAmount(10); tousseInstance.setPackageType("胶带"); tousseInstanceManager.saveOrUpdate(tousseInstance); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java =================================================================== diff -u -r13049 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java (.../InvoiceManagerForComboFormTests.java) (revision 13049) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java (.../InvoiceManagerForComboFormTests.java) (revision 13052) @@ -203,8 +203,8 @@ tousseInstance1.setPrice(3.14); tousseInstance1.setFluctuationPrice(3.14); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(1); Date date = null; try { @@ -213,6 +213,7 @@ e.printStackTrace(); } tousseInstance1.setValidUntil(date); + tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_OR); tousseInstanceManager.saveOrUpdate(tousseInstance1); tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName()); } @@ -240,8 +241,8 @@ tousseInstance1.setPrice(2.5); tousseInstance1.setFluctuationPrice(2.5); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); tousseInstance1.setTousseFixedBarcode(true); tousseInstance1.setUnTraceableTousse(true); @@ -285,8 +286,8 @@ tousseInstanceNew.setPrice(2.5); tousseInstanceNew.setFluctuationPrice(2.5); tousseInstanceNew.setSterilingType("P1"); - tousseInstanceNew.setOrgUnitCoding("8063"); - tousseInstanceNew.setOrgUnitName("消毒供应室"); + tousseInstanceNew.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstanceNew.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstanceNew.setStatisticsAmount(10); tousseInstanceNew.setTousseFixedBarcode(true); tousseInstanceNew.setUnTraceableTousse(true); @@ -376,7 +377,7 @@ params.put("sender", "张飞"); params.put("invoiceItems", getInvoiceGoods()); params.put("sourceWarehouseId", wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId()); - params.put("sourceWarehouseName", "测试供应室"); + params.put("sourceWarehouseName", wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getName()); invoiceManager.submitInvoice(params); objectDao.flush(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java =================================================================== diff -u -r12332 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java (.../TestPDAProxyTousseGoodsInvoiceManager.java) (revision 12332) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java (.../TestPDAProxyTousseGoodsInvoiceManager.java) (revision 13052) @@ -9,6 +9,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.disinfectsystem.entity.assestmanagement.TousseStock; @@ -82,12 +83,12 @@ proxyDisinfection.setApplicationTime(new Date()); proxyDisinfection.setCommittedStatus(true); proxyDisinfection.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); - proxyDisinfection.setDepart("供应室"); - proxyDisinfection.setDepartCoding("900202");//"900202");//要发给供应室 + proxyDisinfection.setDepart(Constants.ORG_UNIT_NAME_DISINFECT); + proxyDisinfection.setDepartCoding(Constants.ORG_UNIT_CODE_DISINFECT);//"900202");//要发给供应室 proxyDisinfection.setType(InvoicePlan.TYPE_PROXYDISINFECTION); proxyDisinfection.setSerialNumber("2014101810001"); - proxyDisinfection.setSettleAccountsDepart("供应室"); - proxyDisinfection.setSettleAccountsDepartCoding("900202"); + proxyDisinfection.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_DISINFECT); + proxyDisinfection.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_DISINFECT); proxyDisinfectionManager.saveOrUpdate(proxyDisinfection); List instances = new ArrayList(); @@ -274,7 +275,7 @@ //运行前对全局变量清空,以防止影响下一个用例的运行结果 map.clear(); map.put(barcodeArray2[0], 1); - map.put("departCode", "900202");//要发给供应室 + map.put("departCode", Constants.ORG_UNIT_CODE_DISINFECT);//要发给供应室 String jsonStr = createSendOutParam(map); sendProxyTousseGoods(jsonStr, testAll_foreign_no_splited); } @@ -289,7 +290,7 @@ for(String barcode :barcodeArray2){ map.put(barcode, 1); } - map.put("departCode", "900202");//要发给供应室 + map.put("departCode", Constants.ORG_UNIT_CODE_DISINFECT);//要发给供应室 String jsonStr = createSendOutParam(map); sendProxyTousseGoods(jsonStr, testAll_foreign_with_splited); } @@ -303,7 +304,7 @@ map.clear(); map.put("201410181111", 1); map.put("201410182222", 1); - map.put("departCode", "900202");//要发给供应室 + map.put("departCode", Constants.ORG_UNIT_CODE_DISINFECT);//要发给供应室 String jsonStr = createSendOutParam(map); sendProxyTousseGoods(jsonStr, testPart_foreign_with_splited); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java (.../TestPDABorrowTousseGoodsInvoiceManager.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java (.../TestPDABorrowTousseGoodsInvoiceManager.java) (revision 13052) @@ -9,6 +9,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; @@ -41,7 +42,7 @@ * 创建器械包实例 */ private void createTousseInstance(){ - createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202", 3.14); + createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT, 3.14); } private void prepareData(){ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r13047 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 13047) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 13052) @@ -270,8 +270,8 @@ tousseDefinition.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition.setTaskGroup("术科组"); tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - tousseDefinition.setHandlerDepartCode("900202"); - tousseDefinition.setHandlerDepartName("供应室"); + tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); tousseDefinition.getMaterialInstances().add(materialInstance); tousseDefinition.setForDisplay(true); objectDao.saveOrUpdate(materialInstance); @@ -326,8 +326,8 @@ tousseDefinition1.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition1.setTaskGroup("器械组"); tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - tousseDefinition1.setHandlerDepartCode("900202"); - tousseDefinition1.setHandlerDepartName("供应室"); + tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); tousseDefinitionManager.saveOrUpdate(tousseDefinition1); @@ -359,8 +359,8 @@ tousseDefinition2.setIsTraceable(TousseDefinition.STR_NO); tousseDefinition2.setTaskGroup("术科组"); tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - tousseDefinition2.setHandlerDepartCode("900202"); - tousseDefinition2.setHandlerDepartName("供应室"); + tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); tousseDefinition2.setForDisplay(true); tousseDefinitionManager.saveOrUpdate(tousseDefinition2); @@ -390,8 +390,8 @@ tousseDefinition3.setIsPacking(TousseDefinition.STR_YES); // 需要装配 tousseDefinition3.setTaskGroup("术科组"); tousseDefinition3.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - tousseDefinition3.setHandlerDepartCode("900202"); - tousseDefinition3.setHandlerDepartName("供应室"); + tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); tousseDefinition3.setForDisplay(true); tousseDefinitionManager.saveOrUpdate(tousseDefinition3); objectDao.saveOrUpdate(materialInstance3); @@ -514,8 +514,8 @@ tousseDefinition1.setIsCleanedEntirely("是"); tousseDefinition1.setTaskGroup("灭菌组"); tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition1.setHandlerDepartName("供应室"); - tousseDefinition1.setHandlerDepartCode("900202"); + tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition1.getMaterialInstances().add(materialInstance1); tousseDefinition1.getMaterialInstances().add(materialInstance2); @@ -527,8 +527,8 @@ tousseDefinition2.setIsCleanedEntirely("是"); tousseDefinition2.setTaskGroup("器械组"); tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition2.setHandlerDepartName("供应室"); - tousseDefinition2.setHandlerDepartCode("900202"); + tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition2.getMaterialInstances().add(materialInstance1); tousseDefinition2.getMaterialInstances().add(materialInstance2); @@ -540,8 +540,8 @@ tousseDefinition3.setIsCleanedEntirely("是"); tousseDefinition3.setTaskGroup("器械组"); tousseDefinition3.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition3.setHandlerDepartName("供应室"); - tousseDefinition3.setHandlerDepartCode("900202"); + tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition3.getMaterialInstances().add(materialInstance1); tousseDefinition3.getMaterialInstances().add(materialInstance2); @@ -553,8 +553,8 @@ tousseDefinition4.setIsCleanedEntirely("是"); tousseDefinition4.setTaskGroup("器械组"); tousseDefinition4.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition4.setHandlerDepartName("供应室"); - tousseDefinition4.setHandlerDepartCode("900202"); + tousseDefinition4.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition4.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition4.getMaterialInstances().add(materialInstance1); tousseDefinition4.getMaterialInstances().add(materialInstance2); @@ -592,8 +592,8 @@ tousseDefinition.setIsCleanedEntirely("是"); tousseDefinition.setTaskGroup("灭菌组"); tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); - tousseDefinition.setHandlerDepartName("供应室"); - tousseDefinition.setHandlerDepartCode("900202"); + tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition.setDiposableGoodsItems(diposableGoodsInstances); tousseDefinition.setPackageType("棉布"); tousseDefinition.setPrice(5.5); @@ -804,17 +804,17 @@ TaskGroup TaskGroup1 = new TaskGroup(); TaskGroup1.setTaskGroupName("常规组"); TaskGroup1.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); - TaskGroup1.setDepartName("测试供应室"); + TaskGroup1.setDepartName(Constants.ORG_UNIT_NAME_CSSD); TaskGroup TaskGroup2 = new TaskGroup(); TaskGroup2.setTaskGroupName("术科组"); TaskGroup2.setDepartCode(Constants.ORG_UNIT_CODE_CSSD); - TaskGroup2.setDepartName("测试供应室"); + TaskGroup2.setDepartName(Constants.ORG_UNIT_NAME_CSSD); TaskGroup TaskGroup3 = new TaskGroup(); TaskGroup3.setTaskGroupName("器械组"); TaskGroup3.setDepartCode(Constants.ORG_UNIT_CODE_OR); - TaskGroup3.setDepartName("测试手术室"); + TaskGroup3.setDepartName(Constants.ORG_UNIT_NAME_OR); // 一次性物品类型 HttpOption httpoption1 = new HttpOption(); @@ -850,13 +850,13 @@ SupplyRoomConfig supplyRoomConfig1 = new SupplyRoomConfig(); supplyRoomConfig1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD); - supplyRoomConfig1.setOrgUnitName("测试供应室"); + supplyRoomConfig1.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD); supplyRoomConfig1.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_1); supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig1); SupplyRoomConfig supplyRoomConfig2 = new SupplyRoomConfig(); supplyRoomConfig2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); - supplyRoomConfig2.setOrgUnitName("测试手术室"); + supplyRoomConfig2.setOrgUnitName(Constants.ORG_UNIT_NAME_OR); supplyRoomConfig2.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_2); supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig2); @@ -891,7 +891,7 @@ wareHouse1.setCreateTime(new Date()); wareHouse1.setName("测试供应室仓库1"); wareHouse1.setOrgUnitCode(Constants.ORG_UNIT_CODE_CSSD); - wareHouse1.setOrgUnitName("测试供应室"); + wareHouse1.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD); wareHouse1.setBarcode("010009001"); wareHouse1.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE); objectDao.save(wareHouse1); @@ -902,7 +902,7 @@ wareHouse2.setCreateTime(new Date()); wareHouse2.setName("测试手术室仓库1"); wareHouse2.setOrgUnitCode(Constants.ORG_UNIT_CODE_OR); - wareHouse2.setOrgUnitName("测试手术室"); + wareHouse2.setOrgUnitName(Constants.ORG_UNIT_NAME_OR); wareHouse2.setBarcode("010009002"); wareHouse2.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE); objectDao.save(wareHouse2); @@ -982,7 +982,7 @@ sterilizer1.setName("1号高温蒸汽灭菌炉"); sterilizer1.setBarcode(serialNumManager.getSerialNumberStr("条码")); - OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName("测试供应室", false); + OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_CSSD, false); assertNotNull(cssdDept); sterilizer1.setDepartment(cssdDept.getName()); @@ -996,7 +996,7 @@ sterilizer2.setName("6号高温蒸汽灭菌炉"); sterilizer2.setBarcode(serialNumManager.getSerialNumberStr("条码")); - OrgUnit orDept = thTreeNodeManager.getOrgUnitByName("测试手术室", false); + OrgUnit orDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_OR, false); assertNotNull(orDept); sterilizer2.setDepartment(orDept.getName()); @@ -1345,7 +1345,7 @@ tousseDefinition5.getMaterialInstances().add(materialInstance9); tousseDefinition5.getMaterialInstances().add(materialInstance10); tousseDefinition5.setHandlerDepartCode(Constants.ORG_UNIT_CODE_OR); - tousseDefinition5.setHandlerDepartName("测试手术室"); + tousseDefinition5.setHandlerDepartName(Constants.ORG_UNIT_NAME_OR); tousseDefinitionManager.saveOrUpdate(tousseDefinition5); TousseDefinition tousseDefinition6 = new TousseDefinition(); @@ -1383,7 +1383,7 @@ tousseDefinition6.getMaterialInstances().add(materialInstance13); tousseDefinition6.getMaterialInstances().add(materialInstance14); tousseDefinition6.setHandlerDepartCode(Constants.ORG_UNIT_CODE_OR); - tousseDefinition6.setHandlerDepartName("测试手术室"); + tousseDefinition6.setHandlerDepartName(Constants.ORG_UNIT_NAME_OR); tousseDefinitionManager.saveOrUpdate(tousseDefinition6); TousseDefinition tousseDefinition7 = new TousseDefinition(); @@ -1422,9 +1422,9 @@ TousseDefinition tousseDefinition8 = new TousseDefinition(); tousseDefinition8.setTousseGroupID(group2.getId()); tousseDefinition8.setTousseGroupName("普通批"); - tousseDefinition8.setAssetsBelong("供应室"); - tousseDefinition8.setHandlerDepartCode("供应室"); - tousseDefinition8.setHandlerDepartCode("900202"); + tousseDefinition8.setAssetsBelong(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition8.setHandlerDepartCode(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition8.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition8.setIncludeImplant(0); tousseDefinition8.setIsCleanedEntirely("是"); tousseDefinition8.setIsCustomPacking("否"); @@ -1443,8 +1443,8 @@ tousseDefinition9.setIsCleanedEntirely("是"); tousseDefinition9.setTaskGroup("器械组"); tousseDefinition9.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition9.setHandlerDepartName("供应室"); - tousseDefinition9.setHandlerDepartCode("900202"); + tousseDefinition9.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition9.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition9.getMaterialInstances().add(materialInstance1); tousseDefinition9.getMaterialInstances().add(materialInstance2); @@ -1457,8 +1457,8 @@ tousseDefinition10.setIsCleanedEntirely("是"); tousseDefinition10.setTaskGroup("器械组"); tousseDefinition10.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition10.setHandlerDepartName("供应室"); - tousseDefinition10.setHandlerDepartCode("900202"); + tousseDefinition10.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition10.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition10.getMaterialInstances().add(materialInstance1); tousseDefinition10.getMaterialInstances().add(materialInstance2); @@ -1470,8 +1470,8 @@ tousseDefinition11.setIsCleanedEntirely("是"); tousseDefinition11.setTaskGroup("器械组"); tousseDefinition11.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition11.setHandlerDepartName("供应室"); - tousseDefinition11.setHandlerDepartCode("900202"); + tousseDefinition11.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseDefinition11.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); tousseDefinition11.getMaterialInstances().add(materialInstance1); tousseDefinition11.getMaterialInstances().add(materialInstance2); @@ -2100,10 +2100,10 @@ "yangguangyiyuan", "name1", rootNode); assertTrue(directoryHelper.isOrgUnitName("阳光医院")); - OrgUnit orgUnitOR = directoryHelper.createOrgUnit("测试手术室", Constants.ORG_UNIT_CODE_OR, + OrgUnit orgUnitOR = directoryHelper.createOrgUnit(Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, "name2", orgUnitROOT); - assertTrue(directoryHelper.isOrgUnitName("测试手术室")); - OrgUnit orgUnitCSSD = directoryHelper.createOrgUnit("测试供应室", + assertTrue(directoryHelper.isOrgUnitName(Constants.ORG_UNIT_NAME_OR)); + OrgUnit orgUnitCSSD = directoryHelper.createOrgUnit(Constants.ORG_UNIT_NAME_CSSD, Constants.ORG_UNIT_CODE_CSSD, "name2", orgUnitROOT); assertTrue(directoryHelper.isOrgUnitCodeExist(Constants.ORG_UNIT_CODE_CSSD)); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java =================================================================== diff -u -r13045 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java (.../TestPDAReturnGoodReInvoiceManager.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java (.../TestPDAReturnGoodReInvoiceManager.java) (revision 13052) @@ -72,7 +72,7 @@ * @throws ParseException */ private void createTousseInstanceAndUpdateStock(){ - createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202", 3.14); + createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT, 3.14); } private void prepareData(String type){ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java (.../PDADuplicateInvoice.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java (.../PDADuplicateInvoice.java) (revision 13052) @@ -8,6 +8,7 @@ import org.testng.annotations.Test; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; @@ -70,6 +71,6 @@ private void createTousseInstance() { createSimpleTousseInstanceByParam(barcodeArrayOfTousseA, "Test开胸包", - BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202", 3.14); + BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT, 3.14); } } Index: ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java (.../JSONTest.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java (.../JSONTest.java) (revision 13052) @@ -9,6 +9,7 @@ import org.testng.annotations.Test; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; @@ -66,9 +67,9 @@ tousseInstance.setValidUntil(today); tousseInstance.setWarningUntil(today); - tousseInstance.setOrgUnitCoding("0101"); + tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstance.setOrgUnitName("供应室"); + tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); ClassifyBasket classifyBasket = new ClassifyBasket(); @@ -156,9 +157,9 @@ tousseInstance.setValidUntil(today); tousseInstance.setWarningUntil(today); - tousseInstance.setOrgUnitCoding("0101"); + tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstance.setOrgUnitName("供应室"); + tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); ClassifyBasket classifyBasket = new ClassifyBasket(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java (.../TestPDATousseInvoiceManager.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java (.../TestPDATousseInvoiceManager.java) (revision 13052) @@ -9,6 +9,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; @@ -46,7 +47,7 @@ } private void createTousseInstanceAndUpdateStock(){ - createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202", 3.14); + createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT, 3.14); } private void sendOutTousseAssertment(String jsonStr,String type){ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java =================================================================== diff -u -r13047 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 13047) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 13052) @@ -205,7 +205,7 @@ RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); Collection applyItemVos = new ArrayList(); appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); @@ -285,7 +285,7 @@ try { disposableGoodsApplication = createApplicationByParam( "Y-0001", - InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); recyclingApplicationManager.saveApplication( disposableGoodsApplication2, applyItemVos, true); @@ -338,7 +338,7 @@ try { disposableGoodsApplication = createApplicationByParam( "Y-0001", - InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); recyclingApplicationManager.saveApplication( disposableGoodsApplication2, applyItemVos,true); @@ -381,7 +381,7 @@ try { disposableGoodsApplication = createApplicationByParam( "Y-0001", - InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( @@ -432,7 +432,7 @@ try { disposableGoodsApplication = createApplicationByParam( "Y-0001", - InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( @@ -478,7 +478,7 @@ try { disposableGoodsApplication = createApplicationByParam( "Y-0001", - InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); // 第二张发货计划单 recyclingApplicationManager.saveApplication( @@ -526,7 +526,7 @@ try { disposableGoodsApplication = createApplicationByParam( "Y-0001", - InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, "测试手术室", + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, 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, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); RecyclingApplication disposableGoodsApplication3 = createApplicationByParam( "Y-0003", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); //合并 recyclingApplicationManager.saveApplication( @@ -811,17 +811,17 @@ assertEquals(3,invoicePlanList.size()); InvoicePlan invoicePlan = invoicePlanList.get(0); assertEquals("待发货",invoicePlan.getDeliverStatus()); - assertEquals("测试手术室",invoicePlan.getSettleAccountsDepart()); + assertEquals(Constants.ORG_UNIT_NAME_OR,invoicePlan.getSettleAccountsDepart()); assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan.getApplicationItems()); InvoicePlan invoicePlan2 = invoicePlanList.get(1); assertEquals("待发货",invoicePlan2.getDeliverStatus()); - assertEquals("测试手术室",invoicePlan.getSettleAccountsDepart()); + assertEquals(Constants.ORG_UNIT_NAME_OR,invoicePlan.getSettleAccountsDepart()); assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan2.getApplicationItems()); InvoicePlan invoicePlan3 = invoicePlanList.get(2); assertEquals("待发货",invoicePlan3.getDeliverStatus()); - assertEquals("测试手术室",invoicePlan.getSettleAccountsDepart()); + assertEquals(Constants.ORG_UNIT_NAME_OR,invoicePlan.getSettleAccountsDepart()); assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan3.getApplicationItems()); } @@ -839,7 +839,7 @@ appendToCollection(applyItemVos, "探针", 2 , "器械包", "是", 0); RecyclingApplication tousseApplication = createApplicationByParam( - "Y-0001", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "测试手术室", + "Y-0001", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); recyclingApplicationManager.saveApplication(tousseApplication, applyItemVos, true); @@ -873,9 +873,9 @@ tousseApplication.setCommittedStatus(true); tousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication.setRemark("测试备注"); - tousseApplication.setDepart("测试手术室"); + tousseApplication.setDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - tousseApplication.setSettleAccountsDepart("测试手术室"); + tousseApplication.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication.setAdministrators("USERID_oruser1"); @@ -956,9 +956,9 @@ tousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); tousseApplication.setRemark("测试备注"); - tousseApplication.setDepart("测试手术室"); + tousseApplication.setDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - tousseApplication.setSettleAccountsDepart("测试手术室"); + tousseApplication.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication.setAdministrators("USERID_oruser1"); @@ -971,9 +971,9 @@ tousseApplication2.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication2.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); tousseApplication2.setRemark("测试备注"); - tousseApplication2.setDepart("测试手术室"); + tousseApplication2.setDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication2.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - tousseApplication2.setSettleAccountsDepart("测试手术室"); + tousseApplication2.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication2.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication2.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication2.setAdministrators("USERID_oruser1"); @@ -986,9 +986,9 @@ tousseApplication3.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication3.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); tousseApplication3.setRemark("测试备注"); - tousseApplication3.setDepart("测试手术室"); + tousseApplication3.setDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication3.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - tousseApplication3.setSettleAccountsDepart("测试手术室"); + tousseApplication3.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication3.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication3.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); tousseApplication3.setAdministrators("USERID_oruser1"); @@ -1182,9 +1182,9 @@ tousseApplication.setCommittedStatus(true); tousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); tousseApplication.setRemark("测试备注"); - tousseApplication.setDepart("测试手术室"); + tousseApplication.setDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - tousseApplication.setSettleAccountsDepart("测试手术室"); + tousseApplication.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); tousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); tousseApplication.setType(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM); tousseApplication.setAdministrators("USERID_oruser1"); @@ -1292,7 +1292,7 @@ .setPackageStatus(ForeignTousseDefinition.PACKAGE_STATUS_RECEIVING); foreignTousseApplication.setDoctor("阿斯达"); foreignTousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - foreignTousseApplication.setDepart("测试手术室"); + foreignTousseApplication.setDepart(Constants.ORG_UNIT_NAME_OR); foreignTousseApplication.setCommittedStatus(true); foreignTousseApplication.setClinicNumber("0100006"); foreignTousseApplication.setApplicationTime(new Date()); @@ -1333,9 +1333,9 @@ customRecyclingApplication.setCommittedStatus(true); customRecyclingApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); customRecyclingApplication.setRemark("测试备注"); - customRecyclingApplication.setDepart("测试手术室"); + customRecyclingApplication.setDepart(Constants.ORG_UNIT_NAME_OR); customRecyclingApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - customRecyclingApplication.setSettleAccountsDepart("测试手术室"); + customRecyclingApplication.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); customRecyclingApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); customRecyclingApplication.setType(InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM); customRecyclingApplication.setAdministrators("USERID_oruser1"); @@ -1409,7 +1409,7 @@ RecyclingApplication application = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_COMBO_FORM, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); assertNotNull(application); @@ -1492,7 +1492,7 @@ RecyclingApplication application = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_COMBO_FORM, - "测试手术室", Constants.ORG_UNIT_CODE_OR, new Date()); + Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); assertNotNull(application); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java (.../PDASimpleTousseComplexStatusInvoiceManagerTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java (.../PDASimpleTousseComplexStatusInvoiceManagerTests.java) (revision 13052) @@ -15,6 +15,7 @@ import org.apache.commons.lang.ArrayUtils; import org.testng.annotations.Test; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; @@ -101,15 +102,15 @@ private void createTousseInstance(String type){ if(type.equals(type1)){ - createSimpleTousseInstanceByParam(barcodeArrayOfTousseA, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); - createSimpleTousseInstanceByParam(barcodeArrayOfTousseB, "Test缝合包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); - createSimpleTousseInstanceByParam(barcodeArrayOfTousseC, "Test清创包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); - createSimpleTousseInstanceByParam(barcodeArrayOfTousseD, "Test宫碘包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseA, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseB, "Test缝合包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseC, "Test清创包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseD, "Test宫碘包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); }else if(type.equals(type2)){ - createSimpleTousseInstanceByParam(barcodeArrayOfTousseAA, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); - createSimpleTousseInstanceByParam(barcodeArrayOfTousseBB, "Test缝合包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); - createSimpleTousseInstanceByParam(barcodeArrayOfTousseCC, "Test清创包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); - createSimpleTousseInstanceByParam(barcodeArrayOfTousseDD, "Test宫碘包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202",3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseAA, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseBB, "Test缝合包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseCC, "Test清创包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); + createSimpleTousseInstanceByParam(barcodeArrayOfTousseDD, "Test宫碘包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT,3.14); } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java =================================================================== diff -u -r13049 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java (.../TestInvoiceManagerForTousse.java) (revision 13049) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java (.../TestInvoiceManagerForTousse.java) (revision 13052) @@ -14,6 +14,7 @@ import org.springframework.test.annotation.Rollback; import org.testng.annotations.Test; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.acegi.tools.AcegiHelper; @@ -146,8 +147,8 @@ tousseInstance1.setPrice(3.14); tousseInstance1.setFluctuationPrice(3.14); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(1); Date date = null; try { @@ -171,8 +172,8 @@ tousseInstance1.setPrice(2.5); tousseInstance1.setFluctuationPrice(2.5); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Date date = null; try { @@ -200,8 +201,8 @@ tousseInstance1.setInvoicePlanID(app.getId()); tousseInstance1.setFluctuationPrice(5.9); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Date date = null; try { @@ -225,8 +226,8 @@ tousseInstance1.setPrice(9.2); tousseInstance1.setFluctuationPrice(9.2); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Date date = null; try { @@ -254,8 +255,8 @@ tousseInstance1.setPrice(12.3); tousseInstance1.setFluctuationPrice(12.3); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); Date date = null; try { @@ -282,8 +283,8 @@ tousseInstance1.setPrice(7.8); tousseInstance1.setFluctuationPrice(7.8); tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding("8063"); - tousseInstance1.setOrgUnitName("消毒供应室"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance1.setStatisticsAmount(10); tousseInstance1.setProxyDisinfection_id(proxyDisinfection.getId()); Date date = null; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java =================================================================== diff -u -r13045 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java (.../PDAAssembleSendGoodsInvoiceManagerTests.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java (.../PDAAssembleSendGoodsInvoiceManagerTests.java) (revision 13052) @@ -286,8 +286,8 @@ tousseInstance.setStatus(TousseInstance.STATUS_DISINFECTED); tousseInstance.setPrice(3.5); tousseInstance.setFluctuationPrice(3.5); - tousseInstance.setOrgUnitCoding("900202"); - tousseInstance.setOrgUnitName("消毒供应室"); + tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); tousseInstance.setStatisticsAmount(10); tousseInstance.setPackageType("胶带"); tousseInstance.setUnTraceableTousse(true); @@ -310,7 +310,7 @@ */ private void createTousseInstanceAndUpdateStock(){ //普通器械包 - createSimpleTousseInstanceByParam(simpleTousseBarcodeArray, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, "消毒供应室", "900202", 3.14); + createSimpleTousseInstanceByParam(simpleTousseBarcodeArray, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_NAME_DISINFECT, 3.14); } /* Index: ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java =================================================================== diff -u -r12331 -r13052 --- ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java (.../ServiceManagerTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java (.../ServiceManagerTests.java) (revision 13052) @@ -5,6 +5,7 @@ import org.testng.annotations.Test; import net.sf.json.JSONObject; +import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.disinfectsystem.common.CSSDConstants; @@ -48,7 +49,7 @@ assertTrue(json.optBoolean("success")); assertEquals("cssduser1FullName",json.optString("userFullName")); - assertEquals("测试供应室",json.optString("orgUnitName")); + assertEquals(Constants.ORG_UNIT_NAME_CSSD,json.optString("orgUnitName")); // 错误的密码 jsonObj.put("action", "login"); @@ -88,7 +89,7 @@ assertTrue(json.optBoolean("success")); assertEquals("oruser1FullName",json.optString("userFullName")); - assertEquals("测试手术室",json.optString("orgUnitName")); + assertEquals(Constants.ORG_UNIT_NAME_OR,json.optString("orgUnitName")); } @@ -114,7 +115,7 @@ assertTrue(json.optBoolean("success")); assertEquals("cssduser1FullName",json.optString("userFullName")); - assertEquals("测试供应室",json.optString("orgUnitName")); + assertEquals(Constants.ORG_UNIT_NAME_CSSD,json.optString("orgUnitName")); // oruser2 jsonObj.put("action", "login"); @@ -128,7 +129,7 @@ json = JSONObject.fromObject(result); assertTrue(json.optBoolean("success")); assertEquals("oruser2FullName",json.optString("userFullName")); - assertEquals("测试手术室",json.optString("orgUnitName")); + assertEquals(Constants.ORG_UNIT_NAME_OR,json.optString("orgUnitName")); }