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

controllers/sg/his_api_controller.go

@@ -4794,7 +4794,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
-				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
+				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time)
 				saveLog(result, requestLog, "2201", "挂号")
 				if miConfig.Code == "H15049901371" {
 

service/gdyb_service.go

@@ -453,6 +453,108 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 
 }
 
+func Gdyb2201A(psnNo string, insutype string, certNo string, org_name string, opera 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, doctor_name string, record_time string) (string, string) {
+	fmt.Println(opera)
+
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2201"      // 交易编码
+	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype    // 险种类型（来自1101接口返回）
+	inputData["begntime"] = record_time // 开始时间
+
+	if id_card_type == 1 {
+		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	}
+
+	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
+	inputData["atddr_no"] = doctor_id    // 医师编码
+	inputData["dr_name"] = doctor_name   // 医师姓名
+	inputData["dept_code"] = dept_code   // 科室编码
+	inputData["dept_name"] = dept        // 科室名称
+	inputData["caty"] = "A03.06"         // 科别
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+	bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	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/2201"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2201"
+
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "2201"
+	}
+
+	if insuplc_admdvs == "421300" {
+		var json2 string
+		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
+		out, err := cmd.Output()
+		if err != nil {
+			fmt.Println("error:", err.Error())
+		}
+		fmt.Println(string(out))
+
+		return hex.EncodeToString(out), requestLog
+	} else {
+		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(), ""
+		}
+		str := string(respBytes)
+		fmt.Println(str)
+		return str, requestLog
+
+	}
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2201"
+
+}
+
 // 门诊挂号撤销
 func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
 	// 生成签名
@@ -4453,7 +4555,7 @@ func Gdyb1101D(certNo string, org_name string, doctor string, fixmedins_code str
 	}
 
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["begntime"] = record_date // 开始时间
+	inputData["begntime"] = ""          // 开始时间
 	inputData["psn_name"] = psn_name    // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入