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

controllers/sg/his_api_controller.go

@@ -6431,7 +6431,7 @@ func (c *HisApiController) GetCheckAccount() {
 		api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 			"insutype=" + insutype +
 			"&clr_type=" + clr_type +
-			"&setl_optins=" + "定点医保中心" +
+			"&setl_optins=" + clr_org +
 			"&stmt_begndate=" + start_time +
 			"&stm_enddate=" + end_time +
 			"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +

service/gdyb_service.go

@@ -1720,7 +1720,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage["infno"] = "3201"                                    // 交易编码
 	inputData["insutype"] = businessParams.Insutype                   // 险种
 	inputData["clr_type"] = businessParams.ClrType                    // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = baseParams.InsuplcAdmdvs               // 结算经办机构
+	inputData["setl_optins"] = businessParams.SetlOptins              // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额

service/his_service.go

@@ -966,7 +966,7 @@ func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrder
 
 func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string) (orders []*models.HisOrder, err error) {
 	if len(clr_org) > 0 {
-		err = readDb.Model(&models.HisOrder{}).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 = ? AND clr_org = ?", org_id, end_time, start_time, insutype, clr_org).Find(&orders).Error
+		err = readDb.Model(&models.HisOrder{}).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 = ? AND clr_optins = ?", org_id, end_time, start_time, insutype, clr_org).Find(&orders).Error
 	} else {
 		err = readDb.Model(&models.HisOrder{}).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).Find(&orders).Error
 	}