1111

controllers/gdyb_controller.go

@@ -76,8 +76,9 @@ func (c *GdybController) PostOne() {
 
 	secret_key := c.GetString("secret_key")
 	id_card_type, _ := c.GetInt64("id_card_type")
+	card_sn := c.GetString("card_sn")
 
-	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type)
+	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/his_api_controller.go

@@ -151,11 +151,13 @@ func (c *HisApiController) Sscard() {
 			} else {
 
 				bas := strings.Split(basStr, "|")
+
 				basNumber := bas[1]
+				card_sn := bas[0]
 
 				appRole, _ := service.GetAppRole(adminUser.CurrentOrgId)
 
-				api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + basNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + appRole.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
+				api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + basNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + appRole.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10) + "&card_sn=" + card_sn
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/gdyb_service.go

@@ -25,7 +25,7 @@ const (
 )
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64) string {
+func Gdyb1101(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) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -39,14 +39,17 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+		inputData["card_sn"] = card_sn      // 卡识别码
+
 	} else if id_card_type == 2 {
 		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+		inputData["card_sn"] = ""           // 卡识别码
+
 	}
 
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["card_sn"] = ""           // 卡识别码
 	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_cert_type"] = "1"    // 人员证件类型
+	inputData["psn_cert_type"] = ""     // 人员证件类型
 	inputData["certno"] = certNo        // 证件号码
 	inputData["psn_name"] = ""          // 人员姓名
 	input["data"] = inputData