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

@@ -182,7 +182,7 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 
 	request_url = request_url + "2202"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }
 
@@ -239,7 +239,7 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		return err.Error(), "", 0
 	}
 	request_url = request_url + "2203A"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog, timestamp
 }
@@ -302,7 +302,7 @@ func Jsyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		return err.Error(), ""
 	}
 	request_url = request_url + "2203A"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }
@@ -489,7 +489,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 
 	request_url = request_url + "2204"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }
@@ -580,7 +580,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 	request_url = request_url + "2206"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 
@@ -644,7 +644,7 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 	request_url = request_url + "2207"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 
@@ -707,7 +707,7 @@ func Jsyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, in
 		return err.Error(), ""
 	}
 	request_url = request_url + "2207A"
-	fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 
@@ -759,7 +759,7 @@ func Jsyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error(), ""
 	}
 	baseParams.RequestUrl = baseParams.RequestUrl + "5203"
-	fmt.Println(HttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)))
+	//fmt.Println(HttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)))
 
 	return HttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)), string(bytesData)
 }
@@ -802,6 +802,7 @@ func HttpRequest(url string, ak string, sk string, timestamp int64, json string)
 		fmt.Println(err)
 		return ""
 	}
+	fmt.Println(res)
 	return res
 }