更新

controllers/sg/his_api_controller.go

@@ -205,7 +205,7 @@ func (c *HisApiController) GetCFYLJG001() {
 			drug.MedcBegntime = timeFormatTwo
 			if subItem.Day > 0 {
 				ts := time.Unix(subItem.StartTime, 0)
-				record_time = ts.AddDate(0, 0, int(subItem.Day)).Unix()
+				record_time := ts.AddDate(0, 0, int(subItem.Day)).Unix()
 				tempTime3 := time.Unix(record_time, 0)
 				timeFormat3 := tempTime3.Format("2006-01-02") + " 23:59:00"
 				drug.MedcEndtime = timeFormat3

main.go

@@ -43,7 +43,7 @@ func main() {
 	//service.AutoUploadData
 
 	//台山百伦清单上传方法
-	//GetBatchSettleList()
+	GetBatchSettleList()
 
 	//深圳百霖
 	//GetblBatchSettleList()

service/dianzichufang.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
+	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -290,8 +291,8 @@ func GetCFYLJG003(org_name string, doctor string, fixmedins_code string, insuplc
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
-	inputDatas := make([]map[string]interface{}, 0)
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
 
 	inputMessage["infno"] = "CFYLJG003"
 
@@ -375,8 +376,8 @@ func GetCFYLJG004(org_name string, doctor string, fixmedins_code string, insuplc
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
-	inputDatas := make([]map[string]interface{}, 0)
+	inputData := make(map[string]interface{})
+	//inputDatas := make([]map[string]interface{}, 0)
 
 	inputMessage["infno"] = "CFYLJG004"
 
@@ -446,8 +447,8 @@ func GetCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
-	inputDatas := make([]map[string]interface{}, 0)
+	inputData := make(map[string]interface{})
+	//inputDatas := make([]map[string]interface{}, 0)
 
 	inputMessage["infno"] = "CFYLJG005"
 
@@ -517,8 +518,8 @@ func GetCFYLJG006(org_name string, doctor string, fixmedins_code string, insuplc
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
-	inputDatas := make([]map[string]interface{}, 0)
+	inputData := make(map[string]interface{})
+	//inputDatas := make([]map[string]interface{}, 0)
 
 	inputMessage["infno"] = "CFYLJG006"
 
@@ -585,8 +586,8 @@ func GetCFYLJG007(org_name string, doctor string, fixmedins_code string, insuplc
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
-	inputDatas := make([]map[string]interface{}, 0)
+	inputData := make(map[string]interface{})
+	//inputDatas := make([]map[string]interface{}, 0)
 
 	inputMessage["infno"] = "CFYLJG007"
 

service/his_service.go

@@ -1485,7 +1485,7 @@ func GetAllHisOrderTwo(org_id int64) (his []*models.HisOrder, err error) {
 }
 
 func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-05-01 00:00:00' AND setl_time <= '2023-05-31 00:00:00'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-06-01 00:00:00' AND setl_time <= '2023-06-30 23:59:00'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }

service/jx_service.go

@@ -2590,34 +2590,34 @@ func Jxyb3261(stmt_mon string, setl_optins string, org_name string, doctor strin
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3261"), string(bytesData)
 }
 
-func Jxyb3262(stmt_mon string, setl_optins string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
-	// 生成签名
-	timestamp := time.Now().Unix()
-	// 生成输入报文
-	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3262" // 交易编码
-	inputData["fixmedins_code"] = fixmedins_code
-	inputData["fixmedins_name"] = org_name
-	inputData["fix_fill_dept"] = fix_fill_dept
-	inputData["fix_fill_psn_id"] = fix_fill_psn_id
-	inputData["fix_fill_psn"] = fix_fill_psn
-	inputData["fix_fill_date"] = fix_fill_date
-	inputData["stmt_loc"] = stmt_loc
-	inputData["upld_btch"] = upld_btch
-
-	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(), ""
-	}
-	request_url = request_url + "3261"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3261"), string(bytesData)
-}
+//func Jxyb3262(stmt_mon string, setl_optins string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+//	// 生成签名
+//	timestamp := time.Now().Unix()
+//	// 生成输入报文
+//	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//	inputMessage["infno"] = "3262" // 交易编码
+//	inputData["fixmedins_code"] = fixmedins_code
+//	inputData["fixmedins_name"] = org_name
+//	inputData["fix_fill_dept"] = fix_fill_dept
+//	inputData["fix_fill_psn_id"] = fix_fill_psn_id
+//	inputData["fix_fill_psn"] = fix_fill_psn
+//	inputData["fix_fill_date"] = fix_fill_date
+//	inputData["stmt_loc"] = stmt_loc
+//	inputData["upld_btch"] = upld_btch
+//
+//	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(), ""
+//	}
+//	request_url = request_url + "3261"
+//	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3261"), string(bytesData)
+//}
 
 func Jxyb3263(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名