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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10215
+org_id = 10138
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,15 +53,15 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-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://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="zh_prd_yrojyy"
-# gdyb_paasid = "sz_prd_yjyy"
-gdyb_paasid = "zq_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/sg/his_api_controller.go

@@ -3109,7 +3109,13 @@ func (c *HisApiController) GetRegisterInfo() {
 			verify_number = psn_info.VerifyNumber
 
 		} else {
-			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
+			var result string
+			var requestLog string
+			if miConfig.UserOrgId == 10138 {
+				result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
+			} else {
+				result, requestLog = service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
+			}
 			saveLog(result, requestLog, "1101", "人员基本信息获取")
 			if miConfig.Code == "H15049901371" {
 

service/gdyb_service.go

@@ -177,6 +177,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		inputData["psn_cert_type"] = "99"   // 人员证件类型
 
 	} else {
+
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
@@ -4233,3 +4234,120 @@ func GetMac() string {
 	}
 	return ""
 }
+
+// 人员基本信息
+func Gdyb1101D(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, psn_name string) (string, string) {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	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"] = "1101" // 交易编码
+
+	if certificates == "3" {
+		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if certificates == "3" {
+			if id_card_type == 1 {
+				inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+				inputData["card_sn"] = ""           // 卡识别码
+				inputData["certno"] = certNo        // 证件号码
+				inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+			} else {
+				inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+				inputData["card_sn"] = ""           // 卡识别码
+				inputData["certno"] = certNo        // 证件号码
+				inputData["psn_cert_type"] = "01"   // 人员证件类型
+			}
+		} else if certificates == "6" {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "17"   // 人员证件类型
+
+		}
+
+	}
+
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = psn_name    // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//DllDef := syscall.MustLoadDLL("yh_hb_sctrl.dll")
+	//Iinit := DllDef.MustFindProc("yh_hb_call")
+	//var str3 string
+	//ret, _, _ := Iinit.Call(StrPtr("1101"), StrPtr(string(bytesData)), StrPtr(str3))
+	//fmt.Println(ret)
+	//fmt.Println(str3)
+	//
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "1101"
+	}
+
+	if insuplc_admdvs == "421300" {
+		var json2 string
+		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+		out, err := cmd.Output()
+		if err != nil {
+			fmt.Println("error:", err.Error())
+		}
+		fmt.Println(string(out))
+		return hex.EncodeToString(out), inputLog
+	} else {
+
+		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+		request, err := http.NewRequest("POST", url, reader)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+
+		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+		request.Header.Set("x-tif-paasid", gdyb_paasid)
+		request.Header.Set("x-tif-signature", signature)
+		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+		request.Header.Set("x-tif-nonce", nonce)
+
+		client := http.Client{}
+		resp, err := client.Do(request)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+		respBytes, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+		fmt.Println(string(respBytes))
+		str := string(respBytes)
+		return str, inputLog
+
+	}
+
+}