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

controllers/js/jsyb_controller.go

@@ -487,9 +487,10 @@ func (c *JSybController) ReadCard() {
 	fmt.Println(pCardInfo)
 	bas := strings.Split(pCardInfo, "|")
 	basNumber := bas[2]
+	id_card_no := bas[1]
 	card_sn := bas[3]
 	if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
-		result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, "1", url, ak, pBusiCardInfo)
+		result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, "1", url, ak, pBusiCardInfo, id_card_no)
 		fmt.Println(result)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"status":         "0",
@@ -553,12 +554,12 @@ func (c *JSybController) GetBasBaseInfo() (string, string) {
 	pCardInfo := make([]byte, 2048)
 	pBusiCardInfo := make([]byte, 8192)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
-	//fmt.Println(ret2)
-	////str = strings.Replace(str, " ", "", -1)
-	//fmt.Println(string(strings.Replace(string(pCardInfo), " ", "", -1)))
-	//fmt.Println(string(strings.Replace(string(str), " ", "", -1)))
-	//fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
-	//fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	fmt.Println(ret2)
+	str = strings.Replace(str, " ", "", -1)
+	fmt.Println(string(strings.Replace(string(pCardInfo), " ", "", -1)))
+	fmt.Println(string(strings.Replace(string(str), " ", "", -1)))
+	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return "", ""
 	}

service/jsyb_service.go

@@ -58,7 +58,7 @@ func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 //人员基本信息版本2
-func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key string, pBusiCardInfo string) (string, string) {
+func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key string, pBusiCardInfo string, id_card_no string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
 	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
@@ -76,7 +76,7 @@ func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
-			inputData["certno"] = certNo        // 证件号码
+			inputData["certno"] = id_card_no    // 证件号码
 			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 		} else {