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

controllers/sg/his_api_controller.go

@@ -218,25 +218,39 @@ func (c *HisApiController) ReadCard() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	certificates, _ := c.GetInt64("certificates")
-
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
 	switch id_card_type {
 	case 1:
 		if miConfig.MdtrtareaAdmvs == "421300" {
-			result, request_log := service.Gdyb1101C("", miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates)
-			fmt.Println(request_log)
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
+			var res ResultTwo
+			api := "http://127.0.0.1:9533/" + "hbyb/1101?cert_no=" + "" +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10)
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
 			}
 
-			userJSONBytes, _ := json.Marshal(dat)
-			var res ResultTwo
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return