Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
===================================================================
diff -u -r16483 -r17549
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java (.../ExportBasedataManagerImpl.java) (revision 16483)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java (.../ExportBasedataManagerImpl.java) (revision 17549)
@@ -62,6 +62,27 @@
@Override
public void exportBasedata(OutputStream os) {
try {
+ HSSFWorkbook wb = getExportWorkbook();
+ if(wb != null){
+ wb.write(os);
+ }
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ os.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ /*
+ * 获取导出xls的数据
+ */
+ public HSSFWorkbook getExportWorkbook(){
+ try{
POIFSFileSystem fs = new POIFSFileSystem(getExcelFileInputStream());
HSSFWorkbook wb = new HSSFWorkbook(fs);
@@ -71,19 +92,13 @@
simpleObjectExport(wb);
complexObjectExport(wb);
-
- wb.write(os);
- } catch (FileNotFoundException e) {
+ return wb;
+ }catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
- } finally {
- try {
- os.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
}
+ return null;
}
private void complexObjectExport(HSSFWorkbook wb) {
Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata/AllTests.xml
===================================================================
diff -u -r17534 -r17549
--- ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata/AllTests.xml (.../AllTests.xml) (revision 17534)
+++ ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata/AllTests.xml (.../AllTests.xml) (revision 17549)
@@ -5,6 +5,7 @@
+
\ No newline at end of file
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestExportbaseData.java
===================================================================
diff -u
--- ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestExportbaseData.java (revision 0)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestExportbaseData.java (revision 17549)
@@ -0,0 +1,525 @@
+package test.forgon.disinfectsystem.importbasedata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.annotations.Test;
+
+import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
+import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager;
+import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager;
+import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod;
+import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
+import com.forgon.disinfectsystem.entity.basedatamanager.expirationdateinfo.ExpirationDateInfo;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
+import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation;
+import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier;
+import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+import com.forgon.disinfectsystem.maintain.importbasedata.service.ExportBasedataManager;
+import com.forgon.disinfectsystem.maintain.importbasedata.service.ImportBasedataManager;
+import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
+import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
+import com.forgon.systemsetting.model.HttpOption;
+import com.forgon.systemsetting.service.HttpOptionManager;
+import com.forgon.tools.excel.ParerUtils;
+import com.forgon.tools.hibernate.ObjectDao;
+import com.sun.corba.se.impl.orbutil.closure.Constant;
+
+import test.forgon.constant.Constants;
+import test.forgon.disinfectsystem.AbstractCSSDTest;
+import static org.junit.Assert.*;
+
+
+public class TestExportbaseData extends AbstractCSSDTest{
+
+
+ @Autowired
+ private ExportBasedataManager exportBasedataManager;
+ @Autowired
+ protected ObjectDao objectDao;
+
+
+ @Test
+ public void testExportData(){
+ initCSSDData();
+ prepareData();
+ HSSFWorkbook wb = exportBasedataManager.getExportWorkbook();
+ assertNotNull(wb);
+ verifyData(wb);
+ }
+ // 校验导出的数据
+ private void verifyData(HSSFWorkbook wb){
+ valifyMaterialType(wb);
+ // 测试任务组数据
+ valifyTaskGroup(wb);
+ // 测试包装类型数据
+ valifyPackageType(wb);
+ // 测试清洗分类类型数据
+ valifyWashType(wb);
+ // 测试一次性物品类型数据
+ valifyDisposableType(wb);
+ // 测试容器数据
+ valifyContainer(wb);
+ // 测试供应商数据
+ valifySupplier(wb);
+ // 测试一次性物品数据
+ valifyDisposableGoods(wb);
+ // 测试材料数据
+ valifyMaterial(wb);
+ // 测试器械包数据
+ valifyTousseDefinition(wb);
+ // 测试外来器械包数据
+ valifyForeignTousseDefinition(wb);
+ // 测试清洗程序数据
+ valifyCleanMethod(wb);
+ // 测试清洗机数据
+ valifyRinser(wb);
+ // 测试灭菌炉程序数据
+ valifySterilisation(wb);
+ // 测试灭菌炉数据
+ valifySterilizer(wb);
+ // 测试物品失效期数据
+ valifyExpirationDateInfo(wb);
+ }
+ //材料类型校验
+ private void valifyMaterialType(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("材料类型配置");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试材料类型"));
+ }
+ // 测试任务组数据
+ private void valifyTaskGroup(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("任务组配置");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试任务组"));
+ }
+ // 测试包装类型数据
+ private void valifyPackageType(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("包装类型配置");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试包装类型"));
+ }
+ //测试清洗分类类型数据
+ private void valifyWashType(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("清洗分类类型配置");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试清洗分类类型"));
+ }
+ // 测试一次性物品类型数据
+ private void valifyDisposableType(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("一次性物品类型配置");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试一次性物品类型"));
+ }
+ // 测试容器数据
+ private void valifyContainer(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("容器管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试篮筐"));
+ }
+ // 测试供应商数据
+ private void valifySupplier(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("供应商管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("测试厂商".equals(name)){
+ String addr = ParerUtils.getCellFormatValue(row, 1);
+ assertEquals("广州白云",addr);
+ }
+ }
+ assertTrue(names.contains("测试厂商"));
+ }
+ // 测试一次性物品数据
+ private void valifyDisposableGoods(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("一次性物品管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("测试注射器".equals(name)){
+ String spec = ParerUtils.getCellFormatValue(row, 1);
+ assertEquals("5ML",spec);
+ }
+ }
+ assertTrue(names.contains("测试注射器"));
+ }
+ // 测试材料数据
+ private void valifyMaterial(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("材料管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("测试止血带".equals(name)){
+ String addr = ParerUtils.getCellFormatValue(row, 1);
+ assertEquals("测试材料类型",addr);
+ String specification = ParerUtils.getCellFormatValue(row, 2);
+ assertEquals("20条/扎",specification);
+ }
+ }
+ assertTrue(names.contains("测试止血带"));
+ }
+ // 测试器械包数据
+ private void valifyTousseDefinition(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("器械包管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("测试止血带包".equals(name)){
+ String addr = ParerUtils.getCellFormatValue(row, 1);
+ assertEquals("测试止血带",addr);
+ String specification = ParerUtils.getCellFormatValue(row, 2);
+ assertEquals("20条/扎",specification);
+ String amount = ParerUtils.getCellFormatValue(row, 3);
+ assertEquals("1",amount);
+ }
+ }
+ assertTrue(names.contains("测试止血带包"));
+ }
+ // 测试外来器械包数据
+ private void valifyForeignTousseDefinition(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("外来器械包管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("中山小榄".equals(name)){
+ String tousseName = ParerUtils.getCellFormatValue(row, 1);
+ assertEquals("测试外来器械包",tousseName);
+ String materialName = ParerUtils.getCellFormatValue(row, 3);
+ assertEquals("测试外来器械材料",materialName);
+ }
+ }
+ assertTrue(names.contains("中山小榄"));
+
+ }
+ // 测试清洗程序数据
+ private void valifyCleanMethod(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("清洗程序管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("清洗P"));
+ }
+ // 测试清洗机数据
+ private void valifyRinser(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("清洗机管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试清洗机1"));
+ }
+ // 测试灭菌炉程序数据
+ private void valifySterilisation(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("灭菌程序管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ }
+ assertTrue(names.contains("测试灭菌程序1"));
+ assertTrue(names.contains("测试灭菌程序2"));
+ }
+ // 测试灭菌炉数据
+ private void valifySterilizer(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("灭菌炉管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("测试灭菌炉1".equals(names)){
+ String sterisation1 = ParerUtils.getCellFormatValue(row, 1);
+ assertEquals(sterisation1,"测试灭菌程序1");
+ }
+ }
+ assertTrue(names.contains("测试灭菌炉1"));
+ }
+ // 测试物品失效期数据
+ private void valifyExpirationDateInfo(HSSFWorkbook wb){
+ HSSFSheet sheet = wb.getSheet("物品失效期管理");
+ int lastRowNum = sheet.getLastRowNum();
+ List names = new ArrayList();
+ for (int i = 1; i <= lastRowNum; i++) {
+ HSSFRow row = sheet.getRow(i);
+ if (row == null || ParerUtils.isBlankRow(row)) {
+ continue;
+ }
+ // 名称
+ String name = ParerUtils.getCellFormatValue(row, 0);
+ names.add(name);
+ if("测试包装类型".equals(name)){
+ String warningDate = ParerUtils.getCellFormatValue(row, 1);
+ String valiedDate = ParerUtils.getCellFormatValue(row, 2);
+ assertEquals(warningDate,"8");
+ assertEquals(valiedDate,"10");
+ }
+ }
+ assertTrue(names.contains("测试包装类型"));
+ }
+ private void prepareData(){
+ //材料类型
+ HttpOption httpoptionMaterialType = new HttpOption();
+ httpoptionMaterialType.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE);
+ httpoptionMaterialType.setOptionText("测试材料类型");
+ httpoptionMaterialType.setOptionValue("测试材料类型");
+ objectDao.saveOrUpdate(httpoptionMaterialType);
+ // 任务组
+ TaskGroup TaskGroup1 = new TaskGroup();
+ TaskGroup1.setTaskGroupName("测试任务组");
+ TaskGroup1.setDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+ TaskGroup1.setDepartName(Constants.ORG_UNIT_NAME_CSSD);
+ objectDao.saveOrUpdate(TaskGroup1);
+ // 包装类型 SYSTEMSETTING_PACKAGING_TYPE
+ HttpOption httpoptionPackageType = new HttpOption();
+ httpoptionPackageType.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE);
+ httpoptionPackageType.setOptionText("测试包装类型");
+ httpoptionPackageType.setOptionValue("测试包装类型");
+ objectDao.saveOrUpdate(httpoptionPackageType);
+ //清洗分类类型 SYSTEMSETTING_MATERIAL_WASH_CLASSIFY
+ HttpOption httpoptionWashType = new HttpOption();
+ httpoptionWashType.setOptionListId(HttpOption.SYSTEMSETTING_MATERIAL_WASH_CLASSIFY);
+ httpoptionWashType.setOptionText("测试清洗分类类型");
+ httpoptionWashType.setOptionValue("测试清洗分类类型");
+ objectDao.saveOrUpdate(httpoptionWashType);
+ //一次性物品类型
+ HttpOption httpoption1 = new HttpOption();
+ httpoption1.setOptionListId(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
+ httpoption1.setOptionText("测试一次性物品类型");
+ httpoption1.setOptionValue("测试一次性物品类型");
+ objectDao.saveOrUpdate(httpoption1);
+ // 容器管理
+ Container container = new Container();
+ container.setContainerName("测试篮筐");
+ container.setContainerType(Container.CONTAINERTYPE_BASKET);
+ container.setStatus(Container.CONTAINER_STATUS_FREE);
+ container.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER);
+ containerManager.saveOrUpdate(container);
+ //供应商管理
+ Supplier sup = new Supplier();
+ sup.setCompanyName("测试厂商");
+ sup.setAddress("广州白云");
+ objectDao.saveOrUpdate(sup);
+ // 一次性物品管理
+ DisposableGoods disposableGoods1 = new DisposableGoods();
+ disposableGoods1.setName("测试注射器");
+ disposableGoods1.setSpecification("5ML");
+ disposableGoods1.setReferencePrice(1.5);
+ disposableGoods1.setType("测试一次性物品类型");
+ diposableGoodsManager.saveOrUpdate(disposableGoods1);
+ //材料管理
+ MaterialDefinition materialDefinition = new MaterialDefinition();
+ materialDefinition.setName("测试止血带");
+ materialDefinition.setType("测试材料类型");
+ materialDefinition.setCost(1.5);
+ materialDefinition.setIsTraceble("否");
+ materialDefinition.setSpecification("20条/扎");
+ materialDefinition.setSpelling("ZXD");
+ materialDefinition.setStorage(2000L);
+ materialDefinitionManager.saveOrUpdate(materialDefinition);
+ // 器械包管理
+ TousseDefinition tousseDefinition = new TousseDefinition();
+ MaterialInstance materialInstance = new MaterialInstance();
+ materialInstance.setCount(1);
+ materialInstance.setMaterialDefinition(materialDefinition);
+ materialInstance.setMaterialName("测试止血带");
+
+ tousseDefinition.setName("测试止血带包");
+ tousseDefinition.setIsCleanedEntirely("是");
+ tousseDefinition.setIsRecycling(TousseDefinition.STR_YES);
+ tousseDefinition.setIsPacking(TousseDefinition.STR_NO);
+ tousseDefinition.setIsTraceable(TousseDefinition.STR_NO);
+ tousseDefinition.setTaskGroup("测试任务组");
+ tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
+ tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+ tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+ tousseDefinition.getMaterialInstances().add(materialInstance);
+ tousseDefinition.setForDisplay(true);
+ objectDao.saveOrUpdate(materialInstance);
+ tousseDefinitionManager.saveOrUpdate(tousseDefinition);
+ // 外来器械包管理
+ TousseDefinition tousseDefinitionForeign = new TousseDefinition();
+ MaterialDefinition materialDefinitionForeign = new MaterialDefinition();
+ materialDefinitionForeign.setName("测试外来器械材料");
+ materialDefinitionForeign.setIsForeignMaterial("是");
+ materialDefinitionManager.saveOrUpdate(materialDefinitionForeign);
+ MaterialInstance materialInstanceForeign = new MaterialInstance();
+ materialInstanceForeign.setCount(1);
+ materialInstanceForeign.setMaterialDefinition(materialDefinitionForeign);
+ materialInstanceForeign.setMaterialName("测试外来器械材料");
+
+ tousseDefinitionForeign.setName("测试外来器械包");
+ tousseDefinitionForeign.setSupplierName("中山小榄");
+ tousseDefinitionForeign.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGN);
+ tousseDefinitionForeign.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+ tousseDefinitionForeign.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+ tousseDefinitionForeign.getMaterialInstances().add(materialInstanceForeign);
+ tousseDefinitionForeign.setForDisplay(true);
+ objectDao.saveOrUpdate(materialInstanceForeign);
+ tousseDefinitionManager.saveOrUpdate(tousseDefinitionForeign);
+ //清洗程序管理
+ CleanMethod cm = new CleanMethod();
+ cm.setCleanMethod("清洗P");
+ cm.setBarcode("012333001");
+ objectDao.saveOrUpdate(cm);
+ //清洗机管理
+ Rinser rin = new Rinser();
+ rin.setName("测试清洗机1");
+ rin.setBarcode("012333002");
+ rin.getCleanMethods().add(cm);
+ objectDao.saveOrUpdate(rin);
+ //灭菌程序管理
+ Sterilisation ss1 = new Sterilisation();
+ ss1.setSterilisation("测试灭菌程序1");
+ ss1.setBarcode("012333003");
+ Sterilisation ss2 = new Sterilisation();
+ ss2.setSterilisation("测试灭菌程序2");
+ ss2.setBarcode("012333004");
+ objectDao.saveOrUpdate(ss1);
+ objectDao.saveOrUpdate(ss2);
+ //灭菌炉管理
+ Sterilizer ster = new Sterilizer();
+ ster.setName("测试灭菌炉1");
+ ster.setBarcode("012333005");
+ ster.setDepartment(Constants.ORG_UNIT_NAME_CSSD);
+ ster.getSterilisations().add(ss1);
+ objectDao.saveOrUpdate(ster);
+ //物品失效期管理
+ ExpirationDateInfo ed = new ExpirationDateInfo();
+ ed.setValidDate(10);
+ ed.setWarningDate(8);
+ ed.setPackageType("测试包装类型");
+ objectDao.save(ed);
+ }
+}
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManager.java
===================================================================
diff -u -r12331 -r17549
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManager.java (.../ExportBasedataManager.java) (revision 12331)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManager.java (.../ExportBasedataManager.java) (revision 17549)
@@ -2,6 +2,8 @@
import java.io.OutputStream;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
/**
*
* @author qjw
@@ -11,4 +13,8 @@
public interface ExportBasedataManager {
public void exportBasedata(OutputStream os);
+ /*
+ * 获取导出xls的数据
+ */
+ public HSSFWorkbook getExportWorkbook();
}