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

controllers/js/jsyb_controller.go

@@ -734,7 +734,7 @@ func (c *JSybController) ReadCard() {
 		}
 		token := ele.Data.EcCardToken
 		if len(token) > 0 {
-			result, _ := service.Jsyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo)
+			result, _ := service.Jsyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IdNo)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)

service/jsyb_service.go

@@ -197,7 +197,7 @@ func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
 
-func Jsyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, Token string, cainfo string) (string, string) {
+func Jsyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, Token string, cainfo string, id_card_no string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
 	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
@@ -206,14 +206,14 @@ func Jsyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_ad
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
 
-	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+	inputData["mdtrt_cert_type"] = "04" // 就诊凭证类型
 	inputData["card_sn"] = ""           // 卡识别码
 	inputData["certno"] = ""            // 证件号码
 	inputData["psn_cert_type"] = "01"   // 人员证件类型
 
-	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
-	inputData["begntime"] = ""         // 开始时间
-	inputData["psn_name"] = ""         // 人员姓名
+	inputData["mdtrt_cert_no"] = id_card_no + "|" + Token // 就诊凭证编号
+	inputData["begntime"] = ""                            // 开始时间
+	inputData["psn_name"] = ""                            // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入