Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.js
===================================================================
diff -u -r18344 -r18347
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.js	(.../operationReservationMergeInvoiceView.js)	(revision 18344)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.js	(.../operationReservationMergeInvoiceView.js)	(revision 18347)
@@ -291,6 +291,7 @@
 			  	    {name : 'depart'},
 			  	    {name : 'operatingRoom'},
 			  	    {name : 'operationDate'},
+			  	    {name : 'remark'},
 			  	    {name : 'operationReservationIds'},
                     {name : 'urgency'}
 			  	]
@@ -306,8 +307,7 @@
 	    sm : selectModel,
 	    cm : new top.Ext.grid.ColumnModel([selectModel,
 	         {id:'depart',header : "科室",width : 50,dataIndex : 'depart',menuDisabled:true,renderer : renderCallModifyFunction},
-	         {header : "手术间",width : 50,dataIndex : 'operatingRoom',menuDisabled:true},
-	      	 {id:'operationDate',header : "手术日期",width : 130,dataIndex : 'operationDate',menuDisabled:true}
+	         {header : "备注",width : 50,dataIndex : 'remark',menuDisabled:true}
 	    ]),
 	    autoExpandColumn : 'depart',
 	    frame : false,
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationSummary.java
===================================================================
diff -u -r18191 -r18347
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationSummary.java	(.../OperationReservationSummary.java)	(revision 18191)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationSummary.java	(.../OperationReservationSummary.java)	(revision 18347)
@@ -26,6 +26,8 @@
 	 */
 	private List<Long> operationReservationIds;
 	
+	private String remark;
+	
 	public String getDepartCoding() {
 		return departCoding;
 	}
@@ -56,6 +58,14 @@
 	public void setOperationReservationIds(List<Long> operationReservationIds) {
 		this.operationReservationIds = operationReservationIds;
 	}
+	
+	public String getRemark() {
+		int amount = 0;
+		if(operationReservationIds != null){
+			amount = operationReservationIds.size();
+		}
+		return String.format("%s张手术预约申请单", amount);
+	}
 	/**
 	 * 添加手术预约单的id
 	 * @param orId
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
===================================================================
diff -u -r18343 -r18347
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java	(.../OperationReservationAction.java)	(revision 18343)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java	(.../OperationReservationAction.java)	(revision 18347)
@@ -227,7 +227,7 @@
 		String operationRoom = StrutsParamUtils.getPraramValue("operationRoom", "");
 		String applyDate = StrutsParamUtils.getPraramValue("applyDate", "");
 		
-		JSONObject json = operationReservationManager.getWaitingForDeliveryOperationReservations(departCode,operationRoom,applyDate);
+		JSONObject json = operationReservationManager.getWaitingForDeliveryOperationReservationsForPC(departCode,operationRoom,applyDate);
 //		json.put("applyDateList", getOperationDateList());
 		JSONArray operationReservations = json.getJSONArray("operationReservations"); 
 		StrutsResponseUtils.output(operationReservations);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
===================================================================
diff -u -r18191 -r18347
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java	(.../OperationReservationManager.java)	(revision 18191)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java	(.../OperationReservationManager.java)	(revision 18347)
@@ -25,6 +25,7 @@
 	 * @return
 	 */
 	public JSONObject getWaitingForDeliveryOperationReservations(String departCode, String operationRoom, String applyDate);
+	public JSONObject getWaitingForDeliveryOperationReservationsForPC(String departCode, String operationRoom, String applyDate);
 	/**
 	 * 将手术预约单转换为json格式。其中申请项不转换
 	 * @param operationReservation 手术预约单,如果为null。返回值为null
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
===================================================================
diff -u -r18238 -r18347
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 18238)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 18347)
@@ -264,8 +264,31 @@
 		return find;
 	}
 	
+	private OperationReservationSummary find2(List<OperationReservationSummary> items,OperationReservation operationReservation){
+		OperationReservationSummary find = null;
+		if(CollectionUtils.isNotEmpty(items) && operationReservation != null){
+			for(OperationReservationSummary or : items ){
+				if(or != null){
+					if(StringTools.equals(operationReservation.getDepartCoding(), or.getDepartCoding())){
+						return or;
+					}
+				}
+			}
+		}
+		return find;
+	}
+	
 	@Override
 	public JSONObject getWaitingForDeliveryOperationReservations(String departCode, String operationRoom, String applyDate) {
+		return getWaitingForDeliveryOperationReservations(departCode, operationRoom, applyDate, false);
+	}
+	
+	@Override
+	public JSONObject getWaitingForDeliveryOperationReservationsForPC(String departCode, String operationRoom, String applyDate) {
+		return getWaitingForDeliveryOperationReservations(departCode, operationRoom, applyDate, true);
+	}
+	
+	private JSONObject getWaitingForDeliveryOperationReservations(String departCode, String operationRoom, String applyDate,boolean forPC) {
 		String departPredicate = " 1= 1";
 		if(StringTools.isNotBlank(departCode)){
 			departPredicate = " po.departCoding='" + departCode + "' ";
@@ -293,7 +316,12 @@
 		if(CollectionUtils.isNotEmpty(ors)){
 			for(OperationReservation or : ors){
 				if(or != null){
-					OperationReservationSummary find = find(operationReservationArray,or);
+					OperationReservationSummary find = null;
+					if(forPC){
+						find = find2(operationReservationArray,or);
+					}else{
+						find = find(operationReservationArray,or);
+					}
 					if(find == null){
 						find = new OperationReservationSummary();
 						find.setDepart(or.getDepart());