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

controllers/sg/his_api_controller.go

@@ -7502,7 +7502,7 @@ func (c *HisApiController) GetPatientInfo() {
 		var res10265 ResultTwo10265
 
 		if miConfig.Code == "H15049901371" {
-			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
@@ -7513,7 +7513,7 @@ func (c *HisApiController) GetPatientInfo() {
 			res.InfRefmsgid = res10265.InfRefmsgid
 
 		} else {
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return