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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,12 +53,12 @@ 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/"
 #内蒙古
-# gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+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 = "jm_sc_yjyy"
 # gdyb_paasid="zh_prd_yrojyy"
 # gdyb_paasid = "sz_prd_yjyy"
 # gdyb_paasid = "zq_prd_yjyy"

controllers/sg/his_api_controller.go

@@ -8979,27 +8979,29 @@ func (c *HisApiController) GetSettleAccounts() {
 				"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
 				"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
 				"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-				"checkCostTotal":                              checkCostTotal,
-				"checkCostSelfTotal":                          checkCostSelfTotal,
-				"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-				"laboratoryCostTotal":                         laboratoryCostTotal,
-				"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
-				"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-				"treatCostTotal":                              treatCostTotal,
-				"treatCostSelfTotal":                          treatCostSelfTotal,
-				"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-				"doctor_code":                                 adminRole_two.DoctorCode,
-				"doctor_name":                                 doctor_name,
-				"health_card_no":                              order.PsnNo,
-				"department":                                  departments.Name,
-				"yiliao_leibie":                               yiliao_leibie,
-				"after_money":                                 order.AccountPrice,
-				"patient":                                     patient,
-				"org_name":                                    miConfig.OrgName,
-				"org_code":                                    miConfig.Code,
-				"order_number":                                order.Number,
-				"his_hospital":                                his_hospital,
-				"his":                                         his,
+
+				"checkCostTotal":              checkCostTotal,
+				"checkCostSelfTotal":          checkCostSelfTotal,
+				"checkCostPartSelfTotal":      checkCostPartSelfTotal,
+				"laboratoryCostTotal":         laboratoryCostTotal,
+				"laboratoryCostSelfTotal":     laboratoryCostSelfTotal,
+				"laboratoryCostPartSelfTotal": laboratoryCostPartSelfTotal,
+				"treatCostTotal":              treatCostTotal,
+				"treatCostSelfTotal":          treatCostSelfTotal,
+				"treatCostPartSelfTotal":      treatCostPartSelfTotal,
+
+				"doctor_code":    adminRole_two.DoctorCode,
+				"doctor_name":    doctor_name,
+				"health_card_no": order.PsnNo,
+				"department":     departments.Name,
+				"yiliao_leibie":  yiliao_leibie,
+				"after_money":    order.AccountPrice,
+				"patient":        patient,
+				"org_name":       miConfig.OrgName,
+				"org_code":       miConfig.Code,
+				"order_number":   order.Number,
+				"his_hospital":   his_hospital,
+				"his":            his,
 
 				//"check_order_info":                            cus_slice,
 			})

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
@@ -16,12 +16,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)
 }