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

controllers/zh/zh_his_api_controller.go

@@ -2534,36 +2534,36 @@ func (c *ZHHisApiController) ReadCard() {
 
 		break
 	case 3:
-		_, pBusiCardInfo := c.GetELeInfo(miConfig.Code, strconv.FormatInt(roles.ID, 64), roles.UserName)
-
-		var ele ELeData
-		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		if err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-		}
-		token := ele.Data.EcToken
-		if len(token) > 0 {
-			result, _ := service.Gdyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IdNo)
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
-			}
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status": "0",
-				//"card_info":      pCardInfo,
-				"busi_card_info": pBusiCardInfo,
-				"token":          token,
-				"result":         dat,
-				"type":           "2",
-			})
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status": "-1",
-			})
-
-		}
+		//_, pBusiCardInfo := c.GetELeInfo(miConfig.Code, strconv.FormatInt(roles.ID, 64), roles.UserName)
+		//
+		//var ele ELeData
+		//err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		//if err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//}
+		//token := ele.Data.EcToken
+		////if len(token) > 0 {
+		////	result, _ := service.Gdyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IdNo)
+		////	var dat map[string]interface{}
+		////	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		////		fmt.Println(dat)
+		////	} else {
+		////		fmt.Println(err)
+		////	}
+		////	c.ServeSuccessJSON(map[string]interface{}{
+		////		"status": "0",
+		////		//"card_info":      pCardInfo,
+		////		"busi_card_info": pBusiCardInfo,
+		////		"token":          token,
+		////		"result":         dat,
+		////		"type":           "2",
+		////	})
+		////} else {
+		//	c.ServeSuccessJSON(map[string]interface{}{
+		//		"status": "-1",
+		//	})
+		//
+		//}
 		break
 	}