Index: ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r17920 -r17923 --- ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 17920) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 17923) @@ -344,7 +344,7 @@ {"'BarCodeDevice'","'OrgUnit'","'SS_OPERATION'","'SS_ROLE_OPERATION'","'SS_ROLES'","'SS_USERS'","'OrgUserRelation'", "'SS_USER_ROLE'","'SS_USERATTRIBUTE'","'SerialNum'","'WareHouse'","'Supplier'","'TaskGroup'","'HttpOption'", "'Rinser'","'CleanMethod'","'rinser_cleanMethod'","'Sterilizer'","'Sterilisation'","'sterilizer_sterilistion'","'SupplyRoomConfig'","'Container'","'CssdServiceDepts'","'CssdHandleTousses'", - "'TousseGroup'","'MaterialDefinition'","'TousseDefinition'","'MaterialInstance'","'DiposableGoodsInstance'","'ComboTousseOrgUint'","'MaterialInstance'","'IDCardDefinition'","'IDCardInstance'", + "'TousseGroup'","'MaterialDefinition'","'TousseDefinition'","'MaterialInstance'","'DiposableGoodsInstance'","'ComboTousseOrgUint'","'ComboTousseComposite'","'MaterialInstance'","'IDCardDefinition'","'IDCardInstance'", "'DisposableGoods'","'DisposableGoodsStock'","'DisposableGoodsBatch'","'DisposableGoodsBatchStock'","'DisposableGoodsIdentification'", "'ExpirationDateInfo'","'QualityMonitoringDefinition'","'FormDefinition'","'DiposableGoodsTemplateItem'","'TousseDefinitionTemplateItem'","'DepartmentAppTemplate'"}; deleteTableDataDynamic(excludeTableNames); @@ -2025,10 +2025,12 @@ MaterialInstance materialInstance5 = new MaterialInstance(); materialInstance5.setMaterialDefinition(materialDefinition1); + materialInstance5.setTousse(tousseDefinition3); materialInstance5.setCount(1); MaterialInstance materialInstance6 = new MaterialInstance(); materialInstance6.setMaterialDefinition(materialDefinition3); + materialInstance6.setTousse(tousseDefinition3); materialInstance6.setCount(2); tousseDefinition3.setMaterialInstances(new ArrayList()); @@ -2061,10 +2063,12 @@ MaterialInstance materialInstance7 = new MaterialInstance(); materialInstance7.setMaterialDefinition(materialDefinition2); + materialInstance7.setTousse(tousseDefinition4); materialInstance7.setCount(5); MaterialInstance materialInstance8 = new MaterialInstance(); materialInstance8.setMaterialDefinition(materialDefinition3); + materialInstance8.setTousse(tousseDefinition4); materialInstance8.setCount(4); tousseDefinition4.setMaterialInstances(new ArrayList()); @@ -2091,11 +2095,13 @@ MaterialInstance materialInstance9 = new MaterialInstance(); materialInstance9.setMaterialDefinition(materialDefinition4); + materialInstance9.setTousse(tousseDefinition5); materialInstance9.setCount(7); MaterialInstance materialInstance10 = new MaterialInstance(); - materialInstance8.setMaterialDefinition(materialDefinition5); - materialInstance8.setCount(2); + materialInstance10.setMaterialDefinition(materialDefinition5); + materialInstance10.setTousse(tousseDefinition5); + materialInstance10.setCount(2); tousseDefinition5 .setMaterialInstances(new ArrayList()); @@ -2121,18 +2127,22 @@ MaterialInstance materialInstance11 = new MaterialInstance(); materialInstance11.setMaterialDefinition(materialDefinition4); + materialInstance11.setTousse(tousseDefinition6); materialInstance11.setCount(7); MaterialInstance materialInstance12 = new MaterialInstance(); materialInstance12.setMaterialDefinition(materialDefinition5); + materialInstance12.setTousse(tousseDefinition6); materialInstance12.setCount(3); MaterialInstance materialInstance13 = new MaterialInstance(); materialInstance13.setMaterialDefinition(materialDefinition6); + materialInstance13.setTousse(tousseDefinition6); materialInstance13.setCount(4); MaterialInstance materialInstance14 = new MaterialInstance(); materialInstance14.setMaterialDefinition(materialDefinition7); + materialInstance14.setTousse(tousseDefinition6); materialInstance14.setCount(1); tousseDefinition6 @@ -2169,19 +2179,13 @@ MaterialInstance materialInstance100 = new MaterialInstance(); materialInstance100.setMaterialDefinition(materialDefinition2); + materialInstance100.setTousse(tousseDefinition7); materialInstance100.setCount(7); tousseDefinition7.setMaterialInstances(new ArrayList()); tousseDefinition7.getMaterialInstances().add(materialInstance100); tousseDefinitionManager.saveOrUpdate(tousseDefinition7); - MaterialInstance materialInstance15 = new MaterialInstance(); - materialInstance15.setCount(1); -// materialInstance15.setIncludeImplant("否"); - materialInstance15.setMaterialDefinition(materialDefinition8); - materialInstance15.setMaterialName("棉布"); - - TousseDefinition tousseDefinition8 = new TousseDefinition(); tousseDefinition8.setTousseGroupID(group2.getId()); tousseDefinition8.setTousseGroupName("普通批"); @@ -2194,11 +2198,16 @@ tousseDefinition8.setIsCustomPacking("否"); tousseDefinition8.setIsRecycling("是"); tousseDefinition8.setIsTraceable("是"); - tousseDefinition8.getMaterialInstances().add(materialInstance15); tousseDefinition8.setName("4#压力蒸汽灭菌包"); tousseDefinition8.setTaskGroup("灭菌组"); tousseDefinition8.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); + MaterialInstance materialInstance15 = new MaterialInstance(); + materialInstance15.setCount(1); +// materialInstance15.setIncludeImplant("否"); + materialInstance15.setMaterialDefinition(materialDefinition8); + materialInstance15.setMaterialName("棉布"); materialInstance15.setTousse(tousseDefinition8); + tousseDefinition8.getMaterialInstances().add(materialInstance15); //包装类型 tousseDefinition8.setPackageType("纸塑"); tousseDefinitionManager.saveOrUpdate(tousseDefinition8); @@ -2213,8 +2222,21 @@ tousseDefinition9.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition9.setUnit(""); - tousseDefinition9.getMaterialInstances().add(materialInstance1); - tousseDefinition9.getMaterialInstances().add(materialInstance2); + + MaterialInstance materialInstance16 = new MaterialInstance(); + materialInstance16.setTousse(tousseDefinition9); + materialInstance16.setMaterialDefinition(materialDefinition1); + materialInstance16.setCount(2); + materialInstance16.setMaterialName(materialDefinition1.getName()); + + MaterialInstance materialInstance17 = new MaterialInstance(); + materialInstance17.setTousse(tousseDefinition9); + materialInstance17.setMaterialDefinition(materialDefinition2); + materialInstance17.setCount(5); + materialInstance17.setMaterialName(materialDefinition2.getName()); + + tousseDefinition9.getMaterialInstances().add(materialInstance16); + tousseDefinition9.getMaterialInstances().add(materialInstance17); //包装类型 tousseDefinition9.setPackageType("纸塑"); tousseDefinitionManager.saveOrUpdate(tousseDefinition9); @@ -2232,8 +2254,19 @@ //包装类型 tousseDefinition10.setPackageType("纸塑"); - tousseDefinition10.getMaterialInstances().add(materialInstance1); - tousseDefinition10.getMaterialInstances().add(materialInstance2); + MaterialInstance materialInstance18 = new MaterialInstance(); + materialInstance18.setTousse(tousseDefinition10); + materialInstance18.setMaterialDefinition(materialDefinition1); + materialInstance18.setCount(2); + materialInstance18.setMaterialName(materialDefinition1.getName()); + + MaterialInstance materialInstance19 = new MaterialInstance(); + materialInstance19.setTousse(tousseDefinition10); + materialInstance19.setMaterialDefinition(materialDefinition2); + materialInstance19.setCount(5); + materialInstance19.setMaterialName(materialDefinition2.getName()); + tousseDefinition10.getMaterialInstances().add(materialInstance18); + tousseDefinition10.getMaterialInstances().add(materialInstance19); tousseDefinitionManager.saveOrUpdate(tousseDefinition10); TousseDefinition tousseDefinition11 = new TousseDefinition(); @@ -2248,8 +2281,19 @@ //包装类型 tousseDefinition11.setPackageType("纸塑"); - tousseDefinition11.getMaterialInstances().add(materialInstance1); - tousseDefinition11.getMaterialInstances().add(materialInstance2); + MaterialInstance materialInstance20 = new MaterialInstance(); + materialInstance20.setTousse(tousseDefinition11); + materialInstance20.setMaterialDefinition(materialDefinition1); + materialInstance20.setCount(2); + materialInstance20.setMaterialName(materialDefinition1.getName()); + + MaterialInstance materialInstance21 = new MaterialInstance(); + materialInstance21.setTousse(tousseDefinition11); + materialInstance21.setMaterialDefinition(materialDefinition2); + materialInstance21.setCount(5); + materialInstance21.setMaterialName(materialDefinition2.getName()); + tousseDefinition11.getMaterialInstances().add(materialInstance20); + tousseDefinition11.getMaterialInstances().add(materialInstance21); tousseDefinitionManager.saveOrUpdate(tousseDefinition11); List tList = tousseDefinitionManager.findTousseDefinitionList(); @@ -2467,6 +2511,8 @@ comboTousse.setHandlerDepartCode(Constants.ORG_UNIT_CODE_NEIKE); comboTousse.setHandlerDepartName(Constants.ORG_UNIT_NAME_NEIKE); comboTousse.setIsCustomPacking(TousseDefinition.STR_NO); + comboTousse.setTaskGroup("术科组"); + comboTousse.setPackageType("棉布"); objectDao.saveOrUpdate(comboTousse); comboTousse.setAncestorID(comboTousse.getId()); @@ -2481,7 +2527,7 @@ //聚合包内普通器械包 TousseDefinition td_开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); - TousseDefinition td_开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); ComboTousseComposite ct = new ComboTousseComposite(); ct.setComboTousseDefinitionId(comboTousse.getId()); @@ -2490,7 +2536,7 @@ ComboTousseComposite ct2 = new ComboTousseComposite(); ct2.setComboTousseDefinitionId(comboTousse.getId()); - ct2.setTousseDefinitionId(td_开颅包.getId()); + ct2.setTousseDefinitionId(td_开口包.getId()); objectDao.saveOrUpdate(ct2); return comboTousse; }