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

conf/app.conf

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

controllers/hb/hbyb_controller.go

@@ -27,10 +27,53 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/2208", &HBybController{}, "get:PostNine")
 	beego.Router("/hbyb/5203", &HBybController{}, "get:PostTen")
 	beego.Router("/hbyb/2001", &HBybController{}, "get:Post2001")
-
+	beego.Router("/hbyb/3202", &HBybController{}, "get:Post3202a")
 	beego.Router("/hbyb/4101", &HBybController{}, "post:Post4101")
 
 }
+func (c *HBybController) Post3202a() {
+	insutype := c.GetString("insutype")
+	clrType := c.GetString("clr_type")
+	setlOptins := c.GetString("setl_optins")
+	stmtBegndate := c.GetString("stmt_begndate")
+	stmtEnddate := c.GetString("stm_enddate")
+	fundPaySumamt, _ := c.GetFloat("fund_pay_sumamt", 0)
+	acctPay, _ := c.GetFloat("acct_pay", 0)
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = insuplc_admdvs
+	baseParams.MdtrtareaAdmvs = mdtrtarea_admvs
+	baseParams.SecretKey = secret_key
+	baseParams.OrgName = org_name
+	baseParams.Doctor = doctor
+	baseParams.FixmedinsCode = fixmedins_code
+	businessParams := models.BusinessParams{
+		Insutype:      insutype,
+		ClrType:       clrType,
+		SetlOptins:    setlOptins,
+		StmtBegndate:  stmtBegndate,
+		StmtEnddate:   stmtEnddate,
+		FundPaySumamt: fundPaySumamt,
+		AcctPay:       acctPay,
+	}
+	result := service.Hbyb3202a(baseParams, businessParams)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
 func (c *HBybController) Post4101() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}

controllers/sg/his_api_controller.go

@@ -83,6 +83,8 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/readelecard", &HisApiController{}, "get:ReadEleCard")
 
+	beego.Router("/api/3202", &HisApiController{}, "get:Post3202")
+
 }
 
 type Result3101 struct {
@@ -13053,3 +13055,102 @@ func DeleteExtraSpace(s string) string {
 	}
 	return string(s2)
 }
+
+//对账
+func (c *HisApiController) Post3202() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	insutype := c.GetString("insutype")
+	clr_type := c.GetString("clr_type")
+	clr_org := c.GetString("clr_optins")
+
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+	if len(clr_org) == 0 {
+		clr_org = miConfig.MdtrtareaAdmvs
+	}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	orders, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
+	fixmedins_setl_cnt := int64(len(orders))
+	var medfee_sumamt float64
+	var acct_pay float64
+	var fund_pay_sumamt float64
+	for _, item := range orders {
+		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
+		acct_pay = acct_pay + item.AcctPay
+		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
+	}
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+	var res ResultSix
+	if config.IsOpen == 1 {
+		if miConfig.MdtrtareaAdmvs == "421300" {
+			api := "http://192.168.124.4:9532/" + "hbyb/3202?" +
+				"insutype=" + insutype +
+				"&clr_type=" + clr_type +
+				"&setl_optins=" + clr_org +
+				"&stmt_begndate=" + start_time +
+				"&stm_enddate=" + end_time +
+				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
+				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
+				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+				"&secret_key=" + miConfig.SecretKey +
+				"&org_name=" + miConfig.OrgName +
+				"&doctor=" + user_name
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+			fmt.Println("log")
+			fmt.Println(string(result))
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		}
+
+		if res.Infcode == 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "发起成功",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"code": -10,
+				"msg":  res.ErrMsg,
+			})
+
+		}
+	}
+}

main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"context"
+	"gdyb/service"
+
 	//"gdyb/service"
 
 	//"context"
@@ -31,14 +33,14 @@ 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)
-	//}
+	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)
+	}
 }
 func main() {
 	beego.Run()

service/hbyb_service.go

@@ -875,7 +875,50 @@ func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
+func Hbyb3202a(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	fmt.Println("11222333-----")
+
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3202a"                             // 交易编码
+	inputData["insutype"] = businessParams.Insutype             // 险种
+	inputData["clr_type"] = businessParams.ClrType              // 就诊 ID（来自2201接口返回）
+	inputData["setl_optins"] = baseParams.InsuplcAdmdvs         // 结算经办机构
+	inputData["stmt_begndate"] = businessParams.StmtBegndate    // 对帐开始时间
+	inputData["stmt_enddate"] = businessParams.StmtEnddate      //对帐结束时间
+	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt //基金支付总额
+	inputData["acct_pay"] = businessParams.AcctPay              //个人账户支付金额
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "3202a", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return ConvertToString(string(out), "gbk", "utf-8")
+
+}
+
 //文件上传
+
 //文件上传
 func Hbyb9101(baseParams models.BaseParams, file_name string, file_byte []byte) string {
 

service/his_service.go

@@ -991,6 +991,13 @@ func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype str
 	return
 }
 
+func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
+	err = db.Find(&orders).Error
+	return
+}
+
 func GetOrderByTimeThree(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (orders []*models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1  AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time) <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
 	return