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

controllers/sg/his_api_controller.go

 
 	beego.Router("/api/insutype/check", &HisApiController{}, "get:CheckInsutype")
 
-	beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
+	//beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
 
 	beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
 
 				ErrMsg:    res.ErrMsg + "解析失败",
 				Status:    1,
 				PatientId: order_id,
-				Stage:     40,
+				Stage:     120,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     40,
+				Stage:     120,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
 			}
 			service.CreateUploadRecord(hisFundSettleListResult)
 			continue
-
 		}
-
 	}
 }
 

service/his_service.go

 }
 
 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  fa_piao_code <> '' AND fa_piao_batchnumber_id = 1", 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 >= 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
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {