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

controllers/zh/zh_his_api_controller.go

@@ -1669,6 +1669,8 @@ func (c *ZHHisApiController) GetSettleInfo() {
 			//判断是否使用了押金
 			if dec_way == "true" {
 				tmpstring := strconv.FormatInt(order.ID, 10)
+				order.Decimal = decimal
+				err = service.UpDateOrder(order)
 				//扣押金
 				errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, patient_id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 				if errmsg != nil {