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

controllers/sg/his_api_controller.go

@@ -7499,12 +7499,33 @@ func (c *HisApiController) GetPatientInfo() {
 
 		userJSONBytes, _ := json.Marshal(dat)
 		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		var res10265 ResultTwo10265
+
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res.Infcode = infocode
+			res.InfRefmsgid = res10265.InfRefmsgid
+
+		} else {
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		}
 
+		//if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+
 		if res.Infcode != 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": -10,