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

controllers/sg/his_api_controller.go

@@ -2637,8 +2637,8 @@ func (c *HisApiController) Refund() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&doctor=" + roles.UserName + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + order.PsnNo +
+			"&mdtrt_id=" + order.MdtrtId + "&doctor=" + roles.UserName + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
@@ -2670,8 +2670,8 @@ func (c *HisApiController) Refund() {
 			return
 		}
 		if res.Infcode == 0 {
-			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
-				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + order.PsnNo +
+				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp2, requestErr2 := http.Get(api2)
 			if requestErr2 != nil {