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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10265
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,15 +53,15 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-# gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
-gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
+# gdyb_url = "http:/#  /tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
 #韶关
 # gdyb_paasid = "sg03_prd"
 #江门
-#gdyb_paasid = "jm_sc_yjyy"
+gdyb_paasid = "jm_sc_yjyy"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳

controllers/sg/his_api_controller.go

@@ -9843,7 +9843,6 @@ func (c *HisApiController) GetSettleAccounts() {
 				"chineseTraditionalMedicineCostTotal":     chineseTraditionalMedicineCostTotal,
 				"chineseTraditionalMedicineCostSelfTotal": chineseTraditionalMedicineCostSelfTotal,
 				"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-
 				"checkCostTotal":              checkCostTotal,
 				"checkCostSelfTotal":          checkCostSelfTotal,
 				"checkCostPartSelfTotal":      checkCostPartSelfTotal,

main.go

@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }