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

controllers/sg/his_api_controller.go

@@ -104,7 +104,7 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 	var res Result5301
 	var res10265 Result5301For10265
 
-	if miConfig.MdtrtareaAdmvs == "32091" {
+	if miConfig.MdtrtareaAdmvs == "320921" {
 		psn_info, _ := service.GetPsnByPatientId(patient_id)
 		api := "http://192.168.3.111:9532/" + "jsyb/5301?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&psn_no=" + psn_info.PsnNo

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"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	/*service.ConnectDB()
+	service.ConnectDB()
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	CreateLog(miConfig)
 	UploadLog(miConfig)
-	*/
+
 }
 func main() {
 	beego.Run()