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

controllers/sg/his_api_controller.go

@@ -72,6 +72,8 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/reversal", &HisApiController{}, "get:ReversalData")
 	beego.Router("/api/reversal/other", &HisApiController{}, "get:ReversalOtherData")
 
+	//beego.Router("/api/reversal/one", &HisApiController{}, "get:ReversalOtherOneData")
+
 }
 
 func (c *HisApiController) TestGetBasBaseInfo() {
@@ -3016,13 +3018,16 @@ func (c *HisApiController) GetCheckAccount() {
 				}
 			} else {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"code": -10,
-					"msg":  res.ErrMsg,
+					"stmt_rslt":      res.Output.Stmtinfo.StmtRslt,
+					"stmt_rslt_dscr": res.Output.Stmtinfo.StmtRsltDscr,
 				})
-
 			}
 		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"code": -10,
+				"msg":  res.ErrMsg,
+			})
+
 		}
 	}
 }