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

controllers/sg/his_api_controller.go

@@ -85,10 +85,6 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/readelecard", &HisApiController{}, "get:ReadEleCard")
 
-
-
-
-
 }
 
 func (c *HisApiController) Get9001() {
@@ -12105,7 +12101,7 @@ func (c *HisApiController) ReadEleCard() {
 		var token string
 		var res ResultTwo           //1101结果
 		var res10265 ResultTwo10265 //1101结果
-		if status == "0" { //读卡成功
+		if status == "0" {          //读卡成功
 			var card_info string //卡信息
 			var busi_card_info string
 			token = respJSON["data"].(map[string]interface{})["token"].(string)
@@ -12129,18 +12125,16 @@ func (c *HisApiController) ReadEleCard() {
 			res.Output = res10265.Output
 			res.InfRefmsgid = res10265.InfRefmsgid
 			if res.Infcode == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"number":  token,
-					})
-				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
+				c.ServeSuccessJSON(map[string]interface{}{
+					"number": token,
+				})
 			}
-		} else { //读卡失败
+		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 			return
 		}
+	} else { //读卡失败
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		return
 	}
-
 }