Browse Source

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

csx 3 years ago
parent
commit
aa580ecf41
2 changed files with 2 additions and 4 deletions
  1. 1 3
      controllers/js/jsyb_controller.go
  2. 1 1
      service/jsyb_service.go

+ 1 - 3
controllers/js/jsyb_controller.go View File

792
 	pBusiCardInfo := make([]byte, 8192)
792
 	pBusiCardInfo := make([]byte, 8192)
793
 
793
 
794
 	data := make(map[string]interface{})
794
 	data := make(map[string]interface{})
795
+	//pData := make(map[string]interface{})
795
 
796
 
796
 	inputData := make(map[string]interface{})
797
 	inputData := make(map[string]interface{})
797
 	inputData["orgId"] = code
798
 	inputData["orgId"] = code
804
 	data["data"] = inputData
805
 	data["data"] = inputData
805
 	data["transType"] = "ec.query"
806
 	data["transType"] = "ec.query"
806
 	data["orgId"] = code
807
 	data["orgId"] = code
807
-
808
 	bytesData, _ := json.Marshal(data)
808
 	bytesData, _ := json.Marshal(data)
809
-
810
 	pCardInfo = bytesData
809
 	pCardInfo = bytesData
811
-
812
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
810
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
813
 	fmt.Println(ret2)
811
 	fmt.Println(ret2)
814
 	fmt.Println(DeleteExtraSpace(string(bytesData)))
812
 	fmt.Println(DeleteExtraSpace(string(bytesData)))

+ 1 - 1
service/jsyb_service.go View File

162
 	if id_card_type == 1 {
162
 	if id_card_type == 1 {
163
 		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
163
 		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
164
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
164
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
165
-	} else if id_card_type == 4 {
165
+	} else if id_card_type == 3 {
166
 		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
166
 		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
167
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
167
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
168
 	} else {
168
 	} else {