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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,8 +57,8 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-gdyb_paasid = "sg03_prd"
-# gdyb_paasid = "jm_sc_yjyy"
+# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
 # gdyb_paasid = "zq_prd_yjyy"

controllers/js/jsyb_controller.go

@@ -42,9 +42,10 @@ func (c *JSybController) PostOne() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 	key := c.GetString("key")
+	time_stamp := c.GetString("time_stamp")
 
 	fmt.Println("url:" + key)
-	result, inputLog := service.Jsyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, url, ak, key)
+	result, inputLog := service.Jsyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, url, ak, key, time_stamp)
 	fmt.Println(result)
 	fmt.Println(inputLog)
 	var dat map[string]interface{}

controllers/sg/his_api_controller.go

@@ -985,7 +985,7 @@ func (c *HisApiController) GetSettleList() {
 	struct4101.IteminfoStruct = iteminfoStructs
 	struct4101.Ntly = "中国"
 	struct4101.AdmCaty = "A03.06"
-	result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.UserOrgId)
 	fmt.Println(result)
 
 	var dat map[string]interface{}
@@ -1710,7 +1710,7 @@ func (c *HisApiController) GetBatchSettleList() {
 		struct4101.IteminfoStruct = iteminfoStructs
 		struct4101.Ntly = "中国"
 		struct4101.AdmCaty = "A03.06"
-		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
 		fmt.Println(result)
 
 		var dat map[string]interface{}
@@ -1747,7 +1747,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     120,
+				Stage:     200,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
@@ -2853,6 +2853,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	social_type, _ := c.GetInt64("social_type")
 	med_type := c.GetString("social_type")
 	key := c.GetString("key")
+	time_stamp := c.GetString("time_stamp")
 
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
@@ -2938,11 +2939,10 @@ func (c *HisApiController) GetRegisterInfo() {
 			idetinfoStr = psn_info.Idetinfo
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
-			fmt.Println(miConfig.Url)
 			var res ResultTwo
 			api := "http://192.168.3.111:9532/" + "jsyb/1101?cert_no=" + "" +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&key=" + key
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&key=" + key + "&time_stamp=" + time_stamp
 			fmt.Println(api)
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {

service/gdyb_service.go

@@ -2758,7 +2758,7 @@ type Struct4101 struct {
 }
 
 //
-func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, org_id int64) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -2768,7 +2768,13 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "4101" // 交易编码
+	if org_id == 10106 {
+		inputMessage["infno"] = "4101A" // 交易编码
+
+	} else {
+		inputMessage["infno"] = "4101" // 交易编码
+
+	}
 
 	year := time.Now().Format("2006")
 	month := time.Now().Format("01")

service/jsyb_service.go

@@ -15,7 +15,7 @@ import (
 )
 
 // 人员基本信息
-func Jsyb1101(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, certificates string, request_url string, access_key string, skey string) (string, string) {
+func Jsyb1101(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, certificates string, request_url string, access_key string, skey string, timestamp_str string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -71,8 +71,11 @@ func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	//key := "_api_access_key=" + access_key + "&_api_name=" + "hssServives" + "&_api_timestamp=" + strconv.FormatInt(timestamp, 10) + "&_api_version=" + "1.0.0"
 
 	fmt.Println(skey)
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("_api_timestamp", strconv.FormatInt(timestamp, 13))
+	fmt.Println(timestamp_str)
+	fmt.Println(access_key)
+
+	request.Header.Set("Content-Type", "application/json")
+	request.Header.Set("_api_timestamp", timestamp_str)
 	request.Header.Set("_api_name", "hssServives")
 	request.Header.Set("_api_version", "1.0.0")
 	request.Header.Set("_api_access_key", access_key)