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

controllers/sz/sz_his_api_controller.go

@@ -1060,7 +1060,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			}
 		}
 
-		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code)
+		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "｜")
 		if ret4 == 0 {
 			//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
@@ -1730,8 +1730,9 @@ func ReadBasCardGetNumber(request string) (string, string, string, string, error
 	readCards := DllDef2.MustFindProc("iReadCardBas")
 	str := request
 	str3 := make([]byte, 256)
-	ret4, _, err := readCards.Call(IntPtr(3), StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
+	ret4, _, err := readCards.Call(IntPtr(1), StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
 	fmt.Println(":", string(str3))
+	fmt.Println(":", ConvertToString(string(str3), "gbk", "utf-8"))
 	if ret4 == 0 {
 		result := string(str3)
 		fmt.Println(result)