Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java =================================================================== diff -u -r41625 -r41626 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java (.../DisposableGoodsStorageRecordManagerImpl.java) (revision 41625) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java (.../DisposableGoodsStorageRecordManagerImpl.java) (revision 41626) @@ -706,7 +706,7 @@ sb.append(dateQueryAdapter.dateAreaSql("i.sendTime", startDate, endDate, true, true)); if(CollectionUtils.isNotEmpty(disposableGoodsIdList)){ sb.append(" and "); - sb.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("dg.id", disposableGoodsIdList)); + sb.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("dgi.disposableGoodsID", disposableGoodsIdList)); } sb.append(" and "); sb.append(SqlBuilder.build_number_IN_Statement("i.sourceWarehouseId", SqlBuilder.IN, warehosueIds)); @@ -806,7 +806,7 @@ sb.append(dateQueryAdapter.dateAreaSql("i.sendTime", startDate, endDate, true, true)); if(CollectionUtils.isNotEmpty(disposableGoodsIdList)){ sb.append(" and "); - sb.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("dg.id", disposableGoodsIdList)); + sb.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("dgi.disposableGoodsID", disposableGoodsIdList)); } sb.append(" and "); sb.append(SqlBuilder.build_number_IN_Statement("i.sourceWarehouseId", SqlBuilder.IN, warehosueIds)); @@ -954,6 +954,14 @@ headerMap.put("inventorySerialNumber", "物资编码"); } + //导出CHAS相关字段GDSZYY-270 + boolean enableChasSystemTagPush = ConfigUtils.getSystemSetConfigByNameBool("enableChasSystemTagPush"); + if(enableChasSystemTagPush){ + headerMap.put("chasItemControlTag", "CHAS标记物品"); + headerMap.put("chasOrgControlTag", "CHAS标记科室"); + headerMap.put("chasPushResult", "CHAS推送结果"); + } + headerMap.put("displayName", "物品名称"); headerMap.put("batchNumber", "批次"); headerMap.put("serialNumber", "单号");