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

controllers/sg/gdyb_controller.go

@@ -79,7 +79,7 @@ func (c *GdybController) PostOne() {
 	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, card_sn, "44022919620927046X")
+	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/sg/his_api_controller.go

@@ -3824,30 +3824,17 @@ func (c *HisApiController) GetPatientInfo() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(c.GetAdminUserInfo().CurrentOrgId)
 	if config.IsOpen == 1 {
-		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + id_card_no + "&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-		resp, requestErr := http.Get(api)
-		if requestErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		defer resp.Body.Close()
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
 
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
 		}
 
-		userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(userJSON)
-		var res ResultTwo
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultFourteen
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/gdyb_service.go

@@ -82,13 +82,12 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 人员基本信息
-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, id_card_no string) 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()
 	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{})
@@ -97,10 +96,7 @@ 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      // 卡识别码
-		inputData["certno"] = id_card_no    // 证件号码
-		//inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		//inputData["card_sn"] = ""           // 卡识别码
-		//inputData["certno"] = certNo        // 证件号码
+		inputData["certno"] = certNo        // 证件号码
 	} else {
 		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 		inputData["card_sn"] = ""           // 卡识别码
@@ -152,6 +148,65 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	return str
 }
 
+func Gdyb1101A(certNo string, 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()
+	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"      // 交易编码
+	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+	inputData["card_sn"] = ""           // 卡识别码
+	inputData["certno"] = certNo        // 证件号码
+	inputData["psn_cert_type"] = "1"    // 人员证件类型
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = ""          // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+
+	//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", "test_hosp")
+	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
+}
+
 // 门诊挂号
 func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64) string {
 	// 生成签名