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

controllers/sg/his_api_controller.go

@@ -1054,8 +1054,8 @@ func (c *HisApiController) GetSettleList() {
 
 func (c *HisApiController) GetBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	//stage, _ := c.GetInt64("stage")
-	orders, _ := service.GetAllHisOrder(org_id)
+	stage, _ := c.GetInt64("stage")
+	orders, _ := service.GetAllHisOrderErr(org_id, stage)
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)