Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
===================================================================
diff -u -r15487 -r15490
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java	(.../OperationReservationAction.java)	(revision 15487)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java	(.../OperationReservationAction.java)	(revision 15490)
@@ -141,7 +141,7 @@
 			obj.put("applicant", po.getApplicant());
 			obj.put("operationName", po.getOperationName());
 			obj.put("operatingRoom", po.getOperatingRoom());
-			obj.put("operatingRoomCode", po.getOperatingRoomCode());
+//			obj.put("operatingRoomCode", po.getOperatingRoomCode());
 			obj.put("doctors", po.getDoctors());
 			String operationTime = "";
 			if(po.getOperationTime() != null){
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r15410 -r15490
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 15410)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 15490)
@@ -33,7 +33,7 @@
 ]);
 
 function editOperationReservation(id) {
-
+	var useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true);
 	var handleDepartStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',
@@ -286,6 +286,20 @@
 				layout : 'form',
 				labelWidth : 65,
 				items : [{
+					xtype : 'textfield',
+					fieldLabel : '手术间',
+					id : 'operatingRoom',
+					name : 'operatingRoom',
+					maxLength:10,
+					maxLengthText :'长度超过限制，不能保存！',
+					allowBlank : useRecordOperationRoomAllowBlank,
+					anchor : '96%'
+				}]
+			},{
+				columnWidth : .33,
+				layout : 'form',
+				labelWidth : 65,
+				items : [{
 					xtype : 'datefieldWithMin',
 					fieldLabel : '手术时间',
 					id : 'operationTime',
@@ -493,8 +507,7 @@
 				var params = {
 					id : id,
 					operationName : top.Ext.getCmp("operationName").getValue(),
-					operatingRoom : top.Ext.getCmp("depart").getValue(),
-					operatingRoomCode : top.Ext.getCmp("departCoding").getValue(),
+					operatingRoom : top.Ext.getCmp("operatingRoom").getValue(),
 					doctors : top.Ext.getCmp("doctors").getValue(),
 					operationTime : top.Ext.getCmp("operationTime").getRawValue(),
 					depart : top.Ext.getCmp("depart").getValue(),
@@ -559,6 +572,7 @@
 						top.Ext.getCmp("depart").setValue(data.depart);
 						top.Ext.getCmp("departCoding").setValue(data.departCoding);
 						top.Ext.getCmp("doctors").setValue(data.doctors);
+						top.Ext.getCmp("operatingRoom").setValue(data.operatingRoom);
 						top.Ext.getCmp("operationTime").setValue(data.operationTime);
 						top.Ext.getCmp("handleDepart").setValue(data.handleDepart);
 						top.Ext.getCmp("handleDepartCoding").setValue(data.handleDepartCoding);
@@ -644,6 +658,7 @@
   	     {header : "申请人",width : 60,dataIndex : 'applicant'},
   	     {header : "申请时间",width : 120,dataIndex : 'applicationTime', renderer : myDateFormatByMinute}, 
   	     {header : "医生",width : 120,dataIndex : 'doctors'},
+  	     {header : "手术间",width : 120,dataIndex : 'operatingRoom'},
   	     {header : "手术时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute},
   	     {header : "发货状态",width : 65,dataIndex : 'deliverStatus', renderer : renderColor},
          {id:'remark',header: "备注", dataIndex: 'remark'}
@@ -657,6 +672,7 @@
 	    {name : 'applicant'},
 	    {name : 'applicationTime'}, 
 	    {name : 'doctors'},
+	    {name : 'operatingRoom'},
 	    {name : 'deliverStatus'},
 	    {name : 'remark'}
 	];
@@ -667,6 +683,7 @@
 	        {type: 'string',  dataIndex: 'depart'},
 	        {type: 'string',  dataIndex: 'applicant'},
 	        {type: 'string',  dataIndex: 'doctors'},
+	        {type: 'string',  dataIndex: 'operatingRoom'},
 	        {type: 'string',  dataIndex: 'deliverStatus'},
 	        {type: 'string',  dataIndex: 'remark'}
 	    ]}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
===================================================================
diff -u -r15487 -r15490
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 15487)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java	(.../OperationReservationManagerImpl.java)	(revision 15490)
@@ -71,10 +71,10 @@
 				throw new RuntimeException("手术名称不能为空！");
 			}
 			String operatingRoom = data.optString("operatingRoom");
-			String operatingRoomCode = data.optString("operatingRoomCode");
-			if(StringUtils.isBlank(operatingRoom) || StringUtils.isBlank(operatingRoomCode)){
-				throw new RuntimeException("手术室不能为空！");
-			}
+//			String operatingRoomCode = data.optString("operatingRoomCode");
+//			if(StringUtils.isBlank(operatingRoom) /*|| StringUtils.isBlank(operatingRoomCode)*/){
+//				throw new RuntimeException("手术间不能为空！");
+//			}
 			String doctors = data.optString("doctors");
 			String operationTimeString = data.optString("operationTime");
 			String depart = data.optString("depart");
@@ -112,7 +112,7 @@
 			}
 			operationReservation.setOperationName(operationName);
 			operationReservation.setOperatingRoom(operatingRoom);
-			operationReservation.setOperatingRoomCode(operatingRoomCode);
+//			operationReservation.setOperatingRoomCode(operatingRoomCode);
 			operationReservation.setDoctors(doctors);
 			if (StringUtils.isNotBlank(operationTimeString)) {
 				try {
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp
===================================================================
diff -u -r15410 -r15490
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp	(.../operationReservationView.jsp)	(revision 15410)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp	(.../operationReservationView.jsp)	(revision 15490)
@@ -19,6 +19,7 @@
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/js/mapObject.js" /></script>
 <script type="text/javascript" src="${ctx}/js/dateFormatAndCheck.js" /></script>
+<script type="text/javascript" src="${ctx}/js/configUtils.js"></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx}/ext/example/examples.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>