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

controllers/js/jsyb_controller.go

@@ -650,17 +650,14 @@ func (c *JSybController) Get3201() {
 
 type ELeData struct {
 	Data struct {
-		Extra       string `json:"extra"`
-		IDNo        string `json:"idNo"`
-		IDType      string `json:"idType"`
-		EcToken     string `json:"ecToken"`
-		InsuOrg     string `json:"insuOrg"`
-		UserName    string `json:"userName"`
-		EcIndexNo   string `json:"ecIndexNo"`
-		Gender      string `json:"gender"`
-		Birthday    string `json:"birthday"`
-		Nationality string `json:"nationality"`
-		Email       string `json:"email"`
+		SiNo            string `json:"si_no"`
+		SiCardNo        string `json:"si_card_no"`
+		SiCardIssueArea string `json:"si_card_issue_area"`
+		Name            string `json:"name"`
+		Gender          string `json:"gender"`
+		IdType          string `json:"id_type"`
+		IdNo            string `json:"id_no"`
+		EcCardToken     string `json:"ecCardToken"`
 	} `json:"data"`
 	Code    int    `json:"code"`
 	Message string `json:"message"`
@@ -735,7 +732,7 @@ func (c *JSybController) ReadCard() {
 		if err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 		}
-		token := ele.Data.EcToken
+		token := ele.Data.EcCardToken
 		if len(token) > 0 {
 			result, _ := service.Jsyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo)
 			var dat map[string]interface{}

controllers/zh/zh_his_api_controller.go

@@ -1470,13 +1470,14 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
 		order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
 		order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
+		order.HifmiPay = res.Output.Setlinfo.HifmiPay
 		order.HifpPay = res.Output.Setlinfo.HifpPay
-		order.CvlservPay = res.Output.Setlinfo.CvlservPay
-		order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
 		order.HifesPay = res.Output.Setlinfo.HifesPay
 		order.HifobPay = res.Output.Setlinfo.HifobPay
 		order.MafPay = res.Output.Setlinfo.MafPay
 		order.OthPay = res.Output.Setlinfo.OthPay
+		order.CvlservPay = res.Output.Setlinfo.CvlservPay
+		order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
 		order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
 		order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
 		order.AcctPay = res.Output.Setlinfo.AcctPay

main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -14,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)
 }