Index: ssts-web/src/test/java/test/forgon/constant/Constants.java =================================================================== diff -u -r22454 -r23654 --- ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 22454) +++ ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 23654) @@ -41,6 +41,16 @@ */ public static final String ORG_UNIT_NAME_NEIKE= "测试内科"; + /** + * 外六科护士站18B编码 + */ + public static final String ORG_UNIT_CODE_WLKHSZ18B = "3266"; + + /** + * 外六科护士站18B名称 + */ + public static final String ORG_UNIT_NAME_WLKHSZ18B = "外六科护士站18B"; + /** * 测试外科编码 */ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r22915 -r23654 --- ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 22915) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 23654) @@ -537,11 +537,17 @@ Constants.ORG_UNIT_NAME_NEIKE, Constants.ORG_UNIT_CODE_NEIKE, "310000120", orgUnitROOT); + //创建“测试外科” OrgUnit waike = directoryHelper.createOrgUnit( Constants.ORG_UNIT_NAME_WAIKE, Constants.ORG_UNIT_CODE_WAIKE, "310000121", orgUnitROOT); + //创建“外六科护士站18B” + OrgUnit 外六科护士站18B = directoryHelper.createOrgUnit( + Constants.ORG_UNIT_NAME_WLKHSZ18B, Constants.ORG_UNIT_CODE_WLKHSZ18B, + "310000122", orgUnitROOT); + assertEquals("组织机构", orgUnitROOT.getName()); assertTrue(directoryHelper.isOrgUnitCodeExist(Constants.ORG_UNIT_CODE_CSSD)); assertTrue(directoryHelper.isOrgUnitCodeExist(Constants.ORG_UNIT_CODE_OR)); @@ -1694,6 +1700,16 @@ supplyRoomConfigManager.save(supplyRoomConfig30); supplyRoomConfigManager.save(supplyRoomConfig40); + { + SupplyRoomConfig supplyRoomConfig_外六科护士站18B = new SupplyRoomConfig(); + supplyRoomConfig_外六科护士站18B.setOrgUnitCoding(Constants.ORG_UNIT_CODE_WLKHSZ18B); + supplyRoomConfig_外六科护士站18B.setOrgUnitName(Constants.ORG_UNIT_NAME_WLKHSZ18B); + supplyRoomConfig_外六科护士站18B.setSpelling(orgUnitManager.getByCode(Constants.ORG_UNIT_CODE_WLKHSZ18B).getSpelling()); + supplyRoomConfig_外六科护士站18B.setWbCode(orgUnitManager.getByCode(Constants.ORG_UNIT_CODE_WLKHSZ18B).getWbCode()); + supplyRoomConfig_外六科护士站18B.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY); + supplyRoomConfigManager.save(supplyRoomConfig_外六科护士站18B); + } + //结算科室(测试内科、测试外科) SupplyRoomConfig supplyRoomConfig31 = new SupplyRoomConfig(); supplyRoomConfig31.setOrgUnitCoding(Constants.ORG_UNIT_CODE_NEIKE);