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

controllers/sg/his_api_controller.go

@@ -1391,6 +1391,12 @@ func (c *HisApiController) ReadCard() {
 			name = DeleteExtraSpaceTwo(name)
 			errmsg = DeleteExtraSpaceTwo(errmsg)
 
+			cardnum = Remove0000(cardnum)
+			cardCode = Remove0000(cardCode)
+			id_card_no = Remove0000(id_card_no)
+			name = Remove0000(name)
+			errmsg = Remove0000(errmsg)
+
 			basStr := cardnum + "|" + cardCode + "|" + id_card_no + "|" + name
 			result, _ := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 			var dat map[string]interface{}
@@ -12290,3 +12296,14 @@ func DeleteExtraSpaceTwo(s string) string {
 	}
 	return string(s2)
 }
+
+func Remove0000(s string) string {
+	str := make([]rune, 0, len(s))
+	for _, v := range []rune(s) {
+		if v == 0 {
+			continue
+		}
+		str = append(str, v)
+	}
+	return string(str)
+}

service/fj_service.go

@@ -78,7 +78,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error(), ""
 	}
 	fmt.Println("开始jdk")
-	cmd := exec.Command("java", "-jar", "FJYB_SDK.jar", string(bytesData))
+	cmd := exec.Command("java", "-jar", "FJYB_SDK.jar", ConvertToString(string(bytesData), "gbk", "utf-8"))
 	out, err := cmd.Output()
 	if err != nil {
 		fmt.Println("error:", err.Error())