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

controllers/sg/his_api_controller.go

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

service/his_service.go

@@ -1367,7 +1367,7 @@ func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> '' AND id >= 2499", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
-func GetAllHisOrderErr(org_id int64) (his []*models.HisOrderError, err error) {
-	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = 23", org_id).Find(&his).Error
+func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {
+	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = ?", org_id, stage).Find(&his).Error
 	return
 }