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

conf/app.conf

 
 
 [prod]
-org_id = 10188
+org_id = 10217
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

 			var status string
 			status = respJSON["data"].(map[string]interface{})["status"].(string)
 			card_type := respJSON["data"].(map[string]interface{})["type"].(string)
+			//console.log()
+			fmt.Println("type===")
+
+			fmt.Println(card_type)
 
 			var token string
 			var res ResultTwo           //1101结果

main.go

 )
 
 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)
 }