Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r34643 -r34646
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 34643)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 34646)
@@ -897,6 +897,10 @@
 		if(StringUtils.equals(consumptiveMaterialUse, DisposableGoods.CONSUMPTIVE_MATERIAL_USE_RINSER) && DatabaseUtil.isPoIdValid(consumptiveMaterialTypeId)){
 			sql += " and consumptiveMaterialUse = '" + DisposableGoods.CONSUMPTIVE_MATERIAL_USE_RINSER + "' and po.consumptiveMaterialVolume > 0 and po.consumptiveMaterialType.id = " + consumptiveMaterialTypeId + " ";
 		}
+		//灭菌耗材GYEY-768
+		if(StringUtils.equals(consumptiveMaterialUse, DisposableGoods.CONSUMPTIVE_MATERIAL_USE_STERILIZER)){
+			sql += " and consumptiveMaterialUse = '" + DisposableGoods.CONSUMPTIVE_MATERIAL_USE_STERILIZER + "' ";
+		}
 		
 		List<DisposableGoods> disposableGoodsList = objectDao.findBySql(DisposableGoods.class.getSimpleName(), sql);
 		List<Map<String, Object>> mapList = buildDisposableGoodsListInfo(settleAccountsDepartCoding, handleDepartCode,
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SteriConsumeMaterialUseRecordVo.java
===================================================================
diff -u -r34643 -r34646
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SteriConsumeMaterialUseRecordVo.java	(.../SteriConsumeMaterialUseRecordVo.java)	(revision 34643)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SteriConsumeMaterialUseRecordVo.java	(.../SteriConsumeMaterialUseRecordVo.java)	(revision 34646)
@@ -49,9 +49,39 @@
 	private String sterilizationType;
 	
 	/**
+	 * 是否叶子节点
+	 */
+	private Boolean leaf = false;
+	
+	/**
+	 * 默认展开
+	 */
+	private Boolean expanded = true;
+	
+	/**
+	 * 支持展开叶子节点
+	 */
+	private Boolean expandable = true;
+	
+	/**
+	 * 当前页码
+	 */
+	private Integer pageNow;
+	
+	/**
+	 * 总页数
+	 */
+	private Integer pageCount;
+	
+	/**
+	 * 总记录数
+	 */
+	private Integer rowCount;
+	
+	/**
 	 * 灭菌耗材使用明细
 	 */
-	private List<SteriConsumeMaterialUseRecordDetailVo> details = new ArrayList<SteriConsumeMaterialUseRecordDetailVo>();
+	private List<SteriConsumeMaterialUseRecordDetailVo> children = new ArrayList<SteriConsumeMaterialUseRecordDetailVo>();
 
 	public Long getId() {
 		return id;
@@ -125,12 +155,60 @@
 		this.sterilizationType = sterilizationType;
 	}
 
-	public List<SteriConsumeMaterialUseRecordDetailVo> getDetails() {
-		return details;
+	public Boolean getLeaf() {
+		return leaf;
 	}
 
-	public void setDetails(List<SteriConsumeMaterialUseRecordDetailVo> details) {
-		this.details = details;
+	public void setLeaf(Boolean leaf) {
+		this.leaf = leaf;
 	}
+
+	public Boolean getExpanded() {
+		return expanded;
+	}
+
+	public void setExpanded(Boolean expanded) {
+		this.expanded = expanded;
+	}
+
+	public Boolean getExpandable() {
+		return expandable;
+	}
+
+	public void setExpandable(Boolean expandable) {
+		this.expandable = expandable;
+	}
+
+	public Integer getPageNow() {
+		return pageNow;
+	}
+
+	public void setPageNow(Integer pageNow) {
+		this.pageNow = pageNow;
+	}
+
+	public Integer getPageCount() {
+		return pageCount;
+	}
+
+	public void setPageCount(Integer pageCount) {
+		this.pageCount = pageCount;
+	}
+
+	public Integer getRowCount() {
+		return rowCount;
+	}
+
+	public void setRowCount(Integer rowCount) {
+		this.rowCount = rowCount;
+	}
+
+	public List<SteriConsumeMaterialUseRecordDetailVo> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<SteriConsumeMaterialUseRecordDetailVo> children) {
+		this.children = children;
+	}
 	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SteriConsumeMaterialUseRecordDetailVo.java
===================================================================
diff -u -r34643 -r34646
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SteriConsumeMaterialUseRecordDetailVo.java	(.../SteriConsumeMaterialUseRecordDetailVo.java)	(revision 34643)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SteriConsumeMaterialUseRecordDetailVo.java	(.../SteriConsumeMaterialUseRecordDetailVo.java)	(revision 34646)
@@ -36,6 +36,11 @@
 	 * 库存剩余
 	 */
 	private Long stockAmount;
+	
+	/**
+	 * 是否叶子节点
+	 */
+	private Boolean leaf = true;
 
 	public Long getId() {
 		return id;
@@ -92,5 +97,13 @@
 	public void setStockAmount(Long stockAmount) {
 		this.stockAmount = stockAmount;
 	}
+
+	public Boolean getLeaf() {
+		return leaf;
+	}
+
+	public void setLeaf(Boolean leaf) {
+		this.leaf = leaf;
+	}
 	
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java
===================================================================
diff -u -r34643 -r34646
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java	(.../SteriConsumeMaterialUseRecordController.java)	(revision 34643)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java	(.../SteriConsumeMaterialUseRecordController.java)	(revision 34646)
@@ -63,7 +63,7 @@
 			Long disposableGoodsId, String sterilizationUser, String sterilizationType,
 			Long sterilizerId, String sterilizationPurpose,
 			Integer pageNow, Integer pageSize){
-		JSONObject result = JSONUtil.buildJsonObject(true);
+		String result = "";
 		try {
 			if(pageNow == null || pageNow <= 0){
 				pageNow = 1;
@@ -119,7 +119,6 @@
 			
 			int rowCount = objectDao.countBySql(countSql);
 			int pageCount = rowCount % pageSize == 0 ? rowCount / pageSize : rowCount / pageSize + 1;
-			JSONArray data = new JSONArray();
 			
 			if(rowCount > 0){
 				String pageColumnName = "id";
@@ -192,6 +191,9 @@
 							vo.setCreateDateTime(rs.getTimestamp("createDateTime"));
 							vo.setRemark(rs.getString("remark"));
 							vo.setSterilizationRecordId(rs.getLong("sterilizationRecordId"));
+							vo.setPageNow(pageNow);
+							vo.setPageCount(pageCount);
+							vo.setRowCount(rowCount);
 						}
 						SteriConsumeMaterialUseRecordDetailVo detail = new SteriConsumeMaterialUseRecordDetailVo();
 						detail.setDisposableGoodsBatchId(rs.getLong("disposableGoodsBatchId"));
@@ -201,7 +203,7 @@
 						detail.setId(rs.getLong("urdID"));
 						detail.setStockAmount(rs.getLong("stockAmount"));
 						detail.setUseAmount(rs.getLong("useAmount"));
-						vo.getDetails().add(detail);
+						vo.getChildren().add(detail);
 						map.put(useRecordId, vo);
 					}
 					if(MapUtils.isNotEmpty(map)){
@@ -211,7 +213,7 @@
 						}
 						JsonConfig config = new JsonConfig();
 						config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd HH:mm"));
-						data = JSONArray.fromObject(voList, config);
+						result = JSONArray.fromObject(voList, config).toString();
 					}
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -220,13 +222,8 @@
 				}
 			}
 			
-			result.put("rowCount", rowCount);
-			result.put("pageCount", pageCount);
-			result.put("data", data);
-			result.put("success", true);
-			
 		} catch (Exception e) {
-			result = JSONUtil.buildJsonObject(false, "加载失败：" + e.getMessage());
+			result = "加载失败：" + e.getMessage();
 		}
 		return result.toString();
 	}