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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10217
+org_id = 10138
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -67,7 +67,7 @@ gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-#gdyb_paasid = "sz_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 # gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"

controllers/sg/his_api_controller.go

@@ -91,10 +91,7 @@ func (c *HisApiController) Get9001() {
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, 185)
 
 	if miConfig.MdtrtareaAdmvs == "350500" {
-		fmt.Println("350500")
-
 		service.GetFjAuthorizationInfo(miConfig.Code)
-
 	} else {
 		result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
 
@@ -1939,7 +1936,7 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
-
+			service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
 		}
 		break
 	}

service/gdyb_service.go

@@ -3829,7 +3829,7 @@ func Gdyb1101G(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-func Gdyb1101ForEleCert(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, token string, name string) string {
+func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3845,9 +3845,9 @@ func Gdyb1101ForEleCert(certNo string, org_name string, doctor string, fixmedins
 	inputData["certno"] = ""            // 证件号码
 	inputData["psn_cert_type"] = "01"   // 人员证件类型
 
-	inputData["mdtrt_cert_no"] = token // 就诊凭证编号
-	inputData["begntime"] = ""         // 开始时间
-	inputData["psn_name"] = name       // 人员姓名
+	inputData["mdtrt_cert_no"] = "" // 就诊凭证编号
+	inputData["begntime"] = ""      // 开始时间
+	inputData["psn_name"] = ""      // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入