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

controllers/js/jsyb_controller.go

@@ -787,7 +787,7 @@ func (c *JSybController) ReadCard() {
 		}
 		token := ele.Data.EcToken
 		if len(token) > 0 {
-			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo)
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, ele.Data.UserName)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -800,7 +800,6 @@ func (c *JSybController) ReadCard() {
 				"busi_card_info": pBusiCardInfo,
 				"token":          token,
 				"result":         dat,
-				"type":           "4",
 			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{

service/jsyb_service.go

@@ -229,7 +229,7 @@ func Jsyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_ad
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
 
-func Jsyb1101ForEleCert(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 Jsyb1101ForEleCert(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, name string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
 	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
@@ -240,12 +240,12 @@ func Jsyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 
 	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
 	inputData["card_sn"] = ""           // 卡识别码
-	inputData["certno"] = ""            // 证件号码
+	inputData["certno"] = id_card_no    // 证件号码
 	inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
 	inputData["begntime"] = ""         // 开始时间
-	inputData["psn_name"] = ""         // 人员姓名
+	inputData["psn_name"] = name       // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -286,8 +286,8 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 
 	}
 
@@ -712,8 +712,8 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
-			inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		}
 	}
 	if insuplc_admdvs == "421300" {
@@ -776,8 +776,8 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
-			inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		}
 	}
 	if med_type == "1111" || med_type == "1112" {