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

controllers/nm/nm_controller.go

@@ -521,7 +521,7 @@ func (c *NmController) ReadCard() {
 		cardNumber := bas[2]
 		name := bas[4]
 
-		result := service.Gdyb1101G(basNumber, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, 1, name)
+		result := service.Gdyb1101G(basNumber, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, 1, name, cardNumber)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)

service/gdyb_service.go

@@ -3727,7 +3727,7 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-func Gdyb1101G(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 int64, name string) string {
+func Gdyb1101G(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 int64, name string, cardNumber string) string {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3738,13 +3738,13 @@ func Gdyb1101G(certNo string, org_name string, doctor string, fixmedins_code str
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
 
-	inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-	inputData["card_sn"] = card_sn      // 卡识别码
-	inputData["certno"] = certNo        // 证件号码
-	inputData["psn_cert_type"] = "01"   // 人员证件类型
-	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_name"] = name        // 人员姓名
+	inputData["mdtrt_cert_type"] = "03"     // 就诊凭证类型
+	inputData["card_sn"] = card_sn          // 卡识别码
+	inputData["certno"] = certNo            // 证件号码
+	inputData["psn_cert_type"] = "01"       // 人员证件类型
+	inputData["mdtrt_cert_no"] = cardNumber // 就诊凭证编号
+	inputData["begntime"] = ""              // 开始时间
+	inputData["psn_name"] = name            // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入