Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java =================================================================== diff -u -r19740 -r19948 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java (.../ExportBasedataManagerImpl.java) (revision 19740) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java (.../ExportBasedataManagerImpl.java) (revision 19948) @@ -266,7 +266,7 @@ .findBySql(TousseDefinition.class.getSimpleName(),"where po.forDisplay = true and po.tousseType != '外来器械包'"); int firstRow = 1; if (tousseDefinitions != null && tousseDefinitions.size() > 0) { - int len = 31; + int len = 32; HSSFCellStyle[] contentCellStyleArray = getContentCellStyle(len); HSSFRow row = null; for (TousseDefinition tousseDefinition : tousseDefinitions) { @@ -391,7 +391,12 @@ inertStringValueToCell(row, tempCellNum, contentCellStyleArray[tempCellNum++], tousseDefinition.getNote()); - + + //是否转换申请物品 + inertStringValueToCell(row, tempCellNum, + contentCellStyleArray[tempCellNum++], + tousseDefinition.getIsConvertApplyGoods()); + boolean isInsertMaterial = false; // 器械 List materialInstances = tousseDefinition