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

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,11 +15,11 @@ 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)
 
 }
 func main() {

service/jsyb_service.go

@@ -481,9 +481,10 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		fmt.Println(err.Error())
 		return "", ""
 	}
+
 	request_url = request_url + "2204"
-	time_stamp, _ := strconv.ParseInt(time_stamp_2203, 10, 64)
-	return HttpRequest(request_url, access_key, secret_key, time_stamp, string(bytesData)), requestLog
+	//time_stamp, _ := strconv.ParseInt(time_stamp_2203, 10, 64)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }
 
 //  门诊费用明细信息撤销