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

controllers/zh/zh_his_api_controller.go

@@ -3017,6 +3017,7 @@ func (c *ZHHisApiController) ReadCard() {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"patient": patient,
 						"number":  basNumber,
+						"info":    res,
 					})
 				} else {
 					Iinfos, _ := json.Marshal(res.Output.Iinfo)
@@ -3043,6 +3044,7 @@ func (c *ZHHisApiController) ReadCard() {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"patient": patient,
 						"number":  token,
+						"info":    res,
 					})
 				}
 			}

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