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

controllers/zh/zh_his_api_controller.go

@@ -28,6 +28,18 @@ import (
 type ZHHisApiController struct {
 	controllers.BaseAuthAPIController
 }
+type ResultSix struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 
 type ResultTwo struct {
 	ErrMsg      string `json:"err_msg"`
@@ -508,21 +520,21 @@ func (c *ZHHisApiController) ClearSettle() {
 
 		userJSONBytes, _ := json.Marshal(dat)
 
-		var res ResultSixteen
-		var resSixteen ResultSixteen10265
+		var res ResultSix
+		//var resSixteen ResultSixteen10265
 		if miConfig.Code == "H15049901371" {
-			if err := json.Unmarshal(userJSONBytes, &resSixteen); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			res.Cainfo = resSixteen.Cainfo
-			res.WarnMsg = resSixteen.WarnMsg
-			res.Output = resSixteen.Output
-			res.ErrMsg = resSixteen.ErrMsg
-			res.RespondTime = resSixteen.RespondTime
-			Infcode, _ := strconv.ParseInt(resSixteen.Infcode, 10, 64)
-			res.Infcode = Infcode
+			//if err := json.Unmarshal(userJSONBytes, &resSixteen); err != nil {
+			//	utils.ErrorLog("解析失败：%v", err)
+			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//	return
+			//}
+			//res.Cainfo = resSixteen.Cainfo
+			//res.WarnMsg = resSixteen.WarnMsg
+			//res.Output = resSixteen.Output
+			//res.ErrMsg = resSixteen.ErrMsg
+			//res.RespondTime = resSixteen.RespondTime
+			//Infcode, _ := strconv.ParseInt(resSixteen.Infcode, 10, 64)
+			//res.Infcode = Infcode
 
 		} else {