Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r30185 -r30270
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 30185)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 30270)
@@ -6,6 +6,7 @@
 var waitSterileLoadingTousseStore;//待灭菌装载的器械包
 var waitSterileLoadingTousseGrid;//待灭菌装载的器械包
 var reviewedBasketId;
+var pageSize = 100;
 var firstSterilingTypeOfTousseInBasket;//灭菌篮筐内的第一个器械包的灭菌程序
 //是否在待灭菌装载器械包列表中，显示“科室”列和搜索框
 var showDepartOfTousseInstanceSterile = sstsConfig.showDepartOfTousseInstanceSterile?true:false;
@@ -871,7 +872,7 @@
 		params : {
 			searchKeyWordReal : searchKeyWordReal,
 			start : 0,
-			limit : 100
+			limit : pageSize
 		}
 	});
 }
@@ -1337,12 +1338,31 @@
 	    ],
 	    sm : new Ext.grid.RowSelectionModel({singleSelect:true})
 	});
+
+	//GDSZYY-61:兼容中文排序
+	Ext.data.Store.prototype.applySort = function() {
+		if (this.sortInfo && !this.remoteSort) {
+		 	var s = this.sortInfo, f = s.field;
+		 	var st = this.fields.get(f).sortType;
+		 	var fn = function(r1, r2) {
+				var v1 = st(r1.data[f]), v2 = st(r2.data[f]);
+				if (typeof(v1) == "string") {
+					return v1.localeCompare(v2);
+				}
+				return v1 > v2 ? 1 : (v1 < v2 ? -1 : 0);
+			};
+			this.data.sort(s.direction, fn);
+			if(this.snapshot && this.snapshot != this.data) {
+				this.snapshot.sort(s.direction, fn);
+			}
+		}
+	}
 	
 	//待灭菌装载数据源
 	waitSterileLoadingTousseStore = new Ext.data.Store({
 		autoLoad : false,
     	url : WWWROOT + '/disinfectSystem/tousseInstanceAction!getWaitSterileLoadingTousseInstance.do',
-    	pageSize:100,
+		pageSize:pageSize,
 		reader: new Ext.data.JsonReader({
 			type:'json',
 			root:'root',
@@ -1420,7 +1440,7 @@
 	var pageBar = new Ext.PagingToolbar({
         store: waitSterileLoadingTousseStore,
         displayInfo: true,
-        pageSize:100,
+        pageSize:pageSize,
         displayMsg: '{0}-{1}/{2}',
         emptyMsg: "没有数据"
     });
@@ -1452,7 +1472,7 @@
 			valueField : 'departmentCode',
 			displayField : 'departmentName',
 			width : 80,
-            pageSize : 100,
+            pageSize : pageSize,
             listConfig: {width: 300},
 			forceSelection : true,
 			lazyInit : true,
@@ -1473,7 +1493,7 @@
 	                }
 	            },
             store : new Ext.data.Store({
-                pageSize: 100,
+                pageSize: pageSize,
 	       		proxy : new Ext.data.HttpProxy({
 	       			url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do',
 	       		 	method : 'POST'
@@ -1580,20 +1600,20 @@
 					Ext.getCmp('searchKeyWordReal').setValue('');
 					Ext.getCmp('field').setValue('');
 					Ext.getCmp('direction').setValue('');
-    				waitSterileLoadingTousseStore.load({params:{start:0, limit:100}});
+    				waitSterileLoadingTousseStore.load({params:{start:0, limit:pageSize}});
     			};
 			},
 			sortchange:function(ct, column, direction, eOpts){
 				var field = column.field;
 				var direction = column.direction;
 				Ext.getCmp('field').setValue(field);
 				Ext.getCmp('direction').setValue(direction);
-				waitSterileLoadingTousseStore.load({params:{start:0, limit:100}});
+				waitSterileLoadingTousseStore.load({params:{start:0, limit:pageSize}});
 			}
     	}
 	});
 	//初始加载
-	waitSterileLoadingTousseStore.load({params:{start:0, limit:100}});
+	waitSterileLoadingTousseStore.load({params:{start:0, limit:pageSize}});
 	
 	var tableContent;
 	waitSterileLoadingTousseGrid.on('mouseover', function(e) {// 添加mouseover事件
@@ -1636,7 +1656,7 @@
 			valueField : 'departmentCode',
 			displayField : 'departmentName',
 			width : 100,
-            pageSize : 100,
+            pageSize : pageSize,
             listConfig: {width: 300},
 			forceSelection : true,
 			lazyInit : true,
@@ -1656,7 +1676,7 @@
 				}
 			}, 
             store : new Ext.data.Store({
-                pageSize: 100,
+                pageSize: pageSize,
 	       		proxy : new Ext.data.HttpProxy({
 	       			url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do',
 	       		 	method : 'POST'