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

controllers/sg/his_api_controller.go

@@ -1858,10 +1858,8 @@ func (c *HisApiController) GetRegisterInfo() {
 			Naty = psn_info.Naty
 			Brdy = psn_info.Brdy
 			Age = psn_info.Age
-			Iinfos, _ := json.Marshal(psn_info.Insuinfo)
-			Idetinfos, _ := json.Marshal(psn_info.Idetinfo)
-			infoStr = string(Iinfos)
-			idetinfoStr = string(Idetinfos)
+			infoStr = psn_info.Insuinfo
+			idetinfoStr = psn_info.Idetinfo
 
 		} else {
 			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10))

service/hbyb_service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"io/ioutil"
 	"net/http"
 	"os/exec"
@@ -14,6 +15,22 @@ import (
 	"time"
 )
 
+type Charset string
+
+const (
+	UTF8    = Charset("UTF-8")
+	GB18030 = Charset("GB18030")
+)
+
+func ConvertToString(src string, srcCode string, tagCode string) string {
+	srcCoder := mahonia.NewDecoder(srcCode)
+	srcResult := srcCoder.ConvertString(src)
+	tagCoder := mahonia.NewDecoder(tagCode)
+	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
+	result := string(cdata)
+	return result
+}
+
 // 人员基本信息
 func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string) (string, string) {
 	//生成签名
@@ -66,8 +83,9 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
+
 	fmt.Println(string(out))
-	return string(out), inputLog
+	return ConvertToString(string(out), "gbk", "utf-8"), inputLog
 
 }
 
@@ -124,7 +142,7 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	}
 	fmt.Println(string(out))
 
-	return string(out), requestLog
+	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -164,7 +182,7 @@ func Hbyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 	fmt.Println(string(out))
 
-	return string(out), requestLog
+	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -228,7 +246,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	}
 	fmt.Println(string(out))
 
-	return string(out), requestLog
+	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -397,7 +415,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 	fmt.Println(string(out))
 
-	return string(out), requestLog
+	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -437,7 +455,7 @@ func Hbyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	}
 	fmt.Println(string(out))
 
-	return string(out), requestLog
+	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -507,7 +525,7 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 	fmt.Println(string(out))
 
-	return string(out), requestLog
+	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -577,7 +595,7 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return string(out), str2
+	return ConvertToString(string(out), "gbk", "utf-8"), str2
 
 }
 
@@ -617,7 +635,7 @@ func Hbyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return string(out), str2
+	return ConvertToString(string(out), "gbk", "utf-8"), str2
 
 }
 
@@ -655,7 +673,7 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	//str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return string(out)
+	return ConvertToString(string(out), "gbk", "utf-8")
 }
 
 //确认订单