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

controllers/sg/his_api_controller.go

@@ -1693,7 +1693,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-			if res.Infcode == -1 {
+			if res.Infcode != 0 {
 				adminUser := c.GetAdminUserInfo()
 				errlog := &models.HisOrderError{
 					UserOrgId:  adminUser.CurrentOrgId,
@@ -1761,7 +1761,7 @@ func (c *HisApiController) GetRegisterInfo() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				if res2.Infcode == -1 {
+				if res2.Infcode != 0 {
 					adminUser := c.GetAdminUserInfo()
 					errlog := &models.HisOrderError{
 						UserOrgId:  adminUser.CurrentOrgId,
@@ -2173,7 +2173,7 @@ func (c *HisApiController) GetUploadInfo() {
 					return
 				}
 
-				if res.Infcode == -1 {
+				if res.Infcode != 0 {
 					errlog := &models.HisOrderError{
 						UserOrgId:  adminUser.CurrentOrgId,
 						Ctime:      time.Now().Unix(),
@@ -2716,7 +2716,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				if res.Infcode == -1 {
+				if res.Infcode != 0 {
 					errlog := &models.HisOrderError{
 						UserOrgId:  adminUser.CurrentOrgId,
 						Ctime:      time.Now().Unix(),
@@ -4323,7 +4323,7 @@ func (c *HisApiController) GetUploadDiag() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	if res2.Infcode == -1 {
+	if res2.Infcode != 0 {
 		adminUser := c.GetAdminUserInfo()
 		errlog := &models.HisOrderError{
 			UserOrgId:  adminUser.CurrentOrgId,
@@ -4615,7 +4615,7 @@ func (c *HisApiController) GetPatientInfo() {
 			return
 		}
 
-		if res.Infcode == -1 {
+		if res.Infcode != 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": -10,
 				"msg":         res.ErrMsg,

controllers/zh/zh_his_api_controller.go

@@ -727,7 +727,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		return
 	}
 
-	if res.Infcode == -1 {
+	if res.Infcode != 0 {
 		errlog := &models.HisOrderError{
 			UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
 			Ctime:      time.Now().Unix(),