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

controllers/sg/his_api_controller.go

@@ -1127,16 +1127,16 @@ func (c *HisApiController) GetRegisterInfo() {
 						service.CreateErrMsgLog(errlog)
 						c.ServeSuccessJSON(map[string]interface{}{
 							"failed_code": -10,
-							"msg":         res.ErrMsg,
+							"msg":         res2.ErrMsg,
 						})
 						return
-						//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
-						//return
-					}
 
-					c.ServeSuccessJSON(map[string]interface{}{
-						"his_info": his,
-					})
+					} else {
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"his_info": his,
+						})
+					}
 
 				} else {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)