Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r17847 -r17965
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 17847)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 17965)
@@ -860,6 +860,7 @@
 	
 	var columns = [
   	     //{header : "流水号",width : 80,dataIndex : 'serialNumber', renderer : modifyRecord}, 
+  	     {header : "手术台次",width : 120,dataIndex : 'consoleName'},
   	     {header : "手术名称",width : 180,dataIndex : 'operationName', renderer : modifyRecord},
   	    /* {header : "申请科室",width : 120,dataIndex : 'depart'},
   	     {header : "申请人",width : 60,dataIndex : 'applicant'},
@@ -872,7 +873,6 @@
   	     {header : "病区",width : 100,dataIndex : 'deptName'},
   	     {header : "手术时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute},
   	     //{header : "手术编号",width : 120,dataIndex : 'scheduleId'},
-  	     {header : "手术台次",width : 120,dataIndex : 'consoleName'},
   	     {header : "发货状态",width : 65,dataIndex : 'deliverStatus', renderer : renderColor},
          {id:'remark',header: "备注", dataIndex: 'remark'}
   	];
@@ -955,7 +955,7 @@
 		pageSize : 20,
 		defaultSortField : 'consoleName',
 		title : entityName + '列表',
-		defaultSortDirection : 'DESC',
+		defaultSortDirection : 'ASC',
 		isCheckboxSelectionModel : true,
 		rememberSelected : false,
 		isShowSearchField : true,
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java
===================================================================
diff -u -r15436 -r17965
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java	(.../OperationReservationTableManager.java)	(revision 15436)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java	(.../OperationReservationTableManager.java)	(revision 17965)
@@ -3,8 +3,10 @@
 import java.util.List;
 import java.util.Map;
 
+import com.forgon.Constants;
 import com.forgon.component.grid.GridManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.disinfectsystem.entity.basedatamanager.operationRoom.OperationRoom;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
 import com.forgon.disinfectsystem.operationreservation.service.OperationReservationManager;
@@ -36,9 +38,12 @@
 		
 		String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
 		
+		//只显示未提交及手术间为要发货的手术间
+		String sql = " where committedStatus=false and operatingRoom in (select operationRoomName from "+ OperationRoom.class.getSimpleName() +" where isInvoice='"+ Constants.STR_YES +"')";
+		
 		return gridManager
 				.renderGrid(parameterMap,
-						OperationReservation.class.getSimpleName(), "",
+						OperationReservation.class.getSimpleName(), sql,
 						new String[] { "invoice","applicationItems" });
 	}
 
@@ -47,6 +52,7 @@
 		
 		StringBuilder sqlBuilder = new StringBuilder();
 		String sql = String.format("where po.deliverStatus in('%s','%s')", InvoicePlan.DELIVERSTATUS_AWAITDELIVER,InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
+		sql += " and committedStatus=true and operatingRoom in (select operationRoomName from "+ OperationRoom.class.getSimpleName() +" where isInvoice='"+ Constants.STR_YES +"')";
 		String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
 		
 		return gridManager