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

controllers/sg/his_api_controller.go

 				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 				result, _ := json.Marshal(respJSON)
 
-				if err := json.Unmarshal([]byte(result), &res); err != nil {
+				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 			} else {
 				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type)
 				saveLog(result, requestLog, "2201", "挂号")
-				if err := json.Unmarshal([]byte(result), &res); err != nil {
+				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return