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

conf/app.conf

 
 
 [prod]
-org_id = 9919
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-gdyb_paasid = "sg03_prd"
-# gdyb_paasid = "jm_sc_yjyy"
+# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yjyy"
 #gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"

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 settle_accounts_date = 1640880000  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 >= 1640966400  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) {