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)
@@ -1729,7 +1729,7 @@ func ReadBasCardGetNumber(request string) (string, string, string, string, error
 	DllDef2 := syscall.MustLoadDLL("SSCardDriver_SZ.dll")
 	readCards := DllDef2.MustFindProc("iReadCardBas")
 	str := request
-	str3 := make([]byte, 256)
+	str3 := make([]byte, 1024)
 	fmt.Println(":", request)
 	fmt.Println(":", StrPtr(str))