Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -2887,7 +2887,7 @@ func (c *HisApiController) GetUploadInfo() {
 			var result2 string
 			var acct_used_flag string
 
-			if pay_way == 5 {
+			if pay_way == 4 {
 				acct_used_flag = "1"
 			} else {
 				acct_used_flag = "0"