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.GetAllHisOrderErr(org_id, stage)
+	//stage, _ := c.GetInt64("stage")
+	orders, _ := service.GetAllHisOrder(org_id)
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)

service/his_service.go

@@ -1356,7 +1356,7 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND settle_accounts_date >= 1638806400 AND  settle_accounts_date <= 1640793600  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' ", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND settle_accounts_date = 1640880000  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' ", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {