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

controllers/sg/his_api_controller.go

@@ -5513,6 +5513,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["url"] = miConfig.Url
 		data["ak"] = miConfig.ChannelNumber
 		data["new_doctor_name"] = patientPrescription.Doctor
+		data["diag_code"] = sickConfig.CountryCode
 
 		var ids []int64
 
@@ -5574,12 +5575,20 @@ func (c *HisApiController) GetPreUploadInfo() {
 				userJSONBytes, _ := json.Marshal(respJSON)
 				fmt.Println("log")
 				fmt.Println(string(userJSONBytes))
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
 
+				res.InfRefmsgid = resFour10265.InfRefmsgid
+				res.Output = resFour10265.Output
+				res.ErrMsg = resFour10265.ErrMsg
+				res.Cainfo = resFour10265.Cainfo
+				res.WarnMsg = resFour10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+				res.Infcode = infocode
+
 			} else {
 
 				if miConfig.Code == "H15049901371" {