Index: ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js
===================================================================
diff -u -r29937 -r37126
--- ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js	(.../synOperationReservationForm.js)	(revision 29937)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js	(.../synOperationReservationForm.js)	(revision 37126)
@@ -59,6 +59,7 @@
        {name : 'patientAge'},
        {name : 'operationName'},
        {name : 'applicationTime'},
+	   {name : 'operationType'},
        {name : 'doctors'},
        {name : 'operatingRoom'},
        {name : 'hospitalNumber'},
@@ -89,20 +90,27 @@
     
     var sycGridPanelColumns = new top.Ext.grid.ColumnModel([
          sm,
-         {header : "申请单号",width : 100,dataIndex : 'serialNumber'},
-         {header : "手术名称",width : 150,dataIndex : 'operationName'},
-         {header : "手术台次",width : 70,dataIndex : 'consoleName'},
-  	     {header : "医生",width : 70,dataIndex : 'doctors'},
-  	     {header : "手术间",width : 70,dataIndex : 'operatingRoom'},
-  	     {header : "住院号",width : 70,dataIndex : 'hospitalNumber'},
-  	     {header : "病人姓名",width : 70,dataIndex : 'patientName'},
-  	     {header : "病人年龄",width : 70,dataIndex : 'patientAge'},
-  	     {header : "病人性别",width : 70,dataIndex : 'patientSex'},
-  	     {header : "病区",width : 70,dataIndex : 'deptName'},
-  	     {header : "手术时间",width : 120,dataIndex : 'operationTime', renderer : function myDateFormatByMinute(v, p, record){
+         {header : "申请单号",width : 65,dataIndex : 'serialNumber'},
+		 {header : "手术类型",width : 80,dataIndex : 'operationType',hidden:(profile !== 'szsdsrmyy'), renderer : function myDateFormatByMinute(v, p, record){
+			if(v == '加急'){
+				return '<div style="background: red;color:#fff">'+v+'</div>';
+			}else {
+				return v;
+			}
+		}},
+         {id:'operationName',header : "手术名称",width : 65,dataIndex : 'operationName'},
+         {header : "手术台次",width : 65,dataIndex : 'consoleName'},
+  	     {header : "医生",width : 65,dataIndex : 'doctors'},
+  	     {header : "手术间",width : 65,dataIndex : 'operatingRoom'},
+  	     {header : "住院号",width : 65,dataIndex : 'hospitalNumber'},
+  	     {header : "病人姓名",width : 65,dataIndex : 'patientName'},
+  	     {header : "病人年龄",width : 65,dataIndex : 'patientAge'},
+  	     {header : "病人性别",width : 65,dataIndex : 'patientSex'},
+  	     {header : "病区",width : 65,dataIndex : 'deptName'},
+  	     {header : "手术时间",width : 110,dataIndex : 'operationTime', renderer : function myDateFormatByMinute(v, p, record){
   	    	return timestampToTime(v.time);
-  	}},
-  	     {id:'scheduleId',width : 70 ,header : "手术编号",dataIndex : 'scheduleId'},
+		}},
+  	     {id:'scheduleId',width : 75 ,header : "手术编号",dataIndex : 'scheduleId'},
   		 {header : "洗手护士",width : 70,dataIndex : 'washHandNurse'},
 	     {header : "巡回护士",width : 70,dataIndex : 'circuitNurse'}
     ]);
@@ -117,14 +125,14 @@
     });
     
     sycGridPanel = new top.Ext.grid.GridPanel({
-		anchor:'80% 80%',
+    	anchor:'80% 80%',
 		autoScroll:true,
 		id : 'sycGridPanel',
 		store : sycGridPanelStore,
 		cm : sycGridPanelColumns,
 		loadMask : true,
 		sm : sm,
-		autoExpandColumn: 'scheduleId',
+		autoExpandColumn: 'operationName',
 		tbar : tbar,
 		bodyStyle: "overflow:auto;",
 		bbar:sycGridPanelPageBbar
@@ -136,7 +144,7 @@
 		title : '同步手术预约单',
 		modal : true,
 		border:true ,
-		width : 950,
+		width : 1100,
 		height : 660,
 		plain : true,
 		items : [ sycGridPanel ]
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp
===================================================================
diff -u -r36704 -r37126
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp	(.../operationReservationView.jsp)	(revision 36704)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp	(.../operationReservationView.jsp)	(revision 37126)
@@ -55,6 +55,7 @@
 <script type="text/javascript">
 var curUserName = '${userName}';
 var hideButton = '<%=hideButton%>';
+var profile = '${profile}';
 
 var SSTS_OR_Create = true;
 <operation:authorize ifAnyGranted="SSTS_OR_Create">