Browse Source

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

csx 2 years ago
parent
commit
c2c89e3a45
3 changed files with 7 additions and 10 deletions
  1. 2 2
      conf/app.conf
  2. 1 4
      controllers/sg/his_api_controller.go
  3. 4 4
      service/gdyb_service.go

+ 2 - 2
conf/app.conf View File

45
 
45
 
46
 
46
 
47
 [prod]
47
 [prod]
48
-org_id = 10217
48
+org_id = 10138
49
 mobile_token_expiration_second = 86400
49
 mobile_token_expiration_second = 86400
50
 httpdomain = https://api.xt.kuyicloud.com
50
 httpdomain = https://api.xt.kuyicloud.com
51
 sso_domain = https://sso.kuyicloud.com
51
 sso_domain = https://sso.kuyicloud.com
67
 #珠海
67
 #珠海
68
 # gdyb_paasid="zh_prd_yrojyy"
68
 # gdyb_paasid="zh_prd_yrojyy"
69
 #深圳
69
 #深圳
70
-#gdyb_paasid = "sz_prd_yjyy"
70
+gdyb_paasid = "sz_prd_yjyy"
71
 #肇庆
71
 #肇庆
72
 # gdyb_paasid = "zq_prd_yjyy"
72
 # gdyb_paasid = "zq_prd_yjyy"
73
 # gdyb_paasid = "sztest_hosp"
73
 # gdyb_paasid = "sztest_hosp"

+ 1 - 4
controllers/sg/his_api_controller.go View File

91
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, 185)
91
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, 185)
92
 
92
 
93
 	if miConfig.MdtrtareaAdmvs == "350500" {
93
 	if miConfig.MdtrtareaAdmvs == "350500" {
94
-		fmt.Println("350500")
95
-
96
 		service.GetFjAuthorizationInfo(miConfig.Code)
94
 		service.GetFjAuthorizationInfo(miConfig.Code)
97
-
98
 	} else {
95
 	} else {
99
 		result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
96
 		result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
100
 
97
 
1939
 				return
1936
 				return
1940
 			}
1937
 			}
1941
 		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
1938
 		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
1942
-
1939
+			service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
1943
 		}
1940
 		}
1944
 		break
1941
 		break
1945
 	}
1942
 	}

+ 4 - 4
service/gdyb_service.go View File

3829
 	return str
3829
 	return str
3830
 }
3830
 }
3831
 
3831
 
3832
-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 {
3832
+func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
3833
 	//生成签名
3833
 	//生成签名
3834
 	nonce := GetRandomString(32)
3834
 	nonce := GetRandomString(32)
3835
 	timestamp := time.Now().Unix()
3835
 	timestamp := time.Now().Unix()
3845
 	inputData["certno"] = ""            // 证件号码
3845
 	inputData["certno"] = ""            // 证件号码
3846
 	inputData["psn_cert_type"] = "01"   // 人员证件类型
3846
 	inputData["psn_cert_type"] = "01"   // 人员证件类型
3847
 
3847
 
3848
-	inputData["mdtrt_cert_no"] = token // 就诊凭证编号
3849
-	inputData["begntime"] = ""         // 开始时间
3850
-	inputData["psn_name"] = name       // 人员姓名
3848
+	inputData["mdtrt_cert_no"] = "" // 就诊凭证编号
3849
+	inputData["begntime"] = ""      // 开始时间
3850
+	inputData["psn_name"] = ""      // 人员姓名
3851
 	input["data"] = inputData
3851
 	input["data"] = inputData
3852
 	inputMessage["input"] = input //交易输入
3852
 	inputMessage["input"] = input //交易输入
3853
 
3853