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

controllers/sg/his_api_controller.go

@@ -1383,11 +1383,13 @@ func (c *HisApiController) ReadCard() {
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
 			cardnum, cardCode, id_card_no, name, errmsg := c.GetFjBasBaseInfo()
-			fmt.Println(cardnum)
-			fmt.Println(cardCode)
-			fmt.Println(id_card_no)
-			fmt.Println(name)
-			fmt.Println(errmsg)
+
+			cardnum = DeleteExtraSpaceTwo(cardnum)
+			cardCode = DeleteExtraSpaceTwo(cardCode)
+			id_card_no = DeleteExtraSpaceTwo(id_card_no)
+			name = DeleteExtraSpaceTwo(name)
+			errmsg = DeleteExtraSpaceTwo(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{}
@@ -12271,3 +12273,18 @@ func (c *HisApiController) ReadEleCard() {
 		return
 	}
 }
+
+func DeleteExtraSpaceTwo(s string) string {
+	//删除字符串中的多余空格，有多个空格时，仅保留一个空格
+	s1 := strings.Replace(s, "  ", " ", -1)      //替换tab为空格
+	regstr := "\\s{2,}"                          //两个及两个以上空格的正则表达式
+	reg, _ := regexp.Compile(regstr)             //编译正则表达式
+	s2 := make([]byte, len(s1))                  //定义字符数组切片
+	copy(s2, s1)                                 //将字符串复制到切片
+	spc_index := reg.FindStringIndex(string(s2)) //在字符串中搜索
+	for len(spc_index) > 0 {                     //找到适配项
+		s2 = append(s2[:spc_index[0]+1], s2[spc_index[1]:]...) //删除多余空格
+		spc_index = reg.FindStringIndex(string(s2))            //继续在字符串中搜索
+	}
+	return string(s2)
+}

service/fj_service.go

@@ -77,14 +77,16 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-
+	fmt.Println("开始jdk")
 	cmd := exec.Command("java", "-jar", "FJYB_SDK.jar", string(bytesData))
 	out, err := cmd.Output()
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-
+	fmt.Println("输出信息：")
 	fmt.Println(string(out))
+	fmt.Println("结束jdk")
+
 	return ConvertToString(string(out), "gbk", "utf-8"), inputLog
 
 }