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

conf/app.conf

 
 
 [prod]
-org_id = 10138
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.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_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+# gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 # gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 # gdyb_paasid = "zq_prd_yjyy"
 

controllers/sg/his_api_controller.go

 								//判断是否使用了押金
 								if dec_way == "true" {
 									tmpstring := strconv.FormatInt(order.ID, 10)
+									order.Decimal = decimal
+									service.UpDateOrder(order)
 									//扣押金
 									errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 									if errmsg != nil {
 					if dec_way == "true" {
 						tmpstring := strconv.FormatInt(order.ID, 10)
 						//扣押金
+						order.Decimal = decimal
+						service.UpDateOrder(order)
+
 						errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 						if errmsg != nil {
 							c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errmsg.Error())