Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/GoodsStockVo.java
===================================================================
diff -u -r32160 -r35277
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/GoodsStockVo.java	(.../GoodsStockVo.java)	(revision 32160)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/GoodsStockVo.java	(.../GoodsStockVo.java)	(revision 35277)
@@ -71,6 +71,16 @@
 	 * 最小预警库存
 	 */
 	private Integer minWarnStock;
+	
+	/**
+	 * 科室二级库存的ID(DGSETYY-59)
+	 */
+	private Long departmentStockId;
+	
+	/**
+	 * 基数(DGSETYY-59)
+	 */
+	private Integer cardinalNum;
 
 	public Long getId() {
 		return id;
@@ -176,4 +186,20 @@
 		this.minWarnStock = minWarnStock;
 	}
 
+	public Long getDepartmentStockId() {
+		return departmentStockId;
+	}
+
+	public void setDepartmentStockId(Long departmentStockId) {
+		this.departmentStockId = departmentStockId;
+	}
+
+	public Integer getCardinalNum() {
+		return cardinalNum;
+	}
+
+	public void setCardinalNum(Integer cardinalNum) {
+		this.cardinalNum = cardinalNum;
+	}
+
 }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r33844 -r35277
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 33844)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 35277)
@@ -16,6 +16,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption;
+import com.forgon.disinfectsystem.entity.departmentstock.DepartmentStock;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.goodsstock.OrgUnitGoodsWarnStock;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
@@ -68,7 +69,7 @@
 		Map<String, String> sqlWhereParamMap = gridManager
 				.getParamFromView(parameterMap);
 		StringBuilder sqlBuilder = new StringBuilder();
-		sqlBuilder.append("(select vw.tousseDefinitionId, vw.name , vw.orgUnitCode, vw.orgUnitName, vw.amount, s.warningStock from (select tousseDefinitionId, name , orgUnitCode, orgUnitName , sum(amount) amount from GoodsStock ");
+		sqlBuilder.append("(select vw.tousseDefinitionId, vw.name , vw.orgUnitCode, vw.orgUnitName, vw.amount, s.warningStock, ds.id departmentStockId, ds.cardinalNum from (select tousseDefinitionId, name , orgUnitCode, orgUnitName , sum(amount) amount from GoodsStock ");
 		sqlBuilder.append(" WHERE 1=1 and amount > 0 and goodsType='"+GoodsStock.TYPE_TOUSSE
 						+"' and tousseDefinitionId is not null");
 		
@@ -119,6 +120,7 @@
 //				pageSize = Integer.valueOf(pageSizeStr.get(0));
 //			}
 //		}
+		sqlBuilder.append(" left join " + DepartmentStock.class.getSimpleName() + " ds on ds.tousseDefinition_id = vw.tousseDefinitionId and ds.departCoding = vw.orgUnitCode ");
 		sqlBuilder.append(" left join " + OrgUnitGoodsWarnStock.class.getSimpleName() + " s on s.tousseDefinitionId = vw.tousseDefinitionId and vw.orgUnitCode = s.orgUnitCode ) rs ");
 		//器械包名称
 		String stockFilter = sqlWhereParamMap.get("stockFilter");
@@ -134,11 +136,14 @@
 		try {
 			while(rs.next()){
 				GoodsStockVo goodsStockVo = new GoodsStockVo();
+				goodsStockVo.setTousseDefinitionId(rs.getLong("tousseDefinitionId"));
 				goodsStockVo.setAmount(rs.getInt("amount"));
 				goodsStockVo.setName(rs.getString("name"));
 				goodsStockVo.setOrgUnitCode(rs.getString("orgUnitCode"));
 				goodsStockVo.setOrgUnitName(rs.getString("orgUnitName"));
 				goodsStockVo.setMinWarnStock(rs.getInt("warningStock"));
+				goodsStockVo.setDepartmentStockId(rs.getLong("departmentStockId"));
+				goodsStockVo.setCardinalNum(rs.getInt("cardinalNum"));
 				goodsStockVoList.add(goodsStockVo);
 			}
 		} catch (SQLException e) {