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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 10088
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -72,7 +72,7 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #深圳
 # gdyb_paasid = "sz_prd_yjyy"
 #肇庆
-# gdyb_paasid = "zq_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
 #gdyb_paasid = "gdyb_inf"

controllers/sg/his_api_controller.go

@@ -13113,19 +13113,28 @@ func (c *HisApiController) Post3202() {
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64
+
+	var medfee_sumamt_str string
+	var acct_pay_str string
+	var fund_pay_sumamt_str string
 	for _, item := range orders {
-		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
-		acct_pay = acct_pay + item.AcctPay
-		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
+		medfee_sumamt_str = fmt.Sprintf("%.4f", medfee_sumamt+item.MedfeeSumamt)
+		acct_pay_str = fmt.Sprintf("%.4f", acct_pay+item.AcctPay)
+		fund_pay_sumamt_str = fmt.Sprintf("%.4f", fund_pay_sumamt+item.FundPaySumamt)
+
 	}
 
 	var medfee_sumamt_two float64
 	var acct_pay_two float64
 	var fund_pay_sumamt_two float64
+
+	var medfee_sumamt_two_str string
+	var acct_pay_two_str string
+	var fund_pay_sumamt_two_str string
 	for _, item := range orders_two {
-		medfee_sumamt_two = medfee_sumamt_two + item.MedfeeSumamt
-		acct_pay_two = acct_pay_two + item.AcctPay
-		fund_pay_sumamt_two = fund_pay_sumamt_two + item.FundPaySumamt
+		medfee_sumamt_two_str = fmt.Sprintf("%.4f", medfee_sumamt_two+item.MedfeeSumamt)
+		acct_pay_two_str = fmt.Sprintf("%.4f", acct_pay_two+item.AcctPay)
+		fund_pay_sumamt_two_str = fmt.Sprintf("%.4f", fund_pay_sumamt_two+item.FundPaySumamt)
 	}
 
 	//var user_name string
@@ -13139,9 +13148,13 @@ func (c *HisApiController) Post3202() {
 	if config.IsOpen == 1 {
 		var bps []models.BusinessParams
 		var bp models.BusinessParams
-		bp.MedfeeSumamt = medfee_sumamt
-		bp.AcctPay = acct_pay
-		bp.FundPaySumamt = fund_pay_sumamt
+		ms, _ := strconv.ParseFloat(medfee_sumamt_str, 64)
+		ap, _ := strconv.ParseFloat(acct_pay_str, 64)
+		fp, _ := strconv.ParseFloat(fund_pay_sumamt_str, 64)
+
+		bp.MedfeeSumamt = ms
+		bp.AcctPay = ap
+		bp.FundPaySumamt = fp
 		bp.Insutype = "390"
 		bp.StmtBegndate = start_time
 		bp.ClrType = clr_type
@@ -13149,10 +13162,14 @@ func (c *HisApiController) Post3202() {
 		bp.StmtEnddate = end_time
 		bps = append(bps, bp)
 
+		mst, _ := strconv.ParseFloat(medfee_sumamt_two_str, 64)
+		apt, _ := strconv.ParseFloat(acct_pay_two_str, 64)
+		fpt, _ := strconv.ParseFloat(fund_pay_sumamt_two_str, 64)
+
 		var bp2 models.BusinessParams
-		bp2.MedfeeSumamt = medfee_sumamt_two
-		bp2.AcctPay = acct_pay_two
-		bp2.FundPaySumamt = fund_pay_sumamt_two
+		bp2.MedfeeSumamt = mst
+		bp2.AcctPay = apt
+		bp2.FundPaySumamt = fpt
 		bp2.Insutype = "310"
 		bp2.StmtBegndate = start_time
 		bp2.StmtEnddate = end_time
@@ -13189,8 +13206,6 @@ func (c *HisApiController) Post3202() {
 
 			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes, _ := json.Marshal(respJSON)
-			fmt.Println("log")
-			fmt.Println(string(userJSONBytes))
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

main.go

@@ -22,13 +22,13 @@ import (
 
 func init() {
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	////CreateLog(miConfig)
-	////UploadLog(miConfig)
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 }
 func main() {
 	beego.Run()