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

controllers/sg/his_api_controller.go

@@ -1947,7 +1947,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 //
 //	str := make([]byte, 256)
 //	str1 := make([]byte, 256)
-	r, _, _ := ReadCardBas.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
+//	r, _, _ := ReadCardBas.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
 //
 //	fmt.Println(string(str))
 //	fmt.Println(r)
@@ -3001,7 +3001,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
 			var res ResultTwo
-			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" +"fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber
+			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)