Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js
===================================================================
diff -u -r15657 -r15667
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js	(.../sterilizationRecordPic.js)	(revision 15657)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js	(.../sterilizationRecordPic.js)	(revision 15667)
@@ -101,6 +101,15 @@
 		    var height = el.getHeight();  
 		    var nwidth = height;
 		    var nheight = width;
+		    if(curRotateIndex == 0 || curRotateIndex == 2){
+		    	// 如果原图高比宽大，那么转后的高也要比宽大
+		    	if( ((srcHeight > srcWidth) && (nheight < nwidth))
+		    		|| ((srcHeight < srcWidth) && (nheight > nwidth)) ){
+		    		var temp = nheight;
+		    		nheight = nwidth;
+		    		nwidth = temp;
+		    	}
+		    }
 		    var left = (width > nwidth) ? -((nwidth - width) / 2):((width - nwidth) / 2);  
 		    var top =  (height > nheight) ? -((nheight - height) / 2):((height - nheight) / 2);
 		    try{
@@ -318,13 +327,12 @@
 //        			alert(document.getElementById(currentImageId).src);
 //        			document.getElementById(currentImageId).className = className;alert(className);
         			curRotateIndex = (curRotateIndex + 1) % 4;
-        			var url = WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizationRecordPic.do?id=' + id + '&page=' + page + '&rotateIndex=' + curRotateIndex + '&time='+new Date();
         			var imageBrowse = Ext.get(currentImageId);
-        			var image = imageBrowse.dom;
-        			image.src = url;// 覆盖原来的图片 
         			// 切换宽高
         			Ext.get(currentImageId).parent.switchHeightWidth(imageBrowse);
-        			
+        			var url = WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizationRecordPic.do?id=' + id + '&page=' + page + '&rotateIndex=' + curRotateIndex + '&time='+new Date();
+        			var image = imageBrowse.dom;
+        			image.src = url;// 覆盖原来的图片 
         		}
 			},{
 				xtype : 'button',
@@ -335,12 +343,13 @@
 		    			curRotateIndex = 4;
 		    		}
 		    		curRotateIndex = (curRotateIndex - 1) % 4;
+		    		var imageBrowse = Ext.get(currentImageId);
+		    		// 切换宽高
+        			Ext.get(currentImageId).parent.switchHeightWidth(imageBrowse);
 		    		var url = WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizationRecordPic.do?id=' + id + '&page=' + page + '&rotateIndex=' + curRotateIndex + '&time='+new Date();
-        			var imageBrowse = Ext.get(currentImageId);
         			var image = imageBrowse.dom;
         			image.src = url;// 覆盖原来的图片 
-        			// 切换宽高
-        			Ext.get(currentImageId).parent.switchHeightWidth(imageBrowse);
+        			
         		}
 			},{
 				xtype : 'button',