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

controllers/sg/his_api_controller.go

@@ -5359,12 +5359,20 @@ func (c *HisApiController) GetPreUploadInfo() {
 		userJSONBytes, _ := json.Marshal(respJSON)
 		fmt.Println("log")
 		fmt.Println(string(userJSONBytes))
-		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+		if err := json.Unmarshal(userJSONBytes, &resSix10265); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
 
+		res2.InfRefmsgid = resSix10265.InfRefmsgid
+		res2.Output = resSix10265.Output
+		res2.ErrMsg = resSix10265.ErrMsg
+		res2.Cainfo = resSix10265.Cainfo
+		res2.WarnMsg = resSix10265.WarnMsg
+		infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+		res2.Infcode = infocode
+
 	} else {
 		var result string
 		var requestLog string