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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,7 +53,8 @@ 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_paasid = "jm_sc_yjyy"
+gdyb_paasid = "sg03_prd"
+#    gdyb_paasid = "jm_sc_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/his_api_controller.go

@@ -69,6 +69,8 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/test", &HisApiController{}, "get:TestTest")
 
+	beego.Router("/api/reversal", &HisApiController{}, "get:ReversalData")
+
 }
 
 //func (c *HisApiController) TestPay() {
@@ -4272,6 +4274,156 @@ func (c *HisApiController) TestTest() {
 
 }
 
+type CustomData struct {
+	MsgId string
+	PsnNo string
+	Info  string
+}
+
+func (c *HisApiController) ReversalData() {
+	var customData []*CustomData
+
+	custom := &CustomData{
+		MsgId: "H44022900158202103301714472004",
+		PsnNo: "44020000001101329945",
+		Info:  "2206",
+	}
+	customData = append(customData, custom)
+
+	custom1 := &CustomData{
+		MsgId: "H4402290015820210330172057803",
+		PsnNo: "44020000001101161813",
+		Info:  "2206",
+	}
+	customData = append(customData, custom1)
+	custom2 := &CustomData{
+		MsgId: "H44022900158202103301705198813",
+		PsnNo: "44190000133097375417",
+		Info:  "2206",
+	}
+	customData = append(customData, custom2)
+	custom3 := &CustomData{
+		MsgId: "H44022900158202103301715524756",
+		PsnNo: "44020000001100187221",
+		Info:  "2206",
+	}
+	customData = append(customData, custom3)
+	custom4 := &CustomData{
+		MsgId: "H44022900158202103301730376224",
+		PsnNo: "44020000001101959155",
+		Info:  "2206",
+	}
+	customData = append(customData, custom4)
+	custom5 := &CustomData{
+		MsgId: "H44022900158202103301748008725",
+		PsnNo: "44020000001104246641",
+		Info:  "2206",
+	}
+	customData = append(customData, custom5)
+	custom6 := &CustomData{
+		MsgId: "H44022900158202103301718096755",
+		PsnNo: "44020000001102211860",
+		Info:  "2206",
+	}
+	customData = append(customData, custom6)
+	custom7 := &CustomData{
+		MsgId: "H44022900158202103301736551640",
+		PsnNo: "44020000001102687718",
+		Info:  "2206",
+	}
+
+	customData = append(customData, custom7)
+
+	custom77 := &CustomData{
+		MsgId: "H44022900158202103301736551640",
+		PsnNo: "44020000001102687718",
+		Info:  "2206",
+	}
+	customData = append(customData, custom77)
+
+	custom8 := &CustomData{
+		MsgId: "H44022900158202103301743097676",
+		PsnNo: "44020000001102127785",
+		Info:  "2206",
+	}
+	customData = append(customData, custom8)
+	custom9 := &CustomData{
+		MsgId: "H44022900158202103301712304203",
+		PsnNo: "44020000001101518097",
+		Info:  "2206",
+	}
+	customData = append(customData, custom9)
+	custom10 := &CustomData{
+		MsgId: "H44022900158202103301738448785",
+		PsnNo: "44020000001100500813",
+		Info:  "2206",
+	}
+	customData = append(customData, custom10)
+
+	custom11 := &CustomData{
+		MsgId: "H44022900158202103301732455843",
+		PsnNo: "44020000001102690557",
+		Info:  "2206",
+	}
+
+	customData = append(customData, custom11)
+
+	custom12 := &CustomData{
+		MsgId: "H44022900158202103301745421708",
+		PsnNo: "44020000001102211928",
+		Info:  "2206",
+	}
+	customData = append(customData, custom12)
+
+	custom1212 := &CustomData{
+		MsgId: "H440229001582021033017351627",
+		PsnNo: "44020000001102481733",
+		Info:  "2206",
+	}
+	customData = append(customData, custom1212)
+
+	custom13 := &CustomData{
+		MsgId: "H44022900158202103301740327951",
+		PsnNo: "44020000001103174866",
+		Info:  "2206",
+	}
+	customData = append(customData, custom13)
+	custom14 := &CustomData{
+		MsgId: "H4402290015820210330174922668",
+		PsnNo: "44020000001102927272",
+		Info:  "2206",
+	}
+	customData = append(customData, custom14)
+	custom15 := &CustomData{
+		MsgId: "H44022900158202103301752362273",
+		PsnNo: "44020000001102942890",
+		Info:  "2206",
+	}
+	customData = append(customData, custom15)
+
+	custom16 := &CustomData{
+		MsgId: "H44022900158202103301751082917",
+		PsnNo: "44020000001101662162",
+		Info:  "2206",
+	}
+	customData = append(customData, custom16)
+
+	custom17 := &CustomData{
+		MsgId: "H44022900158202103301754147728",
+		PsnNo: "44020000000229014511",
+		Info:  "2206",
+	}
+	customData = append(customData, custom17)
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+	for _, item := range customData {
+		result := service.Gdyb2601(item.PsnNo, item.MsgId, item.Info, miConfig.OrgName, "张俊杰", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+		fmt.Println(result)
+	}
+}
+
 func PathExists(path string) (bool, error) {
 	_, err := os.Stat(path)
 	if err == nil {

service/gdyb_service.go

@@ -2535,3 +2535,57 @@ func GetPatientsByIds(ids []string, current_org_id int64) (patients []*models.Pa
 	err = readDb.Model(&models.Patients{}).Where("id IN (?) AND user_org_id = ?", ids, current_org_id).Find(&patients).Error
 	return
 }
+
+func Gdyb2601(psnNo string, omsgid string, oinfno 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"] = "2601" // 交易编码
+	inputData["psn_no"] = psnNo
+	inputData["omsgid"] = omsgid
+	inputData["oinfno"] = oinfno
+
+	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)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2601"
+	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
+}