111

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10217
+org_id = 10191
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/js/jsyb_controller.go

@@ -720,17 +720,17 @@ func (c *JSybController) PostEight() {
 	var result string
 	var request_log string
 	if id_card_type == 4 {
-		_, pBusiCardInfo := GetELeCertInfoSettle(fixmedins_code, "", "")
-		pBusiCardInfo = Remove0000(pBusiCardInfo)
-		var ele ELeData
-		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		if err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-		}
-		token := ele.Data.EcCardToken
-		if len(token) > 0 {
-			result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, token, cainfo)
-		}
+		//_, pBusiCardInfo := GetELeCertInfoSettle(fixmedins_code, "", "")
+		//pBusiCardInfo = Remove0000(pBusiCardInfo)
+		//var ele ELeData
+		//err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		//if err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//}
+		//token := ele.Data.EcCardToken
+		//if len(token) > 0 {
+		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+		//}
 	} else {
 		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
 

controllers/sg/his_api_controller.go

@@ -10642,13 +10642,26 @@ func (c *HisApiController) GetCheckAccount() {
 				MedfeeSumamt:     medfee_sumamt,
 				FundPaySumamt:    fund_pay_sumamt,
 				AcctPay:          acct_pay,
-				FixmedinsSetlCnt: fixmedins_setl_cnt + int64(len(orders_two)*2),
+				FixmedinsSetlCnt: fixmedins_setl_cnt,
 			}
-			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams)
+			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams, fmt.Sprintf("%.4f", medfee_sumamt), fmt.Sprintf("%.4f", fund_pay_sumamt))
 			fmt.Println(requestLog)
 			fmt.Println(result)
 			fmt.Println(err_msg)
 
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 			if len(clr_type) == 0 {
 				clr_type = "11"

main.go

@@ -6,6 +6,7 @@ import (
 
 	_ "gdyb/routers"
 	"gdyb/service"
+
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
@@ -19,13 +20,13 @@ import (
 
 func init() {
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	//CreateLog(miConfig)
 	//UploadLog(miConfig)
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 }
 func main() {
 	beego.Run()

service/fj_service.go

@@ -957,7 +957,7 @@ func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 }
 
 //  医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
-func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string, string) {
+func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string) (string, string, string) {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -981,8 +981,8 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["setl_optins"] = "350581"                               // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
-	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额
-	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt       //基金支付总额
+	inputData["medfee_sumamt"] = med                                  //医疗费总额
+	inputData["fund_pay_sumamt"] = fund                               //基金支付总额
 	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）