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

controllers/hb/hbyb_controller.go

@@ -27,42 +27,34 @@ 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/3202", &HBybController{}, "post: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,
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
 	}
-	result := service.Hbyb3202a(baseParams, businessParams)
+	userJSONBytes, _ := json.Marshal(respJSON["bps"])
+	var bps []models.BusinessParams
+	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.SecretKey = respJSON["secret_key"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+
+	result := service.Hbyb3202a(baseParams, bps)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -13106,16 +13106,23 @@ func (c *HisApiController) Post3202() {
 	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)
+	orders, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "390", "", clr_type)
+	orders_two, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "310", "", clr_type)
+
 	fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64
+
+	var medfee_sumamt_two float64
+	var acct_pay_two float64
+	var fund_pay_sumamt_two 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
+		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
 	}
+
 	var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if role.ID == 0 {
@@ -13125,27 +13132,42 @@ func (c *HisApiController) Post3202() {
 	}
 	var res ResultSix
 	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
+		bp.Insutype = "390"
+		bp.StmtBegndate = start_time
+		bp.ClrType = clr_type
+		bp.SetlOptins = clr_org
+		bp.StmtEnddate = end_time
+		bps = append(bps, bp)
+
+		bp.MedfeeSumamt = medfee_sumamt_two
+		bp.AcctPay = acct_pay_two
+		bp.FundPaySumamt = fund_pay_sumamt_two
+		bp.Insutype = "310"
+		bp.StmtBegndate = start_time
+		bp.StmtEnddate = end_time
+		bp.ClrType = clr_type
+		bp.SetlOptins = clr_org
+		bps = append(bps, bp)
+
+		data := make(map[string]interface{})
+		data["bps"] = bps
+		data["org_name"] = miConfig.OrgName
+		data["doctor"] = role.UserName
+		data["fixmedins_code"] = miConfig.Code
+		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+
 		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
-			}
+			client := &http.Client{}
+			bytesData, _ := json.Marshal(data)
+			req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/3202", bytes.NewReader(bytesData))
+			resp, _ := client.Do(req)
+			defer resp.Body.Close()
 			body, ioErr := ioutil.ReadAll(resp.Body)
 			if ioErr != nil {
 				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
@@ -13153,22 +13175,21 @@ func (c *HisApiController) Post3202() {
 				return
 			}
 			var respJSON map[string]interface{}
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			if err := json.Unmarshal([]byte(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)
+			userJSONBytes, _ := json.Marshal(respJSON)
 			fmt.Println("log")
-			fmt.Println(string(result))
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
+			fmt.Println(string(userJSONBytes))
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-
 		}
 
 		if res.Infcode == 0 {

service/hbyb_service.go

@@ -875,8 +875,7 @@ func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Hbyb3202a(baseParams models.BaseParams, businessParams models.BusinessParams) string {
-	fmt.Println("11222333-----")
+func Hbyb3202a(baseParams models.BaseParams, businessParams []models.BusinessParams) string {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -891,15 +890,18 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams models.BusinessParam
 	//inputDatas := []make(map[string]interface{})
 	inputDatas := make([]map[string]interface{}, 0)
 
-	inputMessage["infno"] = "3202a"                             // 交易编码
-	inputData["insutype"] = businessParams.Insutype             // 险种
-	inputData["clr_type"] = businessParams.ClrType              // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = businessParams.SetlOptins        // 结算经办机构
-	inputData["stmt_begndate"] = businessParams.StmtBegndate    // 对帐开始时间
-	inputData["stmt_enddate"] = businessParams.StmtEnddate      //对帐结束时间
-	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt //基金支付总额
-	inputData["acct_pay"] = businessParams.AcctPay              //个人账户支付金额
-	inputDatas = append(inputDatas, inputData)
+	inputMessage["infno"] = "3202a" // 交易编码
+	for _, item := range businessParams {
+		inputData["insutype"] = item.Insutype             // 险种
+		inputData["clr_type"] = item.ClrType              // 就诊 ID（来自2201接口返回）
+		inputData["setl_optins"] = item.SetlOptins        // 结算经办机构
+		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
+		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
+		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
+		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
+		inputData["med_type"] = "14"                      //个人账户支付金额
+		inputDatas = append(inputDatas, inputData)
+	}
 	input["clrdata"] = inputDatas
 	inputMessage["input"] = input //交易输入