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

controllers/sz/sz_his_api_controller.go

 		//1.判断读卡类型
 		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
 		yiliao_number, id_card_number, verifyCode, version_code, err, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+		fmt.Println(yiliao_number)
+		fmt.Println(id_card_number)
+		fmt.Println(verifyCode)
+		fmt.Println(version_code)
+		fmt.Println(ret4)
+
 		dept_code := "0305"
 		is_yidi = 1
 		if err != nil {
 		yiliao_number := result_arr[12]
 		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 		id_card_number := result_arr[1]
-		verifyCode := result_arr[11] + result_arr[13]
+		verifyCode := result_arr[11] + "|" + result_arr[13]
 		versionCode := result_arr[14]
-		return yiliao_number, id_card_number, verifyCode, versionCode, err, 1
+		return yiliao_number, id_card_number, verifyCode, versionCode, err, 0
 	}
-	return "", "", "", "", err, 0
+	return "", "", "", "", err, -10
 }
 
 //