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

controllers/sg/his_api_controller.go

 	fed.DscgDeptCodg = strconv.FormatInt(department.ID, 10)
 	fed.DscgDeptName = department.Name
 	fed.MedMdtrtType = "1"
-	if his.Insutype == "390" {
-		fed.MedType = "1402"
-	} else {
-		fed.MedType = "9933"
-	}
+	fed.MedType = "11"
+	//if his.Insutype == "390" {
+	//	fed.MedType = "1402"
+	//} else {
+	//	fed.MedType = "9933"
+	//}
 	var orders []*models.FsiOrderDtos
 
 	if trig_scen == "2" {

main.go

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