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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10088
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/hb/hbyb_controller.go

@@ -317,7 +317,9 @@ func (c *HBybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result, srcRequest := service.Hbyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates)
+	acct_used_flag, _ := c.GetInt64("acct_used_flag")
+
+	result, srcRequest := service.Hbyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
+	//"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,11 +15,11 @@ import (
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 }
 func main() {
 	beego.Run()

service/hbyb_service.go

@@ -540,7 +540,7 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
+func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -572,13 +572,13 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
-	inputData["medfee_sumamt"] = total  // 医疗费总额
-	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
-	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
-	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
-	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
-	inputData["insutype"] = insutype    // 险种类型
-	inputData["invono"] = ""            // 发票号
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //