Index: ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
===================================================================
diff -u -r15339 -r15785
--- ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js	(.../config.js)	(revision 15339)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js	(.../config.js)	(revision 15785)
@@ -64,5 +64,5 @@
   pageSizeArrayConfig : [['标准包'],['超大包'],['超重包'],['超大超重包']],
   defaultPackageSize : '标准包',
   //是否隐藏加急数量,默认为隐藏,未配置或配置不为false时则隐藏,配置为false才不隐藏
-  isHideUrgentAmount: false
+  isHideUrgentAmount: true
 }
\ No newline at end of file
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r14823 -r15785
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14823)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 15785)
@@ -115,7 +115,7 @@
 		
 		String countSql = "select count(*),sum(po.amount),sum(po.recyclingAmount) ";
 		
-		String sql = "select distinct ip.id as \"id\",po.tousseName as \"tousseName\"," +
+		String sql = "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",ip.urgentAmount,po.sendOutAmount," +
 					 "po.amount as \"amount\",ip.depart as \"depart\"," + dressing2 + 
 					 "ip.departCoding as \"departCoding\",ip.applicationTime as \"applicationTime\"," + 
 					 "ip.submitTime as \"submitTime\",ip.printTime as \"printTime\"," +
Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp
===================================================================
diff -u -r12331 -r15785
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp	(.../supplyRoomOperate.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp	(.../supplyRoomOperate.jsp)	(revision 15785)
@@ -11,7 +11,8 @@
 document.write('<script type="text/javascript" src="${ctx}/ext/js/json3.min.js"/>');
 
 </script>
-<script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/js/common.js" ></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java
===================================================================
diff -u -r14428 -r15785
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java	(.../TousseOperate.java)	(revision 14428)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java	(.../TousseOperate.java)	(revision 15785)
@@ -38,7 +38,33 @@
 	private Integer frequency; // 炉号
 
 	private BigDecimal ROWNUM_;//oracle无法分页问题
-	
+
+	/**
+	 * 加急数量
+	 */
+	private Integer urgentAmount;
+
+	/**
+	 * 发货数量
+	 */
+	private Integer sendOutAmount;
+
+	public Integer getSendOutAmount() {
+		return sendOutAmount;
+	}
+
+	public void setSendOutAmount(Integer sendOutAmount) {
+		this.sendOutAmount = sendOutAmount;
+	}
+
+	public Integer getUrgentAmount() {
+		return urgentAmount;
+	}
+
+	public void setUrgentAmount(Integer urgentAmount) {
+		this.urgentAmount = urgentAmount;
+	}
+
 	public BigDecimal getROWNUM_() {
 		return ROWNUM_;
 	}
Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r14428 -r15785
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 14428)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 15785)
@@ -35,6 +35,8 @@
 		   {name: 'disinfectIdentification'},
 		   {name: 'disinfectProgram'},
 		   {name: 'basketName'},
+	       {name: 'urgentAmount'},
+	       {name: 'sendOutAmount'},
 		   {name: 'frequency'}
 		   
 		   
@@ -366,6 +368,8 @@
 	    	 {header : "申请数量",width : 60,dataIndex : 'amount'}, 
 	    	 {header : "回收数量",width : 60,dataIndex : 'recyclingAmount'}, 
 	    	 {header : "回收清洗筐",width : 240,dataIndex : 'basketName'},
+			 {header : "加急数量",width : 110,dataIndex : 'urgentAmount',hidden:!sstsConfig.isHideUrgentAmount},
+			 {header : "发货数量",width : 110,dataIndex : 'sendOutAmount'},
 		     {header : "科室",width : 110,dataIndex : 'depart'},
 		     {header : "回收时间",width : 110,dataIndex : 'recyclingTime'},
 	    	 {header : "申请时间",width : 110,dataIndex : 'applicationTime'},